From d4ae1c385df278cd6aebf7c701d09c88d76531d0 Mon Sep 17 00:00:00 2001
From: liulixin <zycloud@zycloud.com>
Date: Wed, 3 Jan 2024 17:26:34 +0800
Subject: [PATCH] bug fix

---
 src/main/java/com/zcloud/aspect/DockingAspect.java            | 4 ++--
 .../java/com/zcloud/controller/gf/AppGFCutRoadController.java | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java
index 901c1411..2c2fda68 100644
--- a/src/main/java/com/zcloud/aspect/DockingAspect.java
+++ b/src/main/java/com/zcloud/aspect/DockingAspect.java
@@ -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);
diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
index b34c88d5..2a31a8b2 100644
--- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
+++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java
@@ -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";