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 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 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 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;