From e86570bb8d5bd41219286e956134556d30e83bb1 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Tue, 26 Dec 2023 11:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0dockData=E4=B8=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/aspect/DockingAspect.java   | 17 +++++++++--------
 .../filemanager/MfolderController.java          |  5 +++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java
index 170e069c..10c10005 100644
--- a/src/main/java/com/zcloud/aspect/DockingAspect.java
+++ b/src/main/java/com/zcloud/aspect/DockingAspect.java
@@ -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("------------------------切面方法结束------------------------");
     }
 
diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java
index 34996d7e..7f245330 100644
--- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java
+++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java
@@ -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;