title

720yun_fd_consumer/src/main/resources/application-pro.yml

@@ -81,7 +81,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
-
+    delete-scene: delete-scene
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_consumer/src/main/resources/application-proAws.yml

@@ -81,7 +81,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
-
+    delete-scene: delete-scene
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_consumer/src/main/resources/application-sit.yml

@@ -81,6 +81,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
+    delete-scene: delete-scene
 
 config:
     bashPath: 720yun_fd_manage/

720yun_fd_consumer/src/main/resources/application-sitAws.yml

@@ -79,7 +79,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
-
+    delete-scene: delete-scene
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_manage/src/main/java/com/gis/controller/AgeController.java

@@ -62,6 +62,9 @@ public class AgeController {
     FdkkClient fdkkClient;
     @Autowired
     UserRequest userRequest;
+
+    @Value("${queue.delete-scene:#{null}}")
+    String deleteScene;
     /**
      * 获取所有场景
      * 使用超级管理员权限的
@@ -81,10 +84,10 @@ public class AgeController {
         if(ObjUtil.isNotNull(byId)){
             workService.remove(id);
             if (ObjUtil.isNotEmpty(byId.getNum())){
-                JSONObject params = new JSONObject();
+                Map<String,String> params = new HashMap<>();
                 params.put("sceneNum", byId.getNum());
-                params.put("platform", "qjkk");
-                fdkkClient.deleteScene(userRequest.getCurrentToken(),params.toJSONString());
+                rabbitMqProducerUtil.sendByWorkQueue(deleteScene,params);
+
             }
         }
         return Result.success();

720yun_fd_manage/src/main/java/com/gis/controller/WorkController.java

@@ -67,7 +67,8 @@ public class WorkController extends BaseController {
 
     @Autowired
     UserRequest userRequest;
-
+    @Value("${queue.delete-scene:#{null}}")
+    String deleteScene;
     @ApiOperation(value = "列表", position = 1)
     @PostMapping("list")
     public Result<WorkEntity> list(@RequestBody AgePageDto param) {
@@ -142,10 +143,9 @@ public class WorkController extends BaseController {
         if(ObjUtil.isNotNull(byId)){
             workService.remove(id);
             if (ObjUtil.isNotEmpty(byId.getNum())){
-                JSONObject params = new JSONObject();
+                Map<String,String> params = new HashMap<>();
                 params.put("sceneNum", byId.getNum());
-                params.put("platform", "qjkk");
-                fdkkClient.deleteScene(userRequest.getCurrentToken(),params.toJSONString());
+                rabbitMqProducerUtil.sendByWorkQueue(deleteScene,params);
             }
         }
         return Result.success();

720yun_fd_manage/src/main/resources/application-pro.yml

@@ -103,6 +103,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
+    delete-scene: delete-scene
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-proAws.yml

@@ -95,6 +95,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
+    delete-scene: delete-scene
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-sit.yml

@@ -95,6 +95,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
+    delete-scene: delete-scene
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-sitAws.yml

@@ -95,6 +95,7 @@ queue:
     qjkk-work-offline: qjkk-work-offline
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
+    delete-scene: delete-scene
 
 config:
     bashPath: ${project.name}/