2.3.0

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

@@ -1,54 +0,0 @@
-package com.fdkankan.contro.mq.listener;
-
-import com.fdkankan.contro.mq.service.impl.BuildIntermitSceneServiceImpl;
-import com.fdkankan.contro.mq.service.impl.BuildSceneServiceImpl;
-import com.rabbitmq.client.Channel;
-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;
-
-@Slf4j
-@Component
-public class BuildIntermitSceneListener extends AbstrackBuildSceneListener {
-
-    @Value("${queue.modeling.intermit.modeling-pre}")
-    private String queueModelingPre;
-    @Value("${queue.modeling.intermit.modeling-post}")
-    private String queueModelingPost;
-
-    @Autowired
-    private BuildIntermitSceneServiceImpl buildSceneService;
-
-    /**
-     * 场景计算前置资源准备处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.intermit.modeling-pre}"),
-            concurrency = "${maxThread.modeling.modeling-pre}"
-    )
-    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-        preHandle(channel,queueModelingPre,message,buildSceneService);
-    }
-
-    /**
-     * 场景计算后置结果处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.intermit.modeling-post}"),
-            concurrency = "${maxThread.modeling.modeling-post}"
-    )
-    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-        postHandle(channel,queueModelingPost,message,buildSceneService);
-
-    }
-}

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

@@ -1,67 +0,0 @@
-//package com.fdkankan.contro.mq.listener;
-//
-//import cn.hutool.core.thread.ThreadUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.contro.mq.service.IBuildSceneProgressService;
-//import com.fdkankan.contro.mq.service.impl.BuildSceneServiceImpl;
-//import com.fdkankan.contro.service.ICommonService;
-//import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-//import com.google.j2objc.annotations.AutoreleasePool;
-//import com.rabbitmq.client.Channel;
-//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;
-//
-//import java.nio.charset.StandardCharsets;
-//import java.util.Map;
-//import java.util.concurrent.*;
-//
-//@Slf4j
-//@Component
-//public class BuildSceneProgressListener{
-//
-//
-//    @Autowired
-//    private IBuildSceneProgressService buildSceneProgressService;
-//
-//    @Value("${queue.modeling.modeling-progress-notice}")
-//    private String queueName;
-//
-//    @Autowired
-//    private ICommonService commonService;
-//
-//    /**
-//     * 场景计算进度监听
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.modeling-progress-notice}")
-//    )
-//    public void buildSceneProgressHandler(Channel channel, Message message) throws Exception {
-//        String messageId = message.getMessageProperties().getMessageId();
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("开始推送场景计算进度，队列名：{}，id：{},消息体:{}", queueName, messageId, msg);
-//        BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
-//        String num = buildSceneMessage.getSceneNum();
-//        try {
-//            Map<String, Object> ext = buildSceneMessage.getExt();
-//            String uuid = (String)ext.get("uuid");
-//            String batchId = (String)ext.get("batchId");
-//            commonService.sendSceneStatus(buildSceneMessage.getSceneNum(), uuid, batchId, 3);
-//        }catch (Exception e){
-//            log.error("开始计算通知失败，num:{}", num, e);
-//        }
-//
-////        buildSceneProgressService.monitorProgress(buildSceneMessage);
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//        log.info("推送场景计算进度完成，队列名：{}，id：{},消息体:{}", queueName, messageId, msg);
-//
-//    }
-//
-//}

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

@@ -380,15 +380,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
                     this.sendFailToLaser(sceneCode);
 
-                    String statusJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, sceneCode) + "status.json";
-                    String fileContent = fYunFileService.getFileContent(statusJsonKey);
-                    JSONObject statusJson = JSON.parseObject(fileContent);
-                    statusJson.put("status", -1);
-                    fYunFileService.uploadFile(statusJson.toJSONString().getBytes(StandardCharsets.UTF_8), statusJsonKey);
+                    commonService.uploadStatusJson(sceneCode, SceneStatus.FAILD.code(), "", "",PayStatus.PAY.code(), String.format(UploadFilePath.DATA_VIEW_PATH, sceneCode));
 
                     jmgaService.sendStatus(sceneCode, "计算失败");
                 }
-//                redisUtil.set(String.format(RedisKey.SCENE_BUILD_FINISH_NUM, sceneCode), "-1");
                 return;
             }