修改配置文件

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckDetailDao.java

@@ -23,7 +23,7 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I
      * @param time
      * @return
      */
-    @Query("select o from DeviceCheckDetail o where o.updateTime >= ?1 order by o.updateTime desc")
+    @Query("select o from DeviceCheckDetail o where o.updateTime > ?1 order by o.updateTime desc")
     List<DeviceCheckDetail> findAllByUpdateTimeAfter(LocalDateTime time);
 
     /**

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/task/CheckTimedTask.java

@@ -35,7 +35,7 @@ public class CheckTimedTask {
                 log.info("[check] 上链任务结束");
             } catch (Exception e) {
                 run = false;
-                log.error("[check] 上链错误处理:");
+                log.error("[check] 上链错误处理:{}",e);
                 e.printStackTrace();
             }
         }

dev-misc/src/main/java/com/tykj/dev/misc/base/BlockBusinessEnum.java

@@ -15,92 +15,92 @@ public enum BlockBusinessEnum {
     /**
      * 入库业务
      */
-    STORAGE(1021, "入库业务"),
+    STORAGE(1018, "入库业务"),
     /**
      * 配发业务
      */
-    ALLOT(1022, "配发业务"),
+    ALLOT(1019, "配发业务"),
     /**
      * 自查业务
      */
-    SELF_CHECK(1023, "自查业务"),
+    SELF_CHECK(1020, "自查业务"),
     /**
      * 维修业务
      */
-    REPAIR(1024, "维修业务"),
+    REPAIR(1021, "维修业务"),
     /**
      * 核查业务
      */
-    CONFIRM_CHECK(1025, "核查业务"),
+    CONFIRM_CHECK(1022, "核查业务"),
     /**
      * 核查统计业务
      */
-    CONFIRM_CHECK_STAT(1026, "核查统计"),
+    CONFIRM_CHECK_STAT(1023, "核查统计"),
     /**
      * 核查详情业务
      */
-    CONFIRM_CHECK_DETAIL(1027, "核查详情"),
+    CONFIRM_CHECK_DETAIL(1024, "核查详情"),
     /**
      * 申请业务
      */
-    APPLY(1028, "申请业务"),
+    APPLY(1025, "申请业务"),
     /**
      * 维修退回
      */
-    REPAIR_BACK(1029, "维修退回"),
+    REPAIR_BACK(1026, "维修退回"),
     /**
      * 维修继续送修
      */
-    REPAIR_SEND(1030, "维修继续送修"),
+    REPAIR_SEND(1027, "维修继续送修"),
 
     /**
      * 销毁业务
      */
-    DESTROY(1031, "销毁业务"),
+    DESTROY(1028, "销毁业务"),
 
     /**
      * 清退业务
      */
-    SEND_BACK(1032, "清退业务"),
+    SEND_BACK(1029, "清退业务"),
     /**
      * 清退异常处理
      */
-    DECOMMISSIONING(1033, "退役业务"),
+    DECOMMISSIONING(1030, "退役业务"),
 
     /**
      * 新增配套设备
      */
-    ADD_MATCHING_DEVICE(1034, "新增配套设备"),
+    ADD_MATCHING_DEVICE(1031, "新增配套设备"),
 
     /**
      * 工作交接
      */
-    WORK_HANDOVER(1035, "交接"),
+    WORK_HANDOVER(1032, "交接"),
     /**
      * 退回
      */
-    ALLOT_BACK(1036, "退回业务"),
+    ALLOT_BACK(1033, "退回业务"),
     /**
      * 报废
      */
-    SCRAP(1037, "报废业务"),
+    SCRAP(1034, "报废业务"),
 
     /**
      * 丢失
      */
-    LOSS(1038,"丢失业务"),
+    LOSS(1035,"丢失业务"),
 
     /**
      * 找回
      */
-    RETRIEVE(1039,"找回业务"),
+    RETRIEVE(1036,"找回业务"),
 
     /**
      * 重新入库
      */
-    AGAINSTORAGE(1040,"装备状态转换业务"),
+    AGAINSTORAGE(1037,"装备状态转换业务"),
 
-    TRAIN(1041,"培训");
+    TRAIN(1038,"培训");
 
     public Integer subCode;
 

dev-union/src/main/java/com/tykj/dev/union/UnionApplication.java

@@ -22,6 +22,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableScheduling
 @EnableCaching
 public class UnionApplication extends SpringBootServletInitializer {
+
     public static void main(String[] args) {
         SpringApplication.run(UnionApplication.class, args);
     }

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

 spring.datasource.driver-class-name=com.oscar.Driver
 #spring.datasource.url=jdbc:oscar://10.153.4.10:2003/OSRDB
-spring.datasource.url=jdbc:oscar://192.168.0.80:2003/OSRDB
+spring.datasource.url=jdbc:oscar://10.153.4.80:2003/OSRDB
 spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
 spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 file.path=/opt/zb/
 #preview.path=http://10.153.4.11:8088/equip/file/
-preview.path=http://192.168.0.80:8088/equip/file/
+preview.path=http://10.153.4.80:8088/equip/file/
 
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
 block.flag=true
-readMachine.ip=192.168.101.202
+readMachine.ip=10.153.4.80
 
 qrcode.path = /opt/qrcode/
 qrcode.preview.path=http://localhost:8088/equip/code/
 
-carrier.url = http://192.168.0.80:8088/carrier/configuration/saveConfiguration
+carrier.url = http://10.153.4.80:8088/carrier/configuration/saveConfiguration
 
 file.matching.excel=/data/equip/excel/
 
-block.carrier.ip=http://192.168.0.80:8088/block
+block.carrier.ip=http://10.153.4.80:8088/block
+
 check.time.last=/opt/zb/check
\ No newline at end of file

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

@@ -16,7 +16,6 @@ file.path=/opt/zb/
 preview.path=http://192.168.100.247:8087/file/
 useBlockcha=true
 spring.jpa.hibernate.use-new-id-generator-mappings=false
-
 spring.jackson.serialization.indent_output=true
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always