1

src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -10,6 +10,7 @@ import com.fdkankan.manage.entity.MqSendLog;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.fdkankan.manage.entity.ScenePlusExt;
 import com.fdkankan.manage.httpClient.client.OverallClient;
+import com.fdkankan.manage.httpClient.service.OverallService;
 import com.fdkankan.manage.httpClient.vo.OverallParam;
 import com.fdkankan.manage.httpClient.vo.OverallVo;
 import com.fdkankan.manage.service.ICommonService;
@@ -38,11 +39,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/manage/overall")
 public class OverallController {
 
-    private static String appId ="BDA385EC848C1A425F746869011C8D23";
-    private static String key ="appId";
-
    @Autowired
-   OverallClient overallClient;
+   OverallService overallService;
    @Autowired
    IScenePlusService scenePlusService;
    @Autowired
@@ -54,7 +52,7 @@ public class OverallController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody OverallParam param){
-        OverallVo vo = overallClient.list(param,appId,key);
+        OverallVo vo = overallService.list(param);
         if(vo.getCode() != 0 ){
             return ResultData.error(vo.getCode(),vo.getMsg());
         }
@@ -79,7 +77,7 @@ public class OverallController {
     @PostMapping("/cameraSceneList")
     public ResultData cameraSceneList(@RequestBody OverallParam param){
         param.setType(2);
-        OverallVo vo = overallClient.list(param,appId,key);
+        OverallVo vo = overallService.list(param);
         if(vo.getCode() != 0 ){
             return ResultData.error(vo.getCode(),vo.getMsg());
         }
@@ -101,7 +99,7 @@ public class OverallController {
 
         for (Object o : array) {
             JSONObject obj = (JSONObject) o;
-            obj.put("thumb",obj.getString("share"));
+            obj.put("webSite",obj.getString("share"));
             obj.put("sceneCodes",obj.getString("id"));
             String name = obj.getString("name");
             if(StringUtils.isBlank(name)){
@@ -137,7 +135,7 @@ public class OverallController {
 
     @PostMapping("/delete")
     public ResultData delete(@RequestBody OverallParam param){
-        OverallVo vo = overallClient.delete(param.getId(),appId,key);
+        OverallVo vo = overallService.delete(param.getId());
         if(vo.getCode() != 0 ){
             return ResultData.error(vo.getCode(),vo.getMsg());
         }

src/main/java/com/fdkankan/manage/httpClient/service/OverallService.java

@@ -0,0 +1,23 @@
+package com.fdkankan.manage.httpClient.service;
+
+import com.fdkankan.manage.httpClient.client.OverallClient;
+import com.fdkankan.manage.httpClient.vo.OverallParam;
+import com.fdkankan.manage.httpClient.vo.OverallVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OverallService {
+    @Autowired
+    OverallClient overallClient;
+
+    private static String appId ="BDA385EC848C1A425F746869011C8D23";
+    private static String key ="appId";
+    public  OverallVo delete(String num) {
+        return overallClient.delete(num,appId,key);
+    }
+
+    public OverallVo list(OverallParam param) {
+        return overallClient.list(param,appId,key);
+    }
+}

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

@@ -16,8 +16,11 @@ import com.fdkankan.manage.common.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.util.*;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
+import com.fdkankan.manage.httpClient.client.OverallClient;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.entity.*;
+import com.fdkankan.manage.httpClient.service.OverallService;
+import com.fdkankan.manage.httpClient.vo.OverallVo;
 import com.fdkankan.manage.mapper.ISceneProMapper;
 import com.fdkankan.manage.mq.common.MqQueueUtil;
 import com.fdkankan.manage.mq.param.ScenePayStatusVo;
@@ -100,6 +103,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IUserService userService;
     @Autowired
     IMqSendLogService mqSendLogService;
+    @Autowired
+    OverallService overallService;
 
 
     @Override
@@ -662,6 +667,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
+        if(sceneSource ==3){
+            overallService.delete(num);
+        }
         if(cameraId != null){
             cameraDetailService.initSpace(cameraId);
             this.lockOrUnLockBySpace(cameraId);