更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -232,9 +232,9 @@ public class AllotBillController {
                 if (allotBillSaveVo.getAllotType() == 1){
                     if (deviceLibraryEntity.getMatchingRange()!=1){
                         PackingLibrary packingLibrary = packingLibraryService.getOne(deviceLibraryEntity.getPackingId());
-                        PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(),1);
+                        PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(),1,packingLibrary.getType(),packingLibrary.getStyle(),packingLibrary.getName(),packingLibrary.getSecretLevel(),packingLibrary.getInvisibleRange());
                         if (packingLibrary1==null){
-                            throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为"+deviceLibraryEntity.getSeqNumber()+"的装备所属列装不存在配用范围为省对下纵向的列装装备")));
+                            throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为"+deviceLibraryEntity.getSeqNumber()+"的装备所属列装不存在配用范围为省对下纵向的相同列装装备")));
                         }
                         else {
                             deviceLibraryEntity.setPackingId(packingLibrary1.getId());
@@ -255,9 +255,9 @@ public class AllotBillController {
                         }
                         else {
                             PackingLibrary packingLibrary = packingLibraryService.getOne(deviceLibraryEntity.getPackingId());
-                            PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 3);
+                            PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 3,packingLibrary.getType(),packingLibrary.getStyle(),packingLibrary.getName(),packingLibrary.getSecretLevel(),packingLibrary.getInvisibleRange());
                             if (packingLibrary1 == null) {
-                                throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备所属列装不存在配用范围为省对下横向的列装装备")));
+                                throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备所属列装不存在配用范围为省对下横向的相同列装装备")));
                             }
                             else {
                                 changeMap.put(deviceLibraryEntity.getPackingId(),packingLibrary1.getId());

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -152,7 +152,7 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
                 predicateBuilder.gt("sendTime", allotBillSelectVo.getStartTime());
             }
             if (allotBillSelectVo.getEndTime() != null) {
-                predicateBuilder.lt("receiveTime", allotBillSelectVo.getEndTime());
+                predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
             }
             predicateBuilder.eq("backStatus", 3);
         }

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -155,7 +155,7 @@ public class AllotBillServiceImpl implements AllotBillService {
                 predicateBuilder.gt("sendTime", allotBillSelectVo.getStartTime());
             }
             if (allotBillSelectVo.getEndTime() != null) {
-                predicateBuilder.lt("receiveTime", allotBillSelectVo.getEndTime());
+                predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
             }
             predicateBuilder.eq("allotStatus", 5);
         }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -102,25 +102,38 @@ public class AllotBillSaveVo {
     @ApiModelProperty(value = "是否盖章(1:是，0:否)")
     private Integer isSigned;
 
+    @ApiModelProperty(value = "单据保存vo")
     private List<ScriptSaveVo> scriptSaveVos;
 
+    /**
+     * 转为配发单实体
+     */
     public AllotBill toDo() {
         AllotBill allotBillEntity = new AllotBill();
+        //相同属性复制
         BeanUtils.copyProperties(this, allotBillEntity);
+        //批复文号文件
         if(this.replyFiles!=null){
             allotBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
         }
+        //申请文号文件
         if(this.applyFiles!=null){
             allotBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
         }
+        //配发状态为配发中
         allotBillEntity.setAllotStatus(2);
+        //发件时间为当前时间
         allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
+        //单据数据保存
         if (this.scriptSaveVos!=null){
             allotBillEntity.setScriptJson(JacksonUtil.toJSon(scriptSaveVos));
         }
         return allotBillEntity;
     }
 
+    /**
+     * 转为退回单实体
+     */
     public AllotBackBill toBackDo() {
         AllotBackBill allotBillEntity = new AllotBackBill();
         BeanUtils.copyProperties(this, allotBillEntity);

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

@@ -137,5 +137,14 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
     @Query("update DeviceLibrary o set o.rfidSurfaceId = o.seqNumber  ,o.updateTime=current_timestamp where o.id in :idList")
     int upDateRfidSurfaceIdAsSeqNumber(@Param("idList") List<Integer> idList);
 
+    @Transactional
+    @Modifying
+    @Query("update DeviceLibrary o set o.name = :name ,o.updateTime=current_timestamp where o.packingId = :packingId")
+    int upDateName(String name,Integer packingId);
+
+    @Transactional
+    @Modifying
+    @Query("update DeviceLibrary o set o.matchingRange = :matchingRange ,o.updateTime=current_timestamp where o.packingId = :packingId")
+    int upDateMatchingRange(Integer matchingRange,Integer packingId);
 }
 

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceChangeServiceImpl.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.library.service.impl;
 
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
+import com.tykj.dev.config.TaskBeanConfig;
 import com.tykj.dev.device.library.repository.DeviceChangeDao;
 import com.tykj.dev.device.library.service.DeviceChangeService;
 import com.tykj.dev.device.library.subject.domin.DeviceChange;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author dengdiyi
@@ -30,11 +32,14 @@ public class DeviceChangeServiceImpl implements DeviceChangeService {
     @Override
     public DeviceChange add(DeviceChange deviceChange) {
         DeviceChange deviceChange1 = deviceChangeDao.save(deviceChange);
-        BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceChange1));
-        String recordId = bcText.getData().getRecordID();
-        deviceChange1.setRecordId(recordId);
-//        blockChainUtil.appendHash(JacksonUtil.toJSon(deviceChange1),deviceChange1.getRecordId());
-        return deviceChangeDao.save(deviceChange1);
+        CompletableFuture.runAsync(()->{
+            DeviceChange deviceChange2 = getOne(deviceChange1.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceChange2));
+            String recordId = bcText.getData().getRecordID();
+            deviceChange2.setRecordId(recordId);
+            deviceChangeDao.save(deviceChange2);
+        }, TaskBeanConfig.getThreadPoolTaskScheduler());
+        return deviceChange1;
     }
 
     @Override

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

