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

bug fix

pull/14/head
liulixin 2024-01-03 17:26:34 +08:00
parent 32928c77ea
commit d4ae1c385d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import com.zcloud.entity.PageData;
import com.zcloud.entity.system.User;
import com.zcloud.service.docking.DockingRelationService;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.Const;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
@ -193,7 +192,8 @@ public class DockingAspect {
tenCorpDto.setTopic("docking");
tenCorpDto.setProducer_name("qa-prevention-czks");
// 有dockData
if (Tools.notEmpty(proceed.get("dockData"))) {
String dockData = JSON.toJSONString(proceed.get("dockData"));
if (Tools.notEmpty(dockData)) {
sendData.put("dockData", proceed.get("dockData"));
proceed.remove("dockData");
sendMessageService.sendMessage(tenCorpDto);

2
src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
View File

@ -600,6 +600,7 @@ public class AppGFCutRoadController extends BaseController {
@RequestMapping(value = "/editStatus")
@ResponseBody
@Transactional
@DockAnnotation
public Object editStatus(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files
) throws Exception {
@ -983,6 +984,7 @@ public class AppGFCutRoadController extends BaseController {
*/
@RequestMapping(value = "/deleteAll")
@ResponseBody
@DockAnnotation
public Object deleteAll() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";