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 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())); } }