guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

无dockData不发送消息

pull/14/head
dearlin 2023-12-26 11:54:38 +08:00
parent 1894777d56
commit e86570bb8d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/zcloud/aspect/DockingAspect.java
View File

@ -186,20 +186,21 @@ public class DockingAspect {
sendData.put("sendPicturesList", proceed.get("sendPicturesList"));
proceed.remove("sendPicturesList");
}
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
sendData.put("dockData", proceed.get("dockData"));
proceed.remove("dockData");
} else {
sendData.put("dockData", "手动添加的dockData");
}
TenCorpDto tenCorpDto = new TenCorpDto();
tenCorpDto.setMessage("沧州矿石数据同步消息");
tenCorpDto.setData(sendData);
tenCorpDto.setId(UuidUtil.get32UUID());
tenCorpDto.setTopic("docking");
tenCorpDto.setProducer_name("qa-prevention-czks");
sendMessageService.sendMessage(tenCorpDto);
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
sendData.put("dockData", proceed.get("dockData"));
proceed.remove("dockData");
sendMessageService.sendMessage(tenCorpDto);
} else {
System.out.println("------------------------无dockData不发消息------------------------");
}
System.out.println("------------------------切面方法结束------------------------");
}

5
src/main/java/com/zcloud/controller/filemanager/MfolderController.java
View File

@ -112,12 +112,12 @@ public class MfolderController extends BaseController {
pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
"@@"
+fileName);
map.put("dockData", JSON.toJSONString(pd)); //返回结果
map.put("sendPicturesList", JSON.toJSONString(pictureList)); //图片返回结果
}else{
errInfo = "fail";
}
map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
map.put("sendPicturesList", JSON.toJSONString(pictureList)); //图片返回结果
return map;
}
@ -259,6 +259,7 @@ public class MfolderController extends BaseController {
}
pd.put("MFOLDER_ID", MFOLDER_ID);
mfolderService.delete(pd);
map.put("dockData", JSON.toJSONString(pd)); //返回结果
}
map.put("result", errInfo); //返回结果
return map;