[销毁 报废 丢失 找回] 添加上链代码

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/vo/UploadApplyFile.java

@@ -35,4 +35,5 @@ public class UploadApplyFile {
 
     @ApiModelProperty(value = "申请批复详情")
     private List<ApplyBillDetailVo> applyBillDetailVos;
+
 }

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java

 package com.tykj.dev.device.decommissioning.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
 import com.tykj.dev.device.decommissioning.repository.DeviceDecommissioningDetailDao;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
@@ -21,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -40,9 +42,22 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
     @Autowired
     DeviceLibraryDao deviceLibraryDao;
 
+    @Autowired
+    BlockChainUtil blockChainUtil;
+
     @Override
     public DeviceDecommissioningDetail saveDeviceDecommissioningDetail(DeviceDecommissioningDetail deviceDecommissioningDetail) {
-        log.info("[清退] 详情添加成功");
+//        log.info("[清退] 详情添加成功");
+        CompletableFuture.runAsync(()-> {
+            if (deviceDecommissioningDetail.getRecordId() == null || deviceDecommissioningDetail.getRecordId().equals("")) {
+                deviceDecommissioningDetail.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(deviceDecommissioningDetail)).getData().getRecordID());
+                deviceDecommissioningDetailDao.save(deviceDecommissioningDetail);
+                log.info("[退役]上链数据时间本次");
+            } else {
+                deviceDecommissioningDetail.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(deviceDecommissioningDetail), deviceDecommissioningDetail.getRecordId()).getData().getRecordID());
+                deviceDecommissioningDetailDao.save(deviceDecommissioningDetail);
+            }
+        });
         return deviceDecommissioningDetailDao.save(deviceDecommissioningDetail);
     }
 

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -55,6 +56,16 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
 
     @Override
     public DeviceDestroyBill saveDeviceDestroyBill(DeviceDestroyBill scrap) {
+        CompletableFuture.runAsync(()-> {
+        if (scrap.getRecordId() == null || scrap.getRecordId().equals("")) {
+            scrap.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(scrap)).getData().getRecordID());
+            deviceDestroyBillDao.save(scrap);
+            log.info("[销毁]上链数据时间本次");
+        } else {
+            scrap.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(scrap), scrap.getRecordId()).getData().getRecordID());
+            deviceDestroyBillDao.save(scrap);
+        }
+    });
         return deviceDestroyBillDao.save(scrap);
     }
 

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -62,6 +62,8 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     boolean existsAllByPackingIdInAndOwnUnitIn(List<Integer> packingIds,List<String> unitNames);
 
+    boolean existsBySeqNumber(String seq);
+
     Integer countAllByModelAndOwnUnitInAndLifeStatusNotIn(String model,List<String> unitNames,List<Integer> lifeStatus);
 
     Integer countAllByModelAndOwnUnitInAndLifeStatusIn(String model,List<String> unitNames,List<Integer> lifeStatus);

dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/DeviceLossServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author zjm
@@ -28,13 +29,16 @@ public class DeviceLossServiceImpl implements DeviceLossService {
 
     @Override
     public DeviceLoss save(DeviceLoss deviceLoss) {
-//       if (deviceLoss.getRecordId()==null){
-//           long time=System.currentTimeMillis();
-//           deviceLoss.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(deviceLoss)).getData().getRecordID());
-//           log.info("[丢失-找回]上链数据时间本次");
-//       }else {
-//           deviceLoss.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(deviceLoss),deviceLoss.getRecordId()).getData().getRecordID());
-//       }
+        CompletableFuture.runAsync(()-> {
+            if (deviceLoss.getRecordId() == null || deviceLoss.getRecordId().equals("")) {
+                deviceLoss.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(deviceLoss)).getData().getRecordID());
+                lossDao.save(deviceLoss);
+                log.info("[丢失-找回]上链数据时间本次");
+            } else {
+                deviceLoss.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(deviceLoss), deviceLoss.getRecordId()).getData().getRecordID());
+                lossDao.save(deviceLoss);
+            }
+        });
        return lossDao.save(deviceLoss);
     }
 

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -1373,6 +1373,14 @@ public class RepairController {
         return ResultUtil.success("更新成功");
     }
 
+    @ApiOperation(value = "验证装备序列号是否存在", notes = "验证装备序列号是否存在")
+    @GetMapping(value = "/validation/seq/{seqNumber}")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity validation(@PathVariable String seqNumber){
+        return ResponseEntity.ok(deviceLibraryDao.existsBySeqNumber(seqNumber));
+    }
+
+
     @ApiOperation(value = "上传领取单", notes = "上传领取单")
     @PostMapping(value = "/uploadFile")
     @Transactional(rollbackFor = Exception.class)

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.scrap.service.impl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
@@ -27,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -44,8 +46,22 @@ public class ScrapServiceImpl implements ScrapService {
 
     @Autowired
     DeviceLibraryDao deviceLibraryDao;
+
+    @Autowired
+    BlockChainUtil blockChainUtil;
+
     @Override
     public Scrap saveScrap(Scrap scrap) {
+        CompletableFuture.runAsync(()-> {
+            if (scrap.getRecordId() == null || scrap.getRecordId().equals("")) {
+                scrap.setRecordId(blockChainUtil.sendText(1000, JacksonUtil.toJSon(scrap)).getData().getRecordID());
+                scrapDao.save(scrap);
+                log.info("[销毁]上链数据时间本次");
+            } else {
+                scrap.setRecordId(blockChainUtil.appendText(JacksonUtil.toJSon(scrap), scrap.getRecordId()).getData().getRecordID());
+                scrapDao.save(scrap);
+            }
+        });
         return scrapDao.save(scrap);
     }
 

dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandover.java

@@ -35,6 +35,7 @@ public class WorkHandover {
      * 工作交接id
      */
     @Id
+    @GeneratedValue
     @ApiModelProperty(value = "工作交接id")
     @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer workHandoverId;

dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java

@@ -94,9 +94,9 @@ public class TrainTask {
                 });
     }
 
-    @Scheduled(cron = "10 * * * * ?")
-    private void trainingEnd1() {
-        log.info("定时启动web推送");
-        myWebSocket.sendMessage1();
-    }
+//    @Scheduled(cron = "10 * * * * ?")
+//    private void trainingEnd1() {
+//        log.info("定时启动web推送");
+//        myWebSocket.sendMessage1();
+//    }
 }