fix(列装模块): 修改了更新列装时每修改一个字段发送一个阅知，以及阅知内容的格式

dev-config/src/main/java/com/tykj/dev/config/cache/ConfigCache.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 @Data
-@Component
 public class ConfigCache {
 
     private Map<Integer, String> lifeStatusMap;

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -747,6 +747,9 @@ public class PackingController {
         if (!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange(),packingLibraryUpdateVo.getType(),packingLibraryUpdateVo.getStyle(),packingLibraryUpdateVo.getName(),packingLibraryUpdateVo.getSecretLevel(),packingLibraryUpdateVo.getInvisibleRange())){
             throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同装备");
         }
+        Map<String,String> originalMap=new HashMap<>();
+        Map<String,String> nowMap=new HashMap<>();
+
         PackingLog packingLog = new PackingLog();
         //复制相同的字段
         if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())){
@@ -756,6 +759,8 @@ public class PackingController {
             //添加列装日志
 //            PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());
+            originalMap.put("名称",packingLibrary.getName());
+            nowMap.put("名称",packingLibraryUpdateVo.getName());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setName(packingLibraryUpdateVo.getName());
@@ -765,7 +770,11 @@ public class PackingController {
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
             //添加列装应用类型日志
 //            PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将应用类型从"+configCache.getApplyTypeMap().getOrDefault(packingLibrary.getApplyType(),"空")+"改为"+configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType()));
+            String originalApplyTypeName=configCache.getApplyTypeMap().getOrDefault(packingLibrary.getApplyType(),"空");
+            String newApplyTypeName=configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType());
+            packingLog.setRemark("将应用类型从"+originalApplyTypeName+"改为"+newApplyTypeName);
+            originalMap.put("应用类型",originalApplyTypeName);
+            nowMap.put("应用类型",newApplyTypeName);
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setApplyType(packingLibraryUpdateVo.getApplyType());
@@ -773,7 +782,11 @@ public class PackingController {
         if (packingLibraryUpdateVo.getSecretLevel()!=null&&!packingLibraryUpdateVo.getSecretLevel().equals(packingLibrary.getSecretLevel())){
             //添加列装密级日志
 //            PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将密级从"+configCache.getSecretLevelMap().getOrDefault(packingLibrary.getSecretLevel(),"空")+"改为"+configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel()));
+            String originalSecretLevelName=configCache.getSecretLevelMap().getOrDefault(packingLibrary.getSecretLevel(),"空");
+            String newSecretLevelName=configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel());
+            packingLog.setRemark("将密级从"+originalSecretLevelName+"改为"+newSecretLevelName);
+            originalMap.put("密级",originalSecretLevelName);
+            nowMap.put("密级",newSecretLevelName);
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setSecretLevel(packingLibraryUpdateVo.getSecretLevel());
@@ -841,7 +854,12 @@ public class PackingController {
         if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
             //添加列装可见范围日志
 //            PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将可见范围从"+configCache.getInvisibleRangeMap().getOrDefault(packingLibrary.getInvisibleRange(),"空")+"改为"+configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange()));
+            String originalInvisibleRange=configCache.getInvisibleRangeMap().getOrDefault(packingLibrary.getInvisibleRange(),"空");
+            String newInvisibleRange=configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange());
+            packingLog.setRemark("将可见范围从"+originalInvisibleRange+"改为"+newInvisibleRange);
+            originalMap.put("可见范围",originalInvisibleRange);
+            nowMap.put("可见范围",newInvisibleRange);
+
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setInvisibleRange(packingLibraryUpdateVo.getInvisibleRange());
@@ -849,7 +867,14 @@ public class PackingController {
         if (packingLibraryUpdateVo.getType()!=null&&!packingLibraryUpdateVo.getType().equals(packingLibrary.getType())){
             //添加列装形态日志
 //            PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将形态从"+configCache.getStyleMap().getOrDefault(packingLibrary.getType(),"空")+"改为"+configCache.getStyleMap().get(packingLibraryUpdateVo.getType()));
+
+            String originalStyleName=configCache.getStyleMap().getOrDefault(packingLibrary.getType(),"空");
+            String newStyleName=configCache.getStyleMap().get(packingLibraryUpdateVo.getType());
+            packingLog.setRemark("将形态从"+originalStyleName+"改为"+newStyleName);
+
+            originalMap.put("形态",originalStyleName);
+            nowMap.put("形态",newStyleName);
+
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setType(packingLibraryUpdateVo.getType());
@@ -857,7 +882,13 @@ public class PackingController {
         if (packingLibraryUpdateVo.getNature()!=null&&!packingLibraryUpdateVo.getNature().equals(packingLibrary.getNature())){
             //添加列装性质日志
 //            PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将列装性质从"+configCache.getNatureMap().getOrDefault(packingLibrary.getNature(),"空")+"改为"+configCache.getNatureMap().get(packingLibraryUpdateVo.getNature()));
+            String originalNatureName=configCache.getNatureMap().getOrDefault(packingLibrary.getNature(),"空");
+            String newNatureName=configCache.getNatureMap().get(packingLibraryUpdateVo.getNature());
+            packingLog.setRemark("将列装性质从"+originalNatureName+"改为"+newNatureName);
+
+            originalMap.put("列装性质",originalNatureName);
+            nowMap.put("列装性质",newNatureName);
+
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setNature(packingLibraryUpdateVo.getNature());
@@ -868,6 +899,10 @@ public class PackingController {
             String s1= packingLibrary.getStyle()==1?"装备":"附件";
             String s2= packingLibraryUpdateVo.getStyle()==1?"装备":"附件";
             packingLog.setRemark("将类型从"+s1+"改为"+s2);
+
+            originalMap.put("类型",s1);
+            nowMap.put("类型",s2);
+
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setStyle(packingLibraryUpdateVo.getStyle());
@@ -877,6 +912,8 @@ public class PackingController {
 //            PackingLog packingLog = new PackingLog();
             String origin = packingLibrary.getProdUnit()==null?"无":packingLibrary.getProdUnit();
             packingLog.setRemark("将生产单位从"+origin+"改为"+packingLibraryUpdateVo.getProdUnit());
+            originalMap.put("生产单位",origin);
+            nowMap.put("生产单位",packingLibraryUpdateVo.getProdUnit());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setProdUnit(packingLibraryUpdateVo.getProdUnit());
@@ -886,6 +923,8 @@ public class PackingController {
 //            PackingLog packingLog = new PackingLog();
             String origin = packingLibrary.getPrice()==null?"无":packingLibrary.getPrice();
             packingLog.setRemark("将价格从"+origin+"改为"+packingLibraryUpdateVo.getPrice());
+            originalMap.put("价格",origin);
+            nowMap.put("价格",packingLibraryUpdateVo.getPrice());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setPrice(packingLibraryUpdateVo.getPrice());
@@ -921,15 +960,39 @@ public class PackingController {
             packingLogService.add(packingLog);
             packingLibrary.setFileDb(FilesUtil.stringFileToList(packingLibraryUpdateVo.getFileList()));
         }
-
         packingLibraryService.update(packingLibrary);
         //发送阅知信息
         List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
-        MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装:"+packingLog.getRemark(),userIds,0);
-        messageService.add(messageBto);
+        originalMap.entrySet().forEach(
+                stringStringEntry -> {
+                    MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原【"+stringStringEntry.getKey()+":"+originalMap.get(stringStringEntry.getKey())+"】--》现【"+stringStringEntry.getKey()+":"+nowMap.get(stringStringEntry.getKey())+"】",userIds,0);
+                    messageService.add(messageBto);
+
+                }
+        );
         return ResponseEntity.ok("编辑成功");
     }
 
+
+//    private String mapToString(Map<String,String> map){
+//        StringBuilder stringBuilder=new StringBuilder();
+//        stringBuilder.append("【");
+//        int size=map.size();
+//        int index=1;
+//        map.entrySet().stream().sorted(Map.Entry.comparingByKey())
+//                .collect(Collectors.toMap(Map.Entry::getKey,Map.Entry::getValue,(oldVal,newVal)->oldVal,LinkedHashMap::new))
+//                .forEach((k,v)->{
+//                    stringBuilder.append(k).append(":").append(v);
+//                    if (size!=index) {
+//                        stringBuilder.append(",");
+//                    }
+//                 });
+//
+//        stringBuilder.append("】");
+//        return stringBuilder.toString();
+//    }
+
+
     @ApiOperation(value = "获取列装名称")
     @GetMapping("/getName/{id}")
     public ResponseEntity getPackName(@PathVariable("id") int id){