feat(配发模块，自查模块): 修改了日志，打印500

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

@@ -40,7 +40,7 @@ public class MatchingDeviceSaveVo {
     @ApiModelProperty(value = "创建单位Id")
     private Integer createUnitId;
 
-    @NotNull(message = "createUnitId不能为空")
+    @NotNull(message = "locationUnitId不能为空")
     @ApiModelProperty(value = "所在单位Id")
     private Integer locationUnitId;
 

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/config/HistoryDeviceBillRun.java

@@ -36,12 +36,12 @@ public class HistoryDeviceBillRun  {
 
     private Map<Integer, List<HistoryDeviceBill>> map =new HashMap<>();
 
-    @PostConstruct
-    private void initHistoryDeviceBill(){
-        log.info("历史自查存储数据表开始同步....");
-        this.map = deviceBillDao.findAll().stream().collect(Collectors.groupingBy(HistoryDeviceBill::getBillId));
-        log.info("历史自查存储数据表同步成功....");
-    }
+//    @PostConstruct
+//    private void initHistoryDeviceBill(){
+//        log.info("历史自查存储数据表开始同步....");
+//        this.map = deviceBillDao.findAll().stream().collect(Collectors.groupingBy(HistoryDeviceBill::getBillId));
+//        log.info("历史自查存储数据表同步成功....");
+//    }
 
 
 }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -405,6 +405,13 @@ public class SelfCheckController {
                     historyDeviceBill.setOwnUnit(deviceLibrary.getOwnUnit());
                     historyDeviceBill.setCheckResult(1);
                     historyDeviceBill.setSeqNumber(deviceLibrary.getSeqNumber());
+
+                    historyDeviceBill.setProdNumber(deviceLibrary.getProdNumber());
+                    historyDeviceBill.setInvisibleRangeName(deviceLibrary.getInvisibleRangeName());
+                    historyDeviceBill.setIsPart(deviceLibrary.getIsPart());
+                    historyDeviceBill.setTypeName(deviceLibrary.getTypeName());
+                    historyDeviceBill.setSecretLevelName(deviceLibrary.getSecretLevelName());
+
                     historyDeviceBillList.add(historyDeviceBill);
                 });
                 //保存
@@ -437,6 +444,13 @@ public class SelfCheckController {
                     historyDeviceBill.setOwnUnit(deviceLibrary.getOwnUnit());
                     historyDeviceBill.setCheckResult(1);
                     historyDeviceBill.setSeqNumber(deviceLibrary.getSeqNumber());
+
+                    historyDeviceBill.setProdNumber(deviceLibrary.getProdNumber());
+                    historyDeviceBill.setInvisibleRangeName(deviceLibrary.getInvisibleRangeName());
+                    historyDeviceBill.setIsPart(deviceLibrary.getIsPart());
+                    historyDeviceBill.setTypeName(deviceLibrary.getTypeName());
+                    historyDeviceBill.setSecretLevelName(deviceLibrary.getSecretLevelName());
+
                     historyDeviceBillList.add(historyDeviceBill);
                 });
                 //保存
@@ -466,6 +480,12 @@ public class SelfCheckController {
                     historyDeviceBill.setOwnUnit(deviceLibrary.getOwnUnit());
                     historyDeviceBill.setCheckResult(0);
                     historyDeviceBill.setSeqNumber(deviceLibrary.getSeqNumber());
+
+                    historyDeviceBill.setProdNumber(deviceLibrary.getProdNumber());
+                    historyDeviceBill.setInvisibleRangeName(deviceLibrary.getInvisibleRangeName());
+                    historyDeviceBill.setIsPart(deviceLibrary.getIsPart());
+                    historyDeviceBill.setTypeName(deviceLibrary.getTypeName());
+                    historyDeviceBill.setSecretLevelName(deviceLibrary.getSecretLevelName());
                     historyDeviceBillList.add(historyDeviceBill);
                 });
                 //保存

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/HistoryDeviceBill.java

@@ -75,5 +75,34 @@ public class HistoryDeviceBill {
     @ApiModelProperty(value = "业务id")
     private Integer billId;
 
+    /**
+     * 可见范围
+     */
+    @ApiModelProperty(value = "可见范围")
+    private String invisibleRangeName;
+
+    /**
+     * 形态
+     */
+    @ApiModelProperty(value = "形态")
+    private String typeName;
+
+    /**
+     * 生产序列号
+     */
+    @ApiModelProperty(value = "生产序列号")
+    private String prodNumber;
+
+    /**
+     * 是不是配件(0:不是，1:是) 0 装备 1 附件
+     */
+    @ApiModelProperty(value = "是不是配件(0:不是，1:是)")
+    private Integer isPart;
+
+    @ApiModelProperty(value = "密级")
+    private String secretLevelName;
+
+
+
 
 }