更新

dev-config/src/main/java/com/tykj/dev/config/base/DeviceStyle.java

@@ -41,7 +41,8 @@ public enum DeviceStyle {
     /**
      * 密码卡
      */
-    STYLE_8(8, "密码卡");
+    STYLE_8(8, "密码卡"),
+    STYLE_9(9, "其它");
 
     public Integer id;
 

dev-matching/pom.xml

@@ -40,5 +40,9 @@
             <groupId>com.tykj.dev</groupId>
             <artifactId>blockcha</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>rfid</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -28,6 +28,8 @@ 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.utils.StringSplitUtil;
+import com.tykj.dev.rfid.service.RfidService;
+import com.tykj.dev.rfid.service.impl.RfidServiceImpl;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -98,6 +100,9 @@ public class MatchingDeviceController {
     @Autowired
     private MatchingDeviceLibraryDao matchingDeviceLibraryDao;
 
+    @Autowired
+    private RfidService rfidService;
+
     @ApiOperation(value = "添加配套设备", notes = "可以通过这个接口添加配套设备")
     @PostMapping(value = "/add")
     @Transactional(rollbackFor = Exception.class)
@@ -128,11 +133,14 @@ public class MatchingDeviceController {
 //        taskLogService.addLog(taskLogBto2);
         for (MatchingDeviceSaveVo matchingDeviceSaveVo : matchingDeviceBillSaveVo.getMatchingDeviceSaveVoList()) {
             MatchingDeviceLibrary matchingDeviceLibraryEntity = matchingDeviceSaveVo.toDo();
-            MatchingDeviceLibrary saveEntity = matchingDeviceLibraryService.addEntity(matchingDeviceLibraryEntity);
-            stringBuffer.append(saveEntity.getId());
+            MatchingDeviceLibrary d = matchingDeviceLibraryService.addEntity(matchingDeviceLibraryEntity);
+            rfidService.printString(String.valueOf(d.getId()),  d.getModel(), d.getName(),d.getSeqNumber());
+            d.setRfidCardId(RfidServiceImpl.completeRfidStr2(String.valueOf(d.getId())));
+            matchingDeviceLibraryService.update(d);
+            stringBuffer.append(d.getId());
             stringBuffer.append("x");
             //存装备日志
-            DeviceLogDto deviceLogDto = new DeviceLogDto(1, saveEntity.getId(), "发起新增配套", fileVoList);
+            DeviceLogDto deviceLogDto = new DeviceLogDto(1, d.getId(), "发起新增配套", fileVoList);
             deviceLogService.addLog(deviceLogDto);
         }
         //set账单新增设备详情

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceSaveVo.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.NotNull;
-import java.util.UUID;
 
 /**
  * @author dengdiyi
@@ -36,7 +35,7 @@ public class MatchingDeviceSaveVo {
     @ApiModelProperty(value = "设备序列号")
     private String seqNumber;
 
-    @NotNull(message = "rfidSurfaceId不能为空")
+//    @NotNull(message = "rfidSurfaceId不能为空")
     @ApiModelProperty(value = "rfid表面号")
     private String rfidSurfaceId;
 
@@ -49,9 +48,9 @@ public class MatchingDeviceSaveVo {
         BeanUtils.copyProperties(this, matchingDeviceLibraryEntity);
         matchingDeviceLibraryEntity.setLifeStatus(2);
         matchingDeviceLibraryEntity.setDeviceId(0);
-        if (matchingDeviceLibraryEntity.getRfidCardId()==null||"".equals(matchingDeviceLibraryEntity.getRfidCardId())){
-            matchingDeviceLibraryEntity.setRfidCardId(UUID.randomUUID().toString());
-        }
+//        if (matchingDeviceLibraryEntity.getRfidCardId()==null||"".equals(matchingDeviceLibraryEntity.getRfidCardId())){
+//            matchingDeviceLibraryEntity.setRfidCardId(UUID.randomUUID().toString());
+//        }
         return matchingDeviceLibraryEntity;
     }
 }

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

@@ -465,7 +465,10 @@ public class RepairController {
     public ResponseEntity receiveDevice(@RequestBody @Validated RepairReceiveVo repairReceiveVo) {
         //获取当前任务
         TaskBto taskBto = taskService.get(repairReceiveVo.getTaskId());
-        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_RECEIVE);
+        List<StatusEnum> statusEnums = new ArrayList<>();
+        statusEnums.add(StatusEnum.WAIT_RECEIVE);
+        statusEnums.add(StatusEnum.REPAIR_SEND_WAIT_SIGN);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
         Integer userId = userUtils.getCurrentUserId();
         //获取维修单，送修单，装备详情，维修装备详情
         RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
@@ -860,7 +863,10 @@ public class RepairController {
         RepairBackBill repairBackBill;
         if (repairReceiveVo.getTaskId()!=null) {
             taskBto = taskService.get(repairReceiveVo.getTaskId());
-            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_BACK_RECEIVE);
+            List<StatusEnum> statusEnums = new ArrayList<>();
+            statusEnums.add(StatusEnum.WAIT_BACK_RECEIVE);
+            statusEnums.add(StatusEnum.REPAIR_BACK_WAIT_SIGN);
+            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
             taskService.addInvolveUser(taskBto,userId);
             repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
             if (repairReceiveVo.getStartUserbId()!=null){

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -121,7 +121,6 @@ public class RfidController {
         return ResultUtil.success("打印成功");
     }
 
-
     @ApiOperation(value = "标签制作表单提交", notes = "标签制作表单提交")
     @PostMapping(value = "/form")
     @Transactional(rollbackOn = Exception.class)

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidServiceImpl.java

@@ -147,6 +147,11 @@ public class RfidServiceImpl implements RfidService {
         return tmpFile.getAbsolutePath();
     }
 
+    /**
+     * @param rfidStr 主键id
+     * @return rfid拼接字符串
+     * 补全核心装备rfid卡号，首位为0
+     */
     public static String completeRfidStr(String rfidStr){
         int needCompleteLength = RFID_MAX_LENGTH - rfidStr.length();
         StringBuilder stringBuilder = new StringBuilder();
@@ -156,6 +161,21 @@ public class RfidServiceImpl implements RfidService {
         return stringBuilder.append(rfidStr).toString().toUpperCase();
     }
 
+    /**
+     * @param rfidStr 主键id
+     * @return rfid拼接字符串
+     * 补全配套设备rfid卡号，首位为1
+     */
+    public static String completeRfidStr2(String rfidStr){
+        int needCompleteLength = RFID_MAX_LENGTH - rfidStr.length();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("1");
+        for (int i = 0; i < needCompleteLength-1; i++) {
+            stringBuilder.append("0");
+        }
+        return stringBuilder.append(rfidStr).toString().toUpperCase();
+    }
+
     /**
      * 计算RFID每行的ZPL
      * @param content