zjm提交

dev-block/src/main/java/com/tykj/dev/device/block/run/BlockRun.java

@@ -21,10 +21,11 @@ public class BlockRun implements CommandLineRunner {
     BlockService blockService;
     @Override
     public void run(String... args) throws Exception {
-        log.info("添加区块业务类型开始");
-        for (BlockBusinessEnum value : BlockBusinessEnum.values()) {
-                blockService.subRegister(value.name);
-        }
-        log.info("添加区块业务类型结束");
+//        log.info("添加区块业务类型开始");
+//        for (BlockBusinessEnum value : BlockBusinessEnum.values()) {
+//
+//                blockService.subRegister(value.name);
+//        }
+//        log.info("添加区块业务类型结束");
     }
 }

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

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

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

@@ -9,6 +9,7 @@ package com.tykj.dev.union;
  */
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.block.service.BlockService;
 import com.tykj.dev.device.confirmcheck.service.HistoryCheckDeviceService;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
@@ -27,6 +28,7 @@ import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.AreaService;
 import com.tykj.dev.device.user.subject.service.UnitsService;
+import com.tykj.dev.misc.base.BlockBusinessEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,7 @@ import java.util.concurrent.CompletableFuture;
 @RestController
 @Slf4j
 @Api("数据纠正模块")
+@RequestMapping("/test")
 @AutoDocument
 public class RunController {
 
@@ -148,4 +151,21 @@ public class RunController {
         log.info("[区块] 历史数据上链接口结束");
     }
 
+    @Autowired
+    BlockService blockService;
+
+    @ApiOperation(value = "添加区块业务分类接口", notes = "历史数据上链接口初始化")
+    @GetMapping("/block/buss")
+    @Transactional(rollbackFor = Exception.class)
+    public void blockService() {
+        log.info("添加区块业务类型开始");
+        for (
+                BlockBusinessEnum value : BlockBusinessEnum.values()) {
+
+            blockService.subRegister(value.name);
+        }
+        log.info("添加区块业务类型结束");
+
+    }
+
 }

dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java

@@ -107,7 +107,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .cors()
                 .and()
                 .authorizeRequests()
-                .antMatchers("/file/**","/actuator/**","/admin/**","/excel/**","/chainOffer/**").permitAll()
+                .antMatchers("/file/**","/actuator/**","/admin/**","/excel/**","/chainOffer/**","/test/**").permitAll()
                 .antMatchers("/file/llq/**").permitAll()
                 .antMatchers("/login/impersonate*").permitAll()
                 .antMatchers("/logout/impersonate*").permitAll()