Forráskód Böngészése

场景计算优先级需求开发,场景资源准备完成后,把消息写进数据库,统一由调度中心进行调度

dengsixing 1 éve
szülő
commit
2b584acbbc

+ 0 - 21
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 {
-
-}
-

+ 0 - 21
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 {
-
-}
-

+ 61 - 0
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;
+
+
+}

+ 1 - 1
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[]{

+ 18 - 0
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> {
+
+}

+ 7 - 11
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -139,10 +139,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ISceneBuildProcessLogService sceneBuildProcessLogService;
     @Autowired
     private ISceneColdStorageService sceneColdStorageService;
+    @Autowired
+    private IMqSendLogService mqSendLogService;
+
 
     @Override
     public void buildScenePre(BuildSceneCallMessage message) throws Exception{
-        boolean success = false;
         String num = message.getSceneNum();
         try {
             //重新计算时需要删除文件夹,否知使用缓存
@@ -196,16 +198,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             message.getBuildContext().put("cameraType",message.getCameraType());
 
-            // 判断企业是否配置了弹性伸缩
-            if (message.getFlexibility() == 0) {
-                //发送mq,就进行计算
-                mqProducer.sendByWorkQueue(queueModelingCall, message);
-            } else {
-                //发送mq,就进行计算
-                mqProducer.sendByWorkQueue(singleModelingCall, message);
-            }
-
-            success = true;
+            MqSendLog mqSendLog = new MqSendLog();
+            mqSendLog.setNum(num);
+            mqSendLog.setContent(JSON.toJSONString(message));
+            mqSendLogService.save(mqSendLog);
 
             log.info("场景计算资源准备结束,场景码:{}", message.getSceneNum());
 

+ 0 - 27
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小时执行一次,项目启动一秒后执行一次
      */

+ 16 - 0
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> {
+
+}

+ 20 - 0
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 {
+
+}

+ 5 - 0
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>