分开手动上联

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -1374,9 +1374,8 @@ public class DeviceLibraryController {
 
     @PostMapping("/deviceLibraryChangeTime")
     @ApiOperation(value = "设备设置更换时间")
-    public ResponseEntity<String> deviceChangeTime(@RequestBody ChangeDeviceVo changeDeviceVo){
+    public void deviceChangeTime(@RequestBody ChangeDeviceVo changeDeviceVo){
         deviceLibraryService.deviceLibraryChangeTime(changeDeviceVo);
-         return ResponseEntity.ok("success");
     }
 
 

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/ExternalUnitEquipController.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.library.subject.vo.DevNameVO;
+import com.tykj.dev.device.matching.repository.ExternalUnitEquipDao;
 import com.tykj.dev.device.matching.service.ExternalUnitEquipService;
 import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
 import com.tykj.dev.device.matching.subject.vo.ExternalSelectVo;
@@ -20,6 +21,10 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping(value = "/externalUnit")
 @AutoDocument
@@ -77,11 +82,13 @@ public class ExternalUnitEquipController {
         return ResponseEntity.ok(externalUnitEquipService.queryPage(externalSelectVo));
     }
 
+    @Autowired
+    ExternalUnitEquipDao externalUnitEquipDao;
 
     @PostMapping("/importExcel1")
     @ApiOperation(value = "原本exl解析")
     public ResponseEntity importExcel1(@RequestParam("file") MultipartFile file) {
-
+        Map<String, ExternalUnitEquip> collect = externalUnitEquipDao.findAll().stream().collect(Collectors.toMap(ExternalUnitEquip::getNum, Function.identity()));
         try {
             byte[] byteArr = new byte[0];
             byteArr = file.getBytes();
@@ -97,6 +104,11 @@ public class ExternalUnitEquipController {
                         if (!toFlag(externalUnitEquip.getUnitName())){
                             externalUnitEquip.setUnitName(null);
                         }
+                        if (collect.containsKey(externalUnitEquip.getNum())){
+                            externalUnitEquip.setNum(null);
+                        }else {
+                            collect.put(externalUnitEquip.getNum(),new ExternalUnitEquip());
+                        }
                     }
             );
             return ResponseEntity.ok(excelRegs);

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/ExternalUnitEquipServiceImpl.java

@@ -40,7 +40,7 @@ public class ExternalUnitEquipServiceImpl implements ExternalUnitEquipService {
 
     @Override
     public List<ExternalUnitEquip> queryUnitName(String unitName) {
-        return externalUnitEquipDao.findAllByUnitName(unitName);
+        return externalUnitEquipDao.findAllByUnitName(unitName).stream().filter(externalUnitEquip -> externalUnitEquip.getState()==0).collect(Collectors.toList());
     }
 
     @Override

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/ExternalUnitEquip.java

@@ -17,7 +17,6 @@ import javax.persistence.Table;
 @Data
 @Entity
 @EntityListeners(AuditingEntityListener.class)
-@SQLDelete(sql = "update matching_device_bill set delete_tag = 1 where id = ?")
 @Where(clause = "delete_tag = 0")
 @ApiModel("外单位设备")
 @Table(name = "zb_external_unit_equip")

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

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

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

@@ -199,30 +199,128 @@ public class RunController {
 
 
 
+
+
     @ApiOperation(value = "业务历史循环上链", notes = "业务历史循环上链")
     @GetMapping("/bill/toBlock")
     @Transactional(rollbackFor = Exception.class)
     public void toBlock() {
         //配发
         allocBillService.historyUpperChain();
+    }
+
+    @ApiOperation(value = "业务历史循环上链（退回）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock2")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock2() {
+
         //退回
         allotBackBillService.historyUpperChain();
+    }
+
+    @ApiOperation(value = "业务历史循环上链（申请）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock3")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock3() {
+
+
         //申请
         deviceApplyBillService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（维修）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock4")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock4() {
+
         //维修
         repairSendBillService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（维修退回）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock5")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock5() {
+
         //维修退回
         repairBackBillService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（自查）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock6")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock6() {
+
         //自查
         selfCheckBillService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（入库）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock7")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock7() {
+
         //入库
         storageBillService.historyUpperChain();
 
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（报废）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock8")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock8() {
+
+
         scrapService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链(销毁)", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock9")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock9() {
+        //配发
         deviceDestroyBillService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（清退）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock10")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock10() {
+
         deviceRepelDetailService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（丢失）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock11")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock11() {
+
         deviceLossService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（退役）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock12")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock12() {
+
         deviceDecommissioningDetailService.historyUpperChain();
+
+    }
+
+    @ApiOperation(value = "业务历史循环上链（培训）", notes = "业务历史循环上链")
+    @GetMapping("/bill/toBlock13")
+    @Transactional(rollbackFor = Exception.class)
+    public void toBlock13() {
+
         trainJobController.historyUpperChain();
     }
 

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

@@ -12,3 +12,5 @@ block.flag=true
 carrier.url = http://10.153.4.11:8088/carrier/configuration/saveConfiguration
 file.matching.excel=/data/equip/matching/excel/
 ven.http=http://10.153.6.10:8081
+check.time.last=/opt/zb/check
+block.carrier.ip=http://10.153.4.11:8088/block
\ No newline at end of file