Merge branch 'feature-断续拍摄-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

src/main/java/com/fdkankan/contro/controller/SceneCleanOrigController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 删除oss原始资源记录 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-17
- */
-@RestController
-@RequestMapping("/contro/sceneCleanOrig")
-public class SceneCleanOrigController {
-
-}
-

src/main/java/com/fdkankan/contro/controller/SceneCopyLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-04-17
- */
-@RestController
-@RequestMapping("/contro/sceneCopyLog")
-public class SceneCopyLogController {
-
-}
-

src/main/java/com/fdkankan/contro/entity/MqSendLog.java

@@ -0,0 +1,61 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Getter
+@Setter
+@TableName("mq_send_log")
+public class MqSendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 发送的队列
+     */
+    @TableField("queue")
+    private String queue;
+
+    /**
+     * 发送的mq消息
+     */
+    @TableField("content")
+    private String content;
+
+    @TableField("num")
+    private String num;
+
+    @TableField("es_name")
+    private String esName;
+
+    /**
+     * 0未发送，1已发送
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/contro/generate/AutoGenerate.java

@@ -17,7 +17,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"contro", getTables(new String[]{
-                "t_scene_cold_storage"
+                "mq_send_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/contro/mapper/IMqSendLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Mapper
+public interface IMqSendLogMapper extends BaseMapper<MqSendLog> {
+
+}

src/main/java/com/fdkankan/contro/mq/listener/AbstrackBuildSceneListener.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.CommonOperStatus;
 import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
+import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.ISceneBuildProcessLogService;
 import com.fdkankan.model.constants.SceneBuildProcessType;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
@@ -27,6 +28,8 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
     private RedisLockUtil redisLockUtil;
     @Autowired
     private ISceneBuildProcessLogService sceneBuildProcessLogService;
+    @Autowired
+    private ICommonService commonService;
 
     @Override
     public void preHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws IOException {
@@ -57,6 +60,7 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.WAITING.code(), null);
             buildSceneService.buildScenePre(buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.SUCCESS.code(), null);
         }catch (Exception e){
             log.error("场景计算前置处理出错,num=" + num, e);

src/main/java/com/fdkankan/contro/mq/service/impl/BuildIntermitSceneServiceImpl.java

@@ -111,7 +111,6 @@ public class BuildIntermitSceneServiceImpl implements IBuildSceneService {
 
             //发送mq，就进行计算
             message.setResultReceiverMqName(queueModelingPost);
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
 

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -145,9 +145,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             message.setPath(laserObjFilePath);
             message.setResultReceiverMqName(queueObjModelingPost);
 
-            //发送mq，就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
-
             success = true;
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -150,6 +150,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
 
+
     @Override
     public void buildScenePre(BuildSceneCallMessage message){
         String num = message.getSceneNum();
@@ -208,19 +209,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //查询是否超过比例50%，如果超过，则启动128G服务器弹性伸缩
             Float maxRate = fdageJson.getFloat("maxRate");
             if(env.equals("gn") && Objects.nonNull(maxRate) && maxRate > 50){
-                //发送mq，就进行计算
-                mqProducer.sendByWorkQueue(queueModelingCall.concat("-128G"), message);
-                ThreadUtil.sleep(2000L);
-                int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall.concat("-128G"));
-                log.info("128G队列排队数:{}", mqNum);
-                if(mqNum > 0){
-                    log.info("启动128G弹性伸缩");
-                    String result = scalingService.createEcs(scalingExtendAri);
-                    log.info("createEcs-result:{}", result);
+                Map<String, Object> ext = message.getExt();
+                if(Objects.isNull(ext)){
+                    ext = new HashMap<>();
+                    message.setExt(ext);
                 }
-            }else{
-                //发送mq，就进行计算
-                mqProducer.sendByWorkQueue(queueModelingCall, message);
+                ext.put("128G", 1);
             }
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -117,7 +117,6 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
 
     @Override
     public void buildScenePre(BuildSceneCallMessage message) {
-        boolean success = false;
         String num = message.getSceneNum();
         try {
 
@@ -162,11 +161,6 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
 
             message.setResultReceiverMqName(queueV3ModelingPost);
 
-            //发送mq，就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
-
-            success = true;
-
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
 
         }catch (Exception e){

src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -13,37 +13,10 @@ import org.springframework.stereotype.Component;
 @Component
 public class ScheduleJob {
 
-    @Value("${rocketmq.autoScaling.num.normal}")
-    private String baseNum;
-
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
-
-    @Autowired
-    private ScalingService scalingService;
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
     @Autowired
     private IScene3dNumService scene3dNumService;
 
 
-    @Scheduled(cron = "${rocketmq.autoScaling.corn:0 0/5 8-21 * * ?}")
-    public void job8() {
-        try {
-            //当mq排队数大于指定数量时使用弹性升缩
-            int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
-            log.info("每5分钟查询一次排队队列,mqNum:" + mqNum);
-            if(mqNum - Integer.parseInt(baseNum) > 0){
-                log.info("使用弹性升缩开启一台ECS");
-                log.info(scalingService.createEcs());
-            }
-        } catch (Exception e) {
-            log.error("弹性升缩开启失败！", e);
-            log.error(e.getMessage());
-        }
-    }
-
     /**
      * 定时生成场景码，间隔1小时执行一次，项目启动一秒后执行一次
      */

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -3,6 +3,7 @@ package com.fdkankan.contro.service;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.vo.ScenePlusVO;
+import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 
 import java.util.Map;
 import java.util.Set;
@@ -45,4 +46,6 @@ public interface ICommonService {
 
     void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
                         SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, Company company);
+
+    void saveMqSendLog(String num, BuildSceneCallMessage message);
 }

src/main/java/com/fdkankan/contro/service/IMqSendLogService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.contro.service;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+public interface IMqSendLogService extends IService<MqSendLog> {
+
+}

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -28,6 +28,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.FloorPlanUserUtil;
+import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SendMailAcceUtils;
@@ -99,6 +100,8 @@ public class CommonServiceImpl implements ICommonService {
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private IMqSendLogService mqSendLogService;
 
     @Override
     public void uploadBuildResultData(String num, String dataSource, String version) {
@@ -499,4 +502,12 @@ public class CommonServiceImpl implements ICommonService {
         //scenejson写入缓存
         redisUtil.set(String.format(RedisKey.SCENE_JSON, num), sceneJsonStr);
     }
+
+    @Override
+    public void saveMqSendLog(String num, BuildSceneCallMessage message) {
+        MqSendLog mqSendLog = new MqSendLog();
+        mqSendLog.setNum(num);
+        mqSendLog.setContent(JSON.toJSONString(message));
+        mqSendLogService.save(mqSendLog);
+    }
 }

src/main/java/com/fdkankan/contro/service/impl/MqSendLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service.impl;
+
+import com.fdkankan.contro.entity.MqSendLog;
+import com.fdkankan.contro.mapper.IMqSendLogMapper;
+import com.fdkankan.contro.service.IMqSendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-27
+ */
+@Service
+public class MqSendLogServiceImpl extends ServiceImpl<IMqSendLogMapper, MqSendLog> implements IMqSendLogService {
+
+}

src/main/resources/mapper/contro/MqSendLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.IMqSendLogMapper">
+
+</mapper>