修改场景封存队列

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/SceneQueueDTO.java

@@ -6,6 +6,7 @@ import com.google.gson.JsonObject;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 
@@ -56,4 +57,7 @@ public class SceneQueueDTO {
 
     @ApiModelProperty(value = "0表示未付款，1表示付款了，-1表示欠费（八目场景指锁住），-2表示临时空间（八目场景）", name = "payStatus")
     private int payStatus;
+
+    private List<String> sceneCodes;
+
 }

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneMigrateListener.java

@@ -1,7 +1,6 @@
 package com.gis.listener;
 
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -92,17 +91,13 @@ public class SceneMigrateListener {
             String messageId = message.getMessageProperties().getMessageId();
             log.info("场景migrateSceneQueue开始,id:{},deliveryTag:{},消息体:{}", messageId,deliveryTag,msg);
             OpenSceneMigrateDto param = JSONObject.parseObject(JSON.parse(msg).toString(), OpenSceneMigrateDto.class);
-            if (param.getSceneCodes()!=null&& ArrayUtil.isNotEmpty(param.getSceneCodes()) &&StrUtil.isEmpty(param.getSnCode())) {
-                List<String> sceneCodes = param.getSceneCodes();
-                for (String sceneCode : sceneCodes) {
-                    WorkEntity workEntity=workService.findByNum(sceneCode);
-                    if (ObjectUtil.isNotNull(workEntity)) {
-                        workEntity.setSnCode(param.getToSnCode());
-                        workEntity.setUserId(param.getPhone());
-                        workService.update(workEntity);
-                    }
+            if (StrUtil.isNotEmpty(param.getSceneCode())&&StrUtil.isEmpty(param.getSnCode())) {
+                WorkEntity workEntity=workService.findByNum(param.getSceneCode());
+                if (ObjectUtil.isNotNull(workEntity)) {
+                    workEntity.setSnCode(param.getToSnCode());
+                    workEntity.setUserId(param.getPhone());
+                    workService.update(workEntity);
                 }
-
             }
         }catch (Exception e){
             channel.basicAck(deliveryTag, false);

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/ScenePayStatusListener.java

@@ -1,6 +1,7 @@
 package com.gis.listener;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -81,17 +82,20 @@ public class ScenePayStatusListener {
             String messageId = message.getMessageProperties().getMessageId();
             log.info("场景scenePayStatusQueue开始,id:{},deliveryTag:{},消息体:{}", messageId,deliveryTag,msg);
             SceneQueueDTO param = JSONObject.parseObject(msg, SceneQueueDTO.class);
-            if (ObjectUtil.isEmpty(param.getSceneCode())) {
+            if (ObjectUtil.isEmpty(param.getSceneCodes())&& ArrayUtil.isNotEmpty(param.getSceneCodes())) {
                 log.error("参数列表错误（缺少），格式不匹配,{}",param);
                 channel.basicAck(deliveryTag, false);
             }
-            WorkEntity workEntity=workService.findByNum(param.getSceneCode());
-            if (ObjectUtil.isNotEmpty(workEntity)&&param.getStatus()!=1){
-                //修改状态
-                workEntity.setPayStatus(param.getPayStatus());
-                workService.update(workEntity);
-                channel.basicAck(deliveryTag, false);
+            for (String sceneCode : param.getSceneCodes()) {
+                WorkEntity workEntity=workService.findByNum(sceneCode);
+                if (ObjectUtil.isNotEmpty(workEntity)&&param.getStatus()!=1){
+                    //修改状态
+                    workEntity.setPayStatus(param.getPayStatus());
+                    workService.update(workEntity);
+                    channel.basicAck(deliveryTag, false);
+                }
             }
+
         }catch (Exception e){
             channel.basicAck(deliveryTag, false);
             log.error("场景sceneQueue报错{}",e.getMessage());