Skip to content

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

fix(配发，退回，列装): 修改了发送阅知的格式

修改了发送阅知的格式
上级 43a7b64c
隐藏空白字符变更
内嵌 并排
正在显示 包含 45 行增加 和 16 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ 32b897bf
......@@ -343,7 +343,8 @@ public class AllotBillController {
// messageService.add(messageBto);
// }
//给同单位专管员和收件单位专管员推阅知
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发", idList, 1);
MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "发起配发业务:" + MessageFormatUtil.spellTwoWicket(allotBillEntity.getSendUnit(),allotBillEntity.getReceiveUnit()), idList, 1);
// MessageBto messageBto = new MessageBto(saveEntity.getId(), saveEntity.getBusinessType(), "对" + userPublicService.getAreaNameByUnitName(allotBillEntity.getReceiveUnit()) + "发起配发", idList, 1);
messageService.add(messageBto);
log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
myWebSocket.sendMessage1();
......@@ -477,8 +478,8 @@ public class AllotBillController {
messageService.add(messageBto);
}
//根据status判断是否业务完结，发送不同的阅知message
String message = allotReceiveVo.getStatus() == 0 ? allotBillEntity.getReceiveUnit()+"配发业务已办结" : allotBillEntity.getReceiveUnit()+"接收配发装备";
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), message, ids, 1);
String message = allotReceiveVo.getStatus() == 0 ? "办结配发业务:" :"接收配发装备:";
MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), message+MessageFormatUtil.spellTwoWicket(allotBillEntity.getSendUnit(),allotBillEntity.getReceiveUnit()), ids, 1);
messageService.add(messageBto);
log.info("[配发模块]:接收并发起入库");
myWebSocket.sendMessage1();
......@@ -772,9 +773,9 @@ public class AllotBillController {
.map(User::getUserId)
.collect(Collectors.toList()));
// String content = allotBill.getReceiveUnit()+"单位的配发业务已办结";
String content = "发起配发业务已办结";
String content = "办结配发业务";
// MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), "业务办结", userIds, 1);
MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), content, userIds, 1);
MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(), taskBto.getBusinessType(), content+MessageFormatUtil.spellTwoWicket(allotBill.getSendUnit(),allotBill.getReceiveUnit()), userIds, 1);
messageService.add(messageBto);
return ResponseEntity.ok("OK");
}
......
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java
浏览文件 @ 32b897bf
......@@ -201,7 +201,9 @@ public class BackController {
messageService.add(messageBto);
}
//给同单位专管员和收件单位专管员推阅知
MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBackBill.getReceiveUnit()) + "发起退回",idList,1);
// MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"对" + userPublicService.getAreaNameByUnitName(allotBackBill.getReceiveUnit()) + "发起退回",idList,1);
MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"发起退回业务:" + MessageFormatUtil.spellTwoWicket(allotBackBill1.getSendUnit(),allotBackBill1.getReceiveUnit()),idList,1);
messageService.add(messageBto);
log.info("[退回模块]:" + allotBackBill.getSendUnit() + "对" + allotBackBill.getReceiveUnit() + "发起退回");
//添加taskId
......@@ -320,9 +322,9 @@ public class BackController {
}
//根据status判断是否业务完结，发送不同的阅知message
// String message = allotBackReceiveVo.getStatus()==0?"业务办结":"接收退回装备";
String message = allotBackReceiveVo.getStatus()==0?"单位退回业务已办结":"单位接收退回装备";
String message = allotBackReceiveVo.getStatus()==0?"办结退回:":"接收退回装备:";
MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),
allotBackBill.getReceiveUnit()+message,ids,1);
message+MessageFormatUtil.spellTwoWicket(allotBackBill.getSendUnit(),allotBackBill.getReceiveUnit()),ids,1);
messageService.add(messageBto);
log.info("[退回模块]:接收并发起入库");
myWebSocket.sendMessage1();
......@@ -386,7 +388,7 @@ public class BackController {
.collect(Collectors.toList()));
// MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"业务办结",ids,1);
MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),
allotBackBill.getReceiveUnit()+"退回业务已办结",ids,1);
"办结退回业务:"+MessageFormatUtil.spellTwoWicket(allotBackBill.getSendUnit(),allotBackBill.getReceiveUnit()),ids,1);
messageService.add(messageBto);
return ResponseEntity.ok("上传成功");
}
......@@ -463,7 +465,7 @@ public class BackController {
.map(User::getUserId)
.collect(Collectors.toList()));
MessageBto messageBto = new MessageBto(taskBto.getParentTaskId(),taskBto.getBusinessType(),
allotBackBill.getReceiveUnit()+"业务办结",userIds,1);
"办结退回业务"+MessageFormatUtil.spellTwoWicket(allotBackBill.getSendUnit(),allotBackBill.getReceiveUnit()),userIds,1);
messageService.add(messageBto);
return ResponseEntity.ok("OK");
}
......
dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java
浏览文件 @ 32b897bf
......@@ -136,6 +136,7 @@ public class PackingController {
map.put("error","型号"+addModel.getModel()+"已存在");
return ResponseEntity.ok(map);
}
Map<String,String> nowMap=new HashMap<>();
PackingLibrary packingLibrary = new PackingLibrary();
BeanUtils.copyProperties(addModel,packingLibrary);
packingLibrary.setIsRoot(1);
......@@ -145,6 +146,7 @@ public class PackingController {
packingLibrary.setShowOrder(null);
PackingLibrary packingLibrary1 = packingLibraryService.addEntity(packingLibrary);
String message = "添加列装型号:"+addModel.getModel();
nowMap.put("型号",addModel.getModel());
//添加列装日志
PackingLog packingLog = new PackingLog();
packingLog.setRemark(message);
......@@ -152,7 +154,7 @@ public class PackingController {
packingLogService.add(packingLog);
//发送阅知信息
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,message,userIds,0);
MessageBto messageBto = new MessageBto(0,1,"添加列装目录:"+mapToString(nowMap),userIds,0);
messageBto.setRecord(packingLibrary1.getId().toString());
messageService.add(messageBto);
//更新型号和排序号的对应map
......@@ -236,10 +238,12 @@ public class PackingController {
return ResponseEntity.ok(map);
}
}
PackingLibrary packingLibrary = addPack.toDo();
PackingLibrary packingLibrary = addPack.toDo().setConfigName();
PackingLibrary packingLibrary1 = packingLibraryService.getOne(addPack.getPartParentId());
// TaskBto taskBto = new TaskBto(StatusEnum.END.id, "列装业务", null, ".", packingLibrary1.getId(), 1, userUtils.getCurrentUnitId(), 0, null, Collections.singletonList(userUtils.getCurrentUserId()));
// TaskBto saveEntity = taskService.start(taskBto);
Map<String,String> partMap=new HashMap<>();
Map<String,String> childMap=new HashMap<>();
if (packingLibrary1.getIsRoot()==1){
//不是配件
packingLibrary.setIsPart(0);
......@@ -248,8 +252,11 @@ public class PackingController {
// TaskLogBto taskLogBto2 = new TaskLogBto(saveEntity.getId(), message, null);
// taskLogService.addLog(taskLogBto2);
//发送阅知信息
partMap.put("型号",packingLibrary.getModel());
partMap.put("名称",packingLibrary.getName());
partMap.put("配用范围",packingLibrary.getMatchingRangeName());
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,message,userIds,0);
MessageBto messageBto = new MessageBto(0,1,"添加列装信息:"+mapToString(partMap),userIds,0);
messageBto.setRecord(packingLibrary1.getId().toString());
messageService.add(messageBto);
//添加列装日志
......@@ -266,8 +273,14 @@ public class PackingController {
// TaskLogBto taskLogBto2 = new TaskLogBto(saveEntity.getId(), message, null);
// taskLogService.addLog(taskLogBto2);
//发送阅知信息
partMap.put("型号",packingLibrary1.getModel());
partMap.put("名称",packingLibrary1.getName());
partMap.put("配用范围",packingLibrary1.getMatchingRangeName());
childMap.put("型号",packingLibrary.getModel());
childMap.put("名称",packingLibrary.getName());
childMap.put("配用范围",packingLibrary.getMatchingRangeName());
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,message,userIds,0);
MessageBto messageBto = new MessageBto(0,1,"添加列装信息:"+mapToString(partMap)+"子级"+mapToString(childMap),userIds,0);
messageBto.setRecord(packingLibrary1.getId().toString());
messageService.add(messageBto);
//添加列装日志
......@@ -289,7 +302,16 @@ public class PackingController {
@PostMapping("/delete/{id}")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity deleteById(@PathVariable("id") int id){
PackingLibrary packingLibrary= packingLibraryService.getOne(id);
Map<String,String> nowMap=new HashMap<>();
packingLibraryService.deleteAll(id);
nowMap.put("型号",packingLibrary.getModel());
nowMap.put("名称",packingLibrary.getName());
nowMap.put("配用范围",packingLibrary.getMatchingRangeName());
List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
MessageBto messageBto = new MessageBto(0,1,"删除列装信息:"+mapToString(nowMap),userIds,0);
messageBto.setRecord(packingLibrary.getId().toString());
messageService.add(messageBto);
return ResponseEntity.ok("删除成功");
}
......@@ -540,6 +562,8 @@ public class PackingController {
}
packingLibrary.setShowOrder(packingModelEdit.getShowOrder());
PackingLog packingLog = new PackingLog();
Map<String,String> originalMap=new HashMap<>();
Map<String,String> nowMap=new HashMap<>();
if (packingLibrary.getIsRoot() == 1) {
if (packingModelEdit.getModel() != null && !packingModelEdit.getModel().equals(packingLibrary.getModel())) {
//判断该列装下有没有入库装备 有装备则进行装备的型号的修改
......@@ -570,6 +594,8 @@ public class PackingController {
log.info("batchUpdateDevices时间：{}", System.currentTimeMillis() - l2);
// }
String remark = "将原型号"+packingLibrary.getModel()+"修改型号为"+packingModelEdit.getModel();
originalMap.put("型号",packingLibrary.getModel());
nowMap.put("型号",packingModelEdit.getModel());
packingLibrary.setModel(packingModelEdit.getModel());
packingLibrary.setName(packingModelEdit.getModel());
packingLibraryService.changeAllModel(packingLibrary.getId(), packingModelEdit.getModel());
......@@ -588,7 +614,7 @@ public class PackingController {
//// MessageBto messageBto = new MessageBto(0, 1, "修改列装型号目录", userIds, 0);
// }else {
if (packingLog.getRemark()!=null){
messageBto= new MessageBto(0, 1, "修改"+packingLibrary.getModel()+"列装目录为:"+packingLog.getRemark(), userIds, 0);
messageBto= new MessageBto(0, 1, "修改"+packingLibrary.getModel()+"列装目录为:原"+mapToString(originalMap)+"-->现"+mapToString(nowMap), userIds, 0);
}
// }
......@@ -964,7 +990,7 @@ public class PackingController {
//
// }
// );
MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原"+mapToString(originalMap)+"--》现"+mapToString(nowMap),userIds,0);
MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原"+mapToString(originalMap)+"-->现"+mapToString(nowMap),userIds,0);
messageService.add(messageBto);
return ResponseEntity.ok("编辑成功");
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论