Skip to content

D
device-back
提交 f821c454 authored 作者: zjm's avatar zjm
浏览文件
操作

fix(列装模块): 把之前修改一个字段发一条阅知 修改成修改多个字段发一个阅知

把之前修改一个字段发一条阅知 修改成修改多个字段发一个阅知
上级 c787dc89
隐藏空白字符变更
内嵌 并排
正在显示 包含 40 行增加 和 39 行删除
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java
浏览文件 @ f821c454
......@@ -3,7 +3,6 @@ package com.tykj.dev.device.packing.controller;
import com.tykj.dev.config.cache.ConfigCache;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService;
......@@ -27,7 +26,6 @@ import com.tykj.dev.device.user.read.service.MessageService;
import com.tykj.dev.device.user.read.subject.bto.MessageBto;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.*;
import com.tykj.dev.socket.MyWebSocket;
......@@ -747,14 +745,14 @@ public class PackingController {
Map<String,String> originalMap=new HashMap<>();
Map<String,String> nowMap=new HashMap<>();
PackingLog packingLog = new PackingLog();
// PackingLog packingLog = new PackingLog();
//复制相同的字段
if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())){
if (packingLibraryService.nameIsExist1(packingLibrary.getModel(),packingLibraryUpdateVo.getName(),packingLibrary.getPartParentId(),packingLibrary.getMatchingRange())){
throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同名称装备");
}
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());
originalMap.put("名称",packingLibrary.getName());
nowMap.put("名称",packingLibraryUpdateVo.getName());
......@@ -766,7 +764,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
//添加列装应用类型日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String originalApplyTypeName=configCache.getApplyTypeMap().getOrDefault(packingLibrary.getApplyType(),"空");
String newApplyTypeName=configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType());
packingLog.setRemark("将应用类型从"+originalApplyTypeName+"改为"+newApplyTypeName);
......@@ -778,7 +776,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getSecretLevel()!=null&&!packingLibraryUpdateVo.getSecretLevel().equals(packingLibrary.getSecretLevel())){
//添加列装密级日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String originalSecretLevelName=configCache.getSecretLevelMap().getOrDefault(packingLibrary.getSecretLevel(),"空");
String newSecretLevelName=configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel());
packingLog.setRemark("将密级从"+originalSecretLevelName+"改为"+newSecretLevelName);
......@@ -850,7 +848,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
//添加列装可见范围日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String originalInvisibleRange=configCache.getInvisibleRangeMap().getOrDefault(packingLibrary.getInvisibleRange(),"空");
String newInvisibleRange=configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange());
packingLog.setRemark("将可见范围从"+originalInvisibleRange+"改为"+newInvisibleRange);
......@@ -863,7 +861,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getType()!=null&&!packingLibraryUpdateVo.getType().equals(packingLibrary.getType())){
//添加列装形态日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String originalStyleName=configCache.getStyleMap().getOrDefault(packingLibrary.getType(),"空");
String newStyleName=configCache.getStyleMap().get(packingLibraryUpdateVo.getType());
......@@ -878,7 +876,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getNature()!=null&&!packingLibraryUpdateVo.getNature().equals(packingLibrary.getNature())){
//添加列装性质日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String originalNatureName=configCache.getNatureMap().getOrDefault(packingLibrary.getNature(),"空");
String newNatureName=configCache.getNatureMap().get(packingLibraryUpdateVo.getNature());
packingLog.setRemark("将列装性质从"+originalNatureName+"改为"+newNatureName);
......@@ -892,7 +890,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getStyle()!=null&&!packingLibraryUpdateVo.getStyle().equals(packingLibrary.getStyle())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String s1= packingLibrary.getStyle()==1?"装备":"附件";
String s2= packingLibraryUpdateVo.getStyle()==1?"装备":"附件";
packingLog.setRemark("将类型从"+s1+"改为"+s2);
......@@ -905,7 +903,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getProdUnit()!=null&&!packingLibraryUpdateVo.getProdUnit().equals(packingLibrary.getProdUnit())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String origin = packingLibrary.getProdUnit()==null?"无":packingLibrary.getProdUnit();
packingLog.setRemark("将生产单位从"+origin+"改为"+packingLibraryUpdateVo.getProdUnit());
originalMap.put("生产单位",origin);
......@@ -916,7 +914,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getPrice()!=null&&!packingLibraryUpdateVo.getPrice().equals(packingLibrary.getPrice())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
String origin = packingLibrary.getPrice()==null?"无":packingLibrary.getPrice();
packingLog.setRemark("将价格从"+origin+"改为"+packingLibraryUpdateVo.getPrice());
originalMap.put("价格",origin);
......@@ -927,7 +925,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getImageUrl()!=null&&!packingLibraryUpdateVo.getImageUrl().equals(packingLibrary.getImageUrl())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
packingLog.setRemark("更新设备图片");
packingLog.setPackingId(packingLibrary.getId());
packingLogService.add(packingLog);
......@@ -936,7 +934,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getFileUrl()!=null&&!packingLibraryUpdateVo.getFileUrl().equals(packingLibrary.getFileUrl())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
if ("".equals(packingLibraryUpdateVo.getFileUrl())){
packingLog.setRemark("删除列装文件");
}
......@@ -950,7 +948,7 @@ public class PackingController {
}
if (packingLibraryUpdateVo.getFileList()!=null&&!FilesUtil.stringFileToList(packingLibraryUpdateVo.getFileList()).equals(packingLibrary.getFileDb())){
//添加列装日志
// PackingLog packingLog = new PackingLog();
PackingLog packingLog = new PackingLog();
packingLog.setRemark("更新列装设备文件");
packingLog.setPackingId(packingLibrary.getId());
packingLogService.add(packingLog);
......@@ -959,34 +957,37 @@ public class PackingController {
packingLibraryService.update(packingLibrary);
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
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);
}
);
// 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);
//
// }
// );
MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原"+mapToString(originalMap)+"--》现"+mapToString(nowMap),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();
// }
private String mapToString(Map<String,String> map){
StringBuilder stringBuilder=new StringBuilder();
stringBuilder.append("【");
int size=map.size();
AtomicInteger index= new AtomicInteger(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.get()) {
stringBuilder.append(",");
}
index.set(index.get()+1);
});
stringBuilder.append("】");
return stringBuilder.toString();
}
@ApiOperation(value = "获取列装名称")
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论