Merge branch 'release-mg-v2.9.0' into test

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

@@ -60,7 +60,7 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, bizType);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.WAITING.code(), null, bizType);
             buildSceneService.buildScenePre(buildSceneMessage);
-            commonService.saveMqSendLog(num, buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage, 0);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.SUCCESS.code(), null, bizType);
         }catch (Exception e){
             log.error("场景计算前置处理出错,num=" + num, e);

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

@@ -79,7 +79,7 @@ public class BuildE57Listener{
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, "e57");
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.WAITING.code(), null, "e57");
             buildSceneService.buildScenePre(buildSceneMessage);
-            commonService.saveMqSendLog(num, buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage, 0);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.SUCCESS.code(), null,"e57");
         }catch (Exception e){
             log.error("e57计算前置处理出错,num=" + num, e);

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

@@ -77,7 +77,7 @@ public class BuildReverseE57Listener {
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, "reverseE57");
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.WAITING.code(), null, "reverseE57");
             buildSceneService.buildScenePre(buildSceneMessage);
-            commonService.saveMqSendLog(num, buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage, 0);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueModelingPre, CommonOperStatus.SUCCESS.code(), null, "reverseE57");
         }catch (Exception e){
             log.error("上传e57计算前置处理出错,num=" + num, e);

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

@@ -47,7 +47,7 @@ public interface ICommonService {
     void writeSceneJson(String num, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
                         SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt, Company company);
 
-    void saveMqSendLog(String num, BuildSceneCallMessage message);
+    void saveMqSendLog(String num, BuildSceneCallMessage message, Integer status);
 
     void sendUpdateSceneStatusMqToQueues(Map<String, Object> content);
 

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

@@ -551,11 +551,18 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public void saveMqSendLog(String num, BuildSceneCallMessage message) {
-        MqSendLog mqSendLog = new MqSendLog();
+    public void saveMqSendLog(String num, BuildSceneCallMessage message, Integer status) {
+        MqSendLog mqSendLog = null;
+        if(status != null || status != -1){//-1代表未进入到计算前置处理器，计算调度器不能进行调度
+            mqSendLog = mqSendLogService.getOne(new LambdaQueryWrapper<MqSendLog>().eq(MqSendLog::getNum, num).eq(MqSendLog::getStatus, -1));
+        }else{
+            mqSendLog = new MqSendLog();
+        }
+
         mqSendLog.setNum(num);
         mqSendLog.setContent(JSON.toJSONString(message));
-        mqSendLogService.save(mqSendLog);
+        mqSendLog.setStatus(status);
+        mqSendLogService.saveOrUpdate(mqSendLog);
     }
 
     @Override

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

@@ -1389,6 +1389,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         message.getExt().put("keepTitle", 1);
 
+        //提前发送调度器任务，用于管理后台页面及时刷新出“计算优先级”按钮
+        commonService.saveMqSendLog(num, new BuildSceneCallMessage(), -1);
+
         String ossOrignPath = commonService.getOssOrignPath(path);
         String ossPath = fYunFileService.getFileContent(ossOrignPath + "custom.txt");
         if(StrUtil.isNotEmpty(ossPath) && ossPath.contains("MKT862")){
@@ -1481,6 +1484,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 .set(ScenePlus::getSceneStatus, SceneStatus.wait.code())
                 .eq(ScenePlus::getNum, num));
 
+        //提前发送调度器任务，用于管理后台页面及时刷新出“计算优先级”按钮
+        commonService.saveMqSendLog(num, new BuildSceneCallMessage(), -1);
+
         HashMap<String, Object> params = new HashMap<>();
         params.put("num", num);
         params.put("rebuild", 1);