dengsixing преди 2 седмици
родител
ревизия
df8390dbdd
променени са 1 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 5 4
      src/main/java/com/fdkankan/contro/mq/listener/UpdateSceneStatusListener.java

+ 5 - 4
src/main/java/com/fdkankan/contro/mq/listener/UpdateSceneStatusListener.java

@@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.SceneSource;
+import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
@@ -60,15 +61,15 @@ public class UpdateSceneStatusListener {
             jsonObject.put("status", status);
             FileUtil.writeUtf8String(jsonObject.toJSONString(),ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json");
             fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJsonPath);
+            if(status == 1){
+                commonService.sendEmail(num, "standar");
+            }
             ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
             if(scenePlus.getSceneSource() == SceneSource.QJKK.code()){
-                scenePlus.setSceneStatus(status);
+                scenePlus.setSceneStatus(status == 1 ? SceneStatus.NO_DISPLAY.code() : status);
                 scenePlus.setUpdateTime(null);
                 scenePlusService.updateById(scenePlus);
             }
-            if(status == 1){
-                commonService.sendEmail(num, "standar");
-            }
         }catch (Exception e){
             log.error("更新场景的的status.json状态, content:{}", msg, e);
         }finally {