深时场景解冻通知激光系统

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -78,8 +78,8 @@ public enum ResultCode  {
     MACHINE_CODE_EXITS(50059, "当前设备已存在授权记录!"),
     UPDATE_CAMERA_NO_IN(50060, "替换的sn未入库!"),
     UPDATE_CAMERA_ERROR(50061, "替换的sn重复!"),
-    SCENE_NOT_STORE(50062, "场景未冻结无需解冻!"),
-    SCENE_STORE_ING(50063, "场景正在解冻请稍候!"),
+    SCENE_NOT_STORE(50062, "当前场景原始资源不需要解冻!"),
+    SCENE_STORE_ING(50063, "正在解冻请稍候!"),
     CAMERA_SN_EXITS(50064, "授权相机sn重复!"),
     MACHINE_CODE_ERROR(50065, "机器码错误!"),
     SCENE_REBUILD_ERROR2(50066, "原始资源已冻结，重算失败。"),

src/main/java/com/fdkankan/manage/mq/common/MqQueueUtil.java

@@ -7,5 +7,6 @@ public class MqQueueUtil {
 
     public static String ucenterScenePayStatusQueue = "scene-pay-status";
     public static String sceneRestoreQueue = "scene-rest-store";
+    public static String laserUnfreezeScene = "laser-unfreeze-scene";
     public static String laserMoveQueue = "laser-migrate-scene";
 }

src/main/java/com/fdkankan/manage/mq/consumer/SceneRestStoreConsumer.java

@@ -10,6 +10,7 @@ import com.fdkankan.manage.service.ISceneColdStorageLogService;
 import com.fdkankan.manage.service.ISceneColdStorageService;
 import com.fdkankan.manage.service.ISceneProService;
 import com.fdkankan.manage.thread.ThreadService;
+import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisUtil;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -739,24 +739,35 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void restStoreSuccess(String num) {
+        Integer sceneResource = null;
         ScenePro scenePro = this.getByNum(num);
         Date time = Dateutils.dateAddOneMonth(new Date(),-11);
+        String date = Dateutils.getDate(time);
         if(scenePro!=null ){
+            sceneResource = scenePro.getSceneSource();
             LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(ScenePro::getId,scenePro.getId());
-            wrapper.set(ScenePro::getCreateTime,Dateutils.getDate(time));
+            wrapper.set(ScenePro::getCreateTime,date);
             this.update(wrapper);
         }
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         if(scenePlus != null ){
+            sceneResource = scenePlus.getSceneSource();
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             if(scenePlusExt != null){
                 LambdaUpdateWrapper<ScenePlusExt> wrapper = new LambdaUpdateWrapper<>();
                 wrapper.eq(ScenePlusExt::getId,scenePlusExt.getId());
-                wrapper.set(ScenePlusExt::getAlgorithmTime,Dateutils.getDate(time));
+                wrapper.set(ScenePlusExt::getAlgorithmTime,date);
                 scenePlusExtService.update(wrapper);
             }
         }
+        //深时场景通知修改计算完成时间
+        if(sceneResource != null && (sceneResource == 4 || sceneResource == 5)){
+            HashMap<String,String> map = new HashMap<>();
+            map.put("sceneCode",num);
+            map.put("algorithmTime",date);
+            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.laserUnfreezeScene,map);
+        }
     }
 
     @Override