From d7d27bd6ba68b83512a092b0f203635c14d4fd04 Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Tue, 14 Jan 2025 10:34:30 +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

---
 .../main/java/com/fizz/business/domain/ModSetupResult.java  | 2 +-
 .../com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java  | 4 +++-
 .../business/service/impl/ModSetupResultServiceImpl.java    | 6 ++++++
 .../main/java/com/fizz/business/vo/ModSetupResultVO.java    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
index d84643d..778bfae 100644
--- a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
+++ b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
@@ -20,7 +20,7 @@ public class ModSetupResult {
     private Integer id;
 
     @ApiModelProperty(value = "logid")
-    private Integer logId;
+    private Long logId;
 
     @ApiModelProperty(value = "钢卷ID")
     private String coilId;
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 a969948..c9266c8 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
@@ -16,6 +16,7 @@ import org.springframework.messaging.handler.annotation.Headers;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +26,7 @@ public class RabbitQueueListener {
 
     public static List<String> measureList = Lists.newArrayList();
 
+    @Resource
     ModSetupResultService modSetupResultService;
 
     private Double LastRolledLength = 0d;
@@ -63,7 +65,7 @@ public class RabbitQueueListener {
         // 获取 messageId
         String messageId = (String) headers.get("amqp_messageId");
 
-        // 处理消息逻辑 todo
+        // 处理消息逻辑
         if ("TOTAL_PRESET_DONE".equalsIgnoreCase(messageId)) {
 
             List<ModSetupResultVO> setup = modSetupResultService.getSetupByCoilid(message);
diff --git a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
index cc805dd..1f8101f 100644
--- a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
@@ -15,6 +15,7 @@ import com.fizz.business.service.ModSetupResultService;
 import com.fizz.business.utils.WebSocketUtil;
 import com.fizz.business.vo.ModSetupResultKeyVO;
 import com.fizz.business.vo.ModSetupResultVO;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.core.MessagePropertiesBuilder;
@@ -135,6 +136,11 @@ public class ModSetupResultServiceImpl extends ServiceImpl<ModSetupResultMapper,
 
         List<ModSetupResult> results = this.baseMapper.selectList(queryWrapper);
 
+        if (results == null || results.isEmpty()){
+
+            return Lists.newArrayList();
+        }
+
 
         return BeanUtil.copyToList(results, ModSetupResultVO.class);
     }
diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
index 74b8fe4..4ec56ab 100644
--- a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
+++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
@@ -17,7 +17,7 @@ public class ModSetupResultVO {
     private Integer id;
 
     @ApiModelProperty(value = "logid")
-    private Integer logId;
+    private Long logId;
 
     @ApiModelProperty(value = "钢卷ID")
     private String coilId;