@@ -1758,6 +1758,7 @@ public class RepairController {
                 MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", Collections.singletonList(fileVo.getStartUserbId()), 1);
                 messageService.add(messageBto1);
             }
+            repairBackBill.setBackStatus(5);
             deviceRepairBackBillService.update(repairBackBill);
             List<Integer> ids = StringSplitUtil.split(repairBackBill.getBackCheckDetail());
             //业务完结
@@ -1867,6 +1868,8 @@ public class RepairController {
                 repairSendBill.setRepairUserbId(fileVo.getReceiveUserbId());
                 idList.add(fileVo.getReceiveUserbId());
             }
+            repairBill.setRepairStatus(4);
+            repairSendBill.setRepairStatus(5);
             deviceRepairBillService.update(repairBill);
             deviceRepairSendBillService.update(repairSendBill);
             List<Integer> ids = StringSplitUtil.split(repairSendBill.getRepairDeviceCheckDetail());

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -139,7 +139,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
                 predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
             }
         }
-//        predicateBuilder.eq("repairStatus", 5);
+        predicateBuilder.eq("backStatus", 5);
         return predicateBuilder.build();
     }
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java

@@ -125,7 +125,7 @@ public class RepairBillServiceImpl implements RepairBillService {
                 predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
             }
         }
-//        predicateBuilder.eq("repairStatus", 5);
+        predicateBuilder.eq("repairStatus", 4);
         return predicateBuilder.build();
     }
 }

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -128,11 +128,12 @@ public class MessageServiceImpl implements MessageService {
     public List<MessageUserVo> getNewList() {
         List<MessageUserVo> messageUserVos = new ArrayList<>();
         Integer userId = userUtils.getCurrentUserId();
-        UserRecord userRecord = userRecordDao.findByUserId(userId);
-        if (userRecord==null){
+        List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
+        if (userRecords.isEmpty()){
             return messageUserVos;
         }
         else {
+            UserRecord userRecord = userRecords.get(0);
             List<Integer> newTaskIds = StringSplitUtil.userIdSplit(userRecord.getNewReadIds());
             //筛选出新id的阅知
             messageUserVos = messageDao.findAll().stream()