1

dev-config/pom.xml

@@ -68,6 +68,7 @@
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>misc</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
 
 

dev-config/src/main/java/com/tykj/dev/config/ConfigApplication.java

@@ -3,7 +3,14 @@ package com.tykj.dev.config;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+/**
+ * @author huangxiahao
+ */
+@SpringBootApplication(scanBasePackages={
+        "com.tykj.dev.config",
+        "com.tykj.dev.misc"
+}
+)
 public class ConfigApplication {
 
     public static void main(String[] args) {

dev-config/src/main/java/com/tykj/dev/config/DateFormatUtil.java

+package com.tykj.dev.config;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+
+import javax.validation.constraints.NotNull;
+import java.text.ParseException;
+import java.time.Instant;
+import java.util.Date;
+
+/**
+ * 时间格式化工具工具
+ *
+ * @author HuangXiahao
+ * @version V1.0
+ * @class DateFormatUtil
+ * @data 2020/5/20
+ **/
+public class DateFormatUtil {
+    public static final String SYMBOL_DOT = "\\.";
+    /**
+     * 日期正则yyyy-MM
+     */
+    public static final String DATE_REGEX_YYYYMM = "^\\d{4}-\\d{1,2}$";
+    /**
+     * 日期正则yyyy-MM-dd
+     */
+    public static final String DATE_REGEX_YYYYMMDD = "^\\d{4}-\\d{1,2}-\\d{1,2}$";
+    /**
+     * 日期正则yyyy-MM-dd hh:mm
+     */
+    public static final String DATE_REGEX_YYYYMMDDHHMM = "^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}$";
+    /**
+     * 日期正则yyyy-MM-dd hh:mm:ss
+     */
+    public static final String DATE_REGEX_YYYYMMDDHHMMSS = "^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}$";
+    /**
+     * Instant日期秒+纳秒
+     */
+    public static final String DATE_REGEX_SECOND_DOT_NANOSECOND = "^[0-9]+\\.[0-9]{1,9}$";
+    /**
+     * 日期正则yyyy-MM-dd'T'HH:mm:ssZ
+     */
+    public static final String DATE_REGEX_YYYYMMDD_T_HHMMSS_Z = "^\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{1,2}:\\d{1,2}Z$";
+    /**
+     * 日期正则yyyy-MM-dd'T'HH:mm:ssZ
+     */
+    public static final String DATE_REGEX_YYYYMMDD_T_HHMMSS_SSS_Z = "^\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}Z$";
+
+    /**
+     * 以T分隔日期和时间，并带时区信息，符合ISO8601规范
+     */
+    public static final String PATTERN_ISO = "yyyy-MM-dd'T'HH:mm:ss.SSSZZ";
+    public static final String PATTERN_ISO_ON_SECOND = "yyyy-MM-dd'T'HH:mm:ssZZ";
+    public static final String PATTERN_ISO_ON_DATE = "yyyy-MM-dd";
+    public static final String PATTERN_ISO_ON_MONTH = "yyyy-MM";
+
+    /**
+     * 以空格分隔日期和时间，不带时区信息
+     */
+    public static final String PATTERN_DEFAULT = "yyyy-MM-dd HH:mm:ss.SSS";
+    public static final String PATTERN_DEFAULT_ON_SECOND = "yyyy-MM-dd HH:mm:ss";
+    public static final String PATTERN_DEFAULT_ON_MINUTE = "yyyy-MM-dd HH:mm";
+
+    //
+    /**
+     * 以T分隔日期和时间，并带时区信息，符合ISO8601规范
+     */
+    public static final FastDateFormat ISO_FORMAT = FastDateFormat.getInstance(PATTERN_ISO);
+    public static final FastDateFormat ISO_ON_SECOND_FORMAT = FastDateFormat.getInstance(PATTERN_ISO_ON_SECOND);
+    public static final FastDateFormat ISO_ON_DATE_FORMAT = FastDateFormat.getInstance(PATTERN_ISO_ON_DATE);
+    public static final FastDateFormat ISO_ON_MONTH_FORMAT = FastDateFormat.getInstance(PATTERN_ISO_ON_MONTH);
+
+    /**
+     * 以空格分隔日期和时间，不带时区信息
+     */
+    public static final FastDateFormat DEFAULT_FORMAT = FastDateFormat.getInstance(PATTERN_DEFAULT);
+    public static final FastDateFormat DEFAULT_ON_SECOND_FORMAT = FastDateFormat.getInstance(PATTERN_DEFAULT_ON_SECOND);
+    public static final FastDateFormat DEFAULT_ON_MINUTE_FORMAT = FastDateFormat.getInstance(PATTERN_DEFAULT_ON_MINUTE);
+
+    /**
+     * 将日期格式的字符串转换成指定格式的日期
+     * @param pattern 日期格式
+     * @param dateString 日期字符串
+     * @return
+     * @throws ParseException
+     */
+    public static Date pareDate(@NotNull String pattern, @NotNull String dateString) throws ParseException {
+        return FastDateFormat.getInstance(pattern).parse(dateString);
+    }
+
+    /**
+     * 将日期格式的字符串根据正则转换成相应格式的日期
+     * @param dateString 日期字符串
+     * @return
+     * @throws ParseException
+     */
+    public static Date pareDate(@NotNull String dateString) throws ParseException {
+        String source = dateString.trim();
+        if (StringUtils.isNotBlank(source)) {
+            if(source.matches(DATE_REGEX_YYYYMM)){
+                return ISO_ON_MONTH_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_YYYYMMDD)){
+                return ISO_ON_DATE_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_YYYYMMDDHHMM)){
+                return DEFAULT_ON_MINUTE_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_YYYYMMDDHHMMSS)){
+                return DEFAULT_ON_SECOND_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_YYYYMMDD_T_HHMMSS_Z)){
+                return ISO_ON_SECOND_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_YYYYMMDD_T_HHMMSS_SSS_Z)){
+                return ISO_FORMAT.parse(source);
+            }else if(source.matches(DATE_REGEX_SECOND_DOT_NANOSECOND)){
+                String[] split = source.split(SYMBOL_DOT);
+                return Date.from(Instant.ofEpochSecond(Long.parseLong(split[0]), Long.parseLong(split[1])));
+            }else {
+                throw new IllegalArgumentException("Invalid date value '" + source + "'");
+            }
+        }
+        return null;
+    }
+}

