1111

.gitignore

@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+
+*.log

src/main/java/com/fdkankan/jp/xspace/common/rabbitmq/RabbitmqConstant.java

@@ -2,6 +2,6 @@ package com.fdkankan.jp.xspace.common.rabbitmq;
 
 public class RabbitmqConstant {
 
-    public final static String QUEUE_PACK_XSPACE = "queue-page-xspace";
+    public final static String QUEUE_PACK_XSPACE = "queue-pack-xspace";
 
 }

src/main/java/com/fdkankan/jp/xspace/common/rabbitmq/dto/SceneXspaceMqDTO.java

@@ -0,0 +1,24 @@
+package com.fdkankan.jp.xspace.common.rabbitmq.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class SceneXspaceMqDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String num;
+
+    private String serial;
+
+    private Integer status;
+
+}

src/main/java/com/fdkankan/jp/xspace/listener/RabbitMqListener.java

@@ -6,6 +6,7 @@ import com.fdkankan.dingtalk.DingTalkSendUtils;
 import com.fdkankan.jp.xspace.common.constant.NasPathConstant;
 import com.fdkankan.jp.xspace.common.exception.PackException;
 import com.fdkankan.jp.xspace.common.rabbitmq.RabbitmqConstant;
+import com.fdkankan.jp.xspace.common.rabbitmq.dto.SceneXspaceMqDTO;
 import com.fdkankan.jp.xspace.entity.SceneXspace;
 import com.fdkankan.jp.xspace.entity.User;
 import com.fdkankan.jp.xspace.service.ISceneXspaceService;
@@ -60,16 +61,16 @@ public class RabbitMqListener {
      * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
      * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
      */
-//    @RabbitListener(
-//        queuesToDeclare = @Queue(RabbitmqConstant.QUEUE_PACK_XSPACE),
-//        concurrency = "1"
-//    )
+    @RabbitListener(
+        queuesToDeclare = @Queue(RabbitmqConstant.QUEUE_PACK_XSPACE),
+        concurrency = "1"
+    )
     public void packXspace(Channel channel, Message message) throws Exception {
         String messageId = message.getMessageProperties().getMessageId();
         String msg = new String(message.getBody(), StandardCharsets.UTF_8);
         log.info("开始消费消息,id:{},content:{}", messageId, msg);
-
-        SceneXspace bean = BeanUtil.toBean(msg, SceneXspace.class);
+        SceneXspaceMqDTO dto = BeanUtil.toBean(msg, SceneXspaceMqDTO.class);
+        SceneXspace bean = BeanUtil.copyProperties(dto, SceneXspace.class);
         String errorReason = null;
 
         try {

src/main/java/com/fdkankan/jp/xspace/service/impl/SceneXspaceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.jp.xspace.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +9,7 @@ import com.fdkankan.jp.xspace.common.PageInfo;
 import com.fdkankan.jp.xspace.common.Result;
 import com.fdkankan.jp.xspace.common.ResultCode;
 import com.fdkankan.jp.xspace.common.rabbitmq.RabbitmqConstant;
+import com.fdkankan.jp.xspace.common.rabbitmq.dto.SceneXspaceMqDTO;
 import com.fdkankan.jp.xspace.dto.XspacePageDTO;
 import com.fdkankan.jp.xspace.entity.ScenePlus;
 import com.fdkankan.jp.xspace.entity.SceneXspace;
@@ -26,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -130,7 +133,7 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
 
         this.saveBatch(sceneXspaceList);
         sceneXspaceList.stream().forEach(v->{
-            mqProducer.sendByWorkQueue(RabbitmqConstant.QUEUE_PACK_XSPACE, v);
+            mqProducer.sendByWorkQueue(RabbitmqConstant.QUEUE_PACK_XSPACE, BeanUtil.toBean(v, SceneXspaceMqDTO.class));
         });
 
         return Result.success();

src/main/resources/bootstrap.yml

@@ -2,6 +2,9 @@ spring:
   profiles:
     active: test
 
+logging:
+  path: /home/backend/4dkankan_v4
+
 jasypt:
   encryptor:
     password: xxx #?