tbstatus改为recstatus

src/main/java/com/fdkankan/scene/entity/SceneEditControls.java

@@ -103,12 +103,9 @@ public class SceneEditControls implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/scene/entity/SceneEditInfo.java

@@ -160,12 +160,9 @@ public class SceneEditInfo implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/scene/entity/SceneEditInfoExt.java

@@ -67,12 +67,8 @@ public class SceneEditInfoExt implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 }

src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -106,12 +106,9 @@ public class ScenePlus implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -148,12 +148,9 @@ public class ScenePlusExt implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/scene/entity/SceneRepairLog.java

@@ -64,12 +64,9 @@ public class SceneRepairLog implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除, 2-禁用
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -1,53 +1,53 @@
-//package com.fdkankan.scene.listener;
-//
-//import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
-//import com.rabbitmq.client.Channel;
-//import java.nio.charset.StandardCharsets;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * <p>
-// * TODO
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2022/4/19
-// **/
-//@Slf4j
-//@Component
-//public class RabbitMqListener {
-//
-//    @Value("${queue.scene.upgrade-to-v4}")
-//    private String upgradeToV4;
-//    @Autowired
-//    private ISceneUpgradeToV4Service sceneUpgradeToV4Service;
-//
-//    /**
-//     * 场景计算前置资源准备处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//        queuesToDeclare = @Queue("${queue.scene.upgrade-to-v4}"),
-//        concurrency = "${maxThread.scene.upgrade-to-v4}"
-//    )
-//    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-//        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
-//        String correlationId = (String) correlation;
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("场景升级开始，队列名：{}，id：{},消息体:{}", upgradeToV4, correlationId, msg);
-//        long sceneProId = Long.parseLong(msg);
-//        //迁移数据
-//        sceneUpgradeToV4Service.upgrade(sceneProId);
-//        log.info("场景升级结束，队列名：{}，id：{}", upgradeToV4, correlationId);
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//    }
-//
-//}
+package com.fdkankan.scene.listener;
+
+import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
+import com.rabbitmq.client.Channel;
+import java.nio.charset.StandardCharsets;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/19
+ **/
+@Slf4j
+@Component
+public class RabbitMqListener {
+
+    @Value("${queue.scene.upgrade-to-v4}")
+    private String upgradeToV4;
+    @Autowired
+    private ISceneUpgradeToV4Service sceneUpgradeToV4Service;
+
+    /**
+     * 场景计算前置资源准备处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+        queuesToDeclare = @Queue("${queue.scene.upgrade-to-v4}"),
+        concurrency = "${maxThread.scene.upgrade-to-v4}"
+    )
+    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
+        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
+        String correlationId = (String) correlation;
+        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+        log.info("场景升级开始，队列名：{}，id：{},消息体:{}", upgradeToV4, correlationId, msg);
+        long sceneProId = Long.parseLong(msg);
+        //迁移数据
+        sceneUpgradeToV4Service.upgrade(sceneProId);
+        log.info("场景升级结束，队列名：{}，id：{}", upgradeToV4, correlationId);
+        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+    }
+
+}

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
@@ -216,7 +217,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 sceneEditInfoExt.setVrNum(sceneProEdit.getVrNum());
                 sceneEditInfoExt.setCreateTime(sceneEditInfo.getCreateTime());
                 sceneEditInfoExt.setUpdateTime(sceneEditInfo.getUpdateTime());
-                sceneEditInfoExt.setTbStatus(sceneEditInfo.getTbStatus());
+                sceneEditInfoExt.setRecStatus(RecStatus.VALID.code());
                 sceneEditInfoExtService.save(sceneEditInfoExt);
 
                 sceneEditControls = new SceneEditControls();
@@ -232,7 +233,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 sceneEditControls.setShowRule(sceneProEdit.getRulerVisi());
                 sceneEditControls.setCreateTime(sceneEditInfo.getCreateTime());
                 sceneEditControls.setUpdateTime(sceneEditInfo.getUpdateTime());
-                sceneEditControls.setTbStatus(sceneEditInfo.getTbStatus());
+                sceneEditControls.setRecStatus(RecStatus.VALID.code());
                 sceneEditControlsService.save(sceneEditControls);
             }else{
                 sceneEditInfoExt = sceneEditInfoExtService.getOne(