dev-config/src/main/java/com/tykj/dev/config/Java8TimeConfig.java

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
-import com.tykj.dev.misc.utils.DateFormatUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

dev-config/src/test/java/com/tykj/dev/config/ConfigApplicationTests.java

-package com.tykj.dev.config;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ConfigApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

dev-device/device-user/pom.xml

@@ -6,7 +6,7 @@
         <artifactId>device</artifactId>
         <groupId>com.tykj.dev</groupId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath/>
+        <!--<relativePath/>-->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dev-device/pom.xml

@@ -20,7 +20,6 @@
         <module>device-scrap</module>
         <module>device-selfcheck</module>
         <module>device-sendback</module>
-        <module>device-storage</module>
         <module>device-task</module>
         <module>device-train</module>
         <module>device-user</module>

dev-misc/src/main/java/com/tykj/dev/misc/MiscApplication.java

@@ -3,7 +3,10 @@ package com.tykj.dev.misc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages={
+        "com.tykj.dev.misc",
+}
+)
 public class MiscApplication {
 
     public static void main(String[] args) {

dev-misc/src/test/java/com/tykj/dev/misc/MiscApplicationTests.java

-package com.tykj.dev.misc;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class MiscApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

dev-rfid/src/test/java/com/tykj/dev/rfid/RfidApplicationTests.java

-package com.tykj.dev.rfid;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class RfidApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

dev-socket/src/test/java/com/tykj/dev/socket/SocketApplicationTests.java

-package com.tykj.dev.socket;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SocketApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

dev-union/pom.xml

@@ -14,6 +14,26 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.test</groupId>
+            <artifactId>1</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/oscarHibernate54.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.kingdabe</groupId>
+            <artifactId>2</artifactId>
+            <version>2.3</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/oscarJDBC.jar</systemPath>
+        </dependency>
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>misc</artifactId>
@@ -335,5 +355,64 @@
 
     </dependencies>
 
+    <build>
+        <finalName>equip</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+
+                    <webResources>
+                        <!--配置第三方jar包打包的路径-->
+                        <resource>
+                            <directory>src/main/resources/lib/</directory>
+                            <targetPath>WEB-INF/lib/</targetPath>
+                            <includes>
+                                <include>**/*.jar</include>
+                            </includes>
+                        </resource>
+
+                        <resource>
+                            <directory>../dev-rfid/src/main/resources/lib/</directory>
+                            <targetPath>WEB-INF/lib/</targetPath>
+                            <includes>
+                                <include>**/*.jar</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+
+
+                    <!-- maven打包的时候告诉maven不需要web.xml,否刚会报找不到web.xml错误 -->
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+        <!--<plugins>-->
+        <!--&lt;!&ndash;&lt;!&ndash;打包插件&ndash;&gt;&ndash;&gt;-->
+        <!--<plugin>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+        <!--<configuration>-->
+        <!--<fork>true</fork>-->
+        <!--<executable>true</executable>-->
+        <!--<includeSystemScope>true</includeSystemScope>-->
+        <!--</configuration>-->
+        <!--</plugin>-->
+        <!--&lt;!&ndash;&lt;!&ndash;跳过测试插件&ndash;&gt;&ndash;&gt;-->
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-surefire-plugin</artifactId>-->
+        <!--<version>2.20</version>-->
+        <!--<configuration>-->
+        <!--<skipTests>true</skipTests>-->
+        <!--&lt;!&ndash;&lt;!&ndash;默认关掉单元测试 &ndash;&gt;&ndash;&gt;-->
+        <!--</configuration>-->
+        <!--</plugin>-->
+        <!--</plugins>-->
+    </build>
+
+
 
 </project>

dev-union/src/main/resources/application.properties

@@ -4,18 +4,22 @@ server.port=8087
 logging.file=/opt/eqlog/equip.log
 spring.servlet.multipart.max-file-size=400MB
 spring.servlet.multipart.max-request-size=400MB
-spring.jpa.hibernate.ddl-auto=none
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=false
 spring.jpa.open-in-view=true
 spring.main.allow-bean-definition-overriding=true
-spring.datasource.url=jdbc:mysql://192.168.100.249:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#spring.datasource.username=root
+#spring.datasource.password=root
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.driver-class-name=com.oscar.Driver
+spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+#spring.datasource.url=jdbc:mysql://192.168.1.249:3306/management?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
+spring.datasource.username=SYSDBA
+spring.datasource.password=szoscar55
+spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 server.servlet.session.timeout=PT1H
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-file.path=/Users/zjm/code/
-preview.path=http://192.168.102.26:8087/file/
-
+file.path=/opt/zb/
+preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file
-