feat(配套设备库): 修改无关联装备查看,做序列号的校验

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

@@ -32,6 +32,7 @@ import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.*;
 import com.tykj.dev.rfid.entity.vo.PrintVo;
 import com.tykj.dev.rfid.entity.vo.RfidPrintVo;
@@ -214,7 +215,7 @@ public class MatchingDeviceController {
         matchingDeviceBillService.update(updateMatchingDeviceBill);
         //发送阅知信息
         List<Integer> ids = userPublicService.findOtherUser(userId);
-        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"业务办结",ids,1);
+        MessageBto messageBto = new MessageBto(taskBto1.getId(),taskBto1.getBusinessType(),"配套设备入库完成",ids,1);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResponseEntity.ok("ok");
@@ -395,16 +396,20 @@ public class MatchingDeviceController {
         MatchingDeviceLibrary m = matchingDeviceLibraryService.getOne(id);
         list.add(m);
         //添加关联装备详情
-        if (m.getDeviceId() != 0) {
-            list.add(deviceLibraryService.getOne(m.getDeviceId()));
-        } else {
-            list.add(null);
+        if(m.getDeviceId()!=null){
+            if (m.getDeviceId() != 0) {
+                list.add(deviceLibraryService.getOne(m.getDeviceId()));
+            } else {
+                list.add(null);
+            }
         }
+
         //添加设备履历日志
         List<DeviceLogUserVo> deviceLogs = deviceLogDao.getAllByDeviceIdAndType(id, 1).stream()
                 .map(DeviceLog::parse2Dto)
                 .map(DeviceLogDto::toVo)
-                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo).reversed()))
+                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime,
+                        Comparator.nullsLast(Date::compareTo).reversed()))
                 .collect(Collectors.toList());
         list.add(deviceLogs);
         return ResponseEntity.ok(list);
@@ -415,6 +420,8 @@ public class MatchingDeviceController {
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity update(@RequestBody @Validated MatchingDeviceEditVo matchingDeviceEditVo) {
+        //查询所有的配套设备
+        List<String> seqNumberList = matchingDeviceLibraryService.getAllMatchingDeviceLibraryListSeqNumberList();
         MatchingDeviceLibrary m = matchingDeviceLibraryService.getOne(matchingDeviceEditVo.getMatchingDeviceId());
         if (matchingDeviceEditVo.getCreateUnit() != null && !m.getCreateUnit().equals(matchingDeviceEditVo.getCreateUnit())) {
             //添加设备日志
@@ -457,7 +464,11 @@ public class MatchingDeviceController {
             String remark = "将设备的序列号由" + m.getSeqNumber() + "改为" + matchingDeviceEditVo.getSeqNumber();
             DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null,null);
             deviceLogService.addLog(deviceLogDto);
-            m.setSeqNumber(matchingDeviceEditVo.getSeqNumber());
+            if (seqNumberList.contains(matchingDeviceEditVo.getSeqNumber())){
+                throw new ApiException("序列号"+matchingDeviceEditVo.getSeqNumber()+"已经存在");
+            }else {
+                m.setSeqNumber(matchingDeviceEditVo.getSeqNumber());
+            }
         }
         if (matchingDeviceEditVo.getType() != null && !m.getType().equals(matchingDeviceEditVo.getType())) {
             //添加设备日志

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

@@ -92,4 +92,10 @@ public interface MatchingDeviceLibraryService {
      * @param matchingDeviceId 配套设备的id
      */
     MatchingDeviceLibrary printRfid(Integer matchingDeviceId);
+
+    /**
+     * 查询所有的序列号
+     * @return
+     */
+    List<String> getAllMatchingDeviceLibraryListSeqNumberList();
 }

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

@@ -308,6 +308,13 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
         return matchingDeviceLibrary;
     }
 
+    @Override
+    public List<String> getAllMatchingDeviceLibraryListSeqNumberList() {
+
+        return   matchingDeviceLibraryDao.findAll().stream().map(MatchingDeviceLibrary::getSeqNumber)
+                .collect(Collectors.toList());
+    }
+
 
     /**
      * @param matchingDeviceSelectVo 配套设备查询vo