From 519e74273692c618daa883eacc57f64b92bfb3cf Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Tue, 14 Jan 2025 19:04:39 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=B8=8B=E5=8F=91=E9=92=A2=E5=8D=B7?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E5=80=BC=E8=AF=B7=E6=B1=82=E5=88=B0=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fizz/business/controller/CrmPdoExcoilController.java | 3 ---
 .../com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java   | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
index bba2b5c..9184113 100644
--- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
+++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java
@@ -3,12 +3,9 @@ package com.fizz.business.controller;
 import com.fizz.business.domain.CrmPdoExcoil;
 import com.fizz.business.form.CrmPdoExcoilForm;
 import com.fizz.business.service.CrmPdoExcoilService;
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
index 9312207..ff0aa4b 100644
--- a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
+++ b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java
@@ -71,19 +71,20 @@ public class RabbitQueueListener {
         // 获取 messageId
         String messageId = (String) headers.get("amqp_messageId");
 
+        // 去掉字符串两端的引号
+        message = message.replaceAll("^\"|\"$", "");
         // 处理消息逻辑
         if ("TOTAL_PRESET_DONE".equalsIgnoreCase(messageId)) {
 
             List<ModSetupResultVO> setup = modSetupResultService.getSetupByCoilid(message);
 
-
             ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO();
             modSetupResultKeyVO.setKey(ModSetupResultServiceImpl.WS_EKY);
             modSetupResultKeyVO.setLists(setup);
             //socket
             WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO));
         } else  if ("TOTAL_PRESET_FAILED".equalsIgnoreCase(messageId)) {
-            WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr("计算失败"));
+            WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(Lists.newArrayList()));
         }
     }