sign

720yun_fd_base/gis_common/src/main/java/com/gis/common/httpclient/FdkkClient.java

@@ -2,9 +2,7 @@ package com.gis.common.httpclient;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.annotation.Get;
-import com.dtflys.forest.annotation.Header;
-import com.dtflys.forest.annotation.Var;
+import com.dtflys.forest.annotation.*;
 import com.dtflys.forest.extensions.DownloadFile;
 import com.gis.common.httpclient.dto.GetSceneNumVersionDto;
 import com.gis.common.httpclient.interceptor.SignInterceptor;
@@ -28,4 +26,10 @@ public interface FdkkClient {
     JSONObject getCameraListByToken(@Header("token") String token, @Var("sceneSource") String sceneSource);
     @Get(value = "/api/_inner/_getSceneNumVersion?num={num}",interceptor = SignInterceptor.class)
     Result<GetSceneNumVersionDto> _getSceneNumVersion(@Var("num") String num);
+
+    /**
+     * 删除场景 {"sceneNum":"t-RJlwqtc"}
+     */
+    @Post(value = "/api/user/scene/delete", dataType = "json")
+    Result deleteScene( @Header("token") String token,@JSONBody String body);
 }

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

@@ -1,7 +1,9 @@
 package com.gis.controller;
 
 import cn.hutool.core.util.ObjUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.gis.common.constant.RedisConstant;
+import com.gis.common.httpclient.FdkkClient;
 import com.gis.common.mq.RabbitMqProducerUtil;
 import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
@@ -11,6 +13,7 @@ import com.gis.domain.po.ReportPo;
 import com.gis.service.ReportService;
 import com.gis.service.WorkNavigationService;
 import com.gis.service.WorkService;
+import com.gis.util.UserRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
 import java.util.HashMap;
@@ -54,6 +58,10 @@ public class AgeController {
 
     @Autowired
     RedisUtil redisUtil;
+    @Resource
+    FdkkClient fdkkClient;
+    @Autowired
+    UserRequest userRequest;
     /**
      * 获取所有场景
      * 使用超级管理员权限的
@@ -69,7 +77,17 @@ public class AgeController {
     @ApiOperation(value = "场景-删除")
     @PostMapping("/remove/{id}")
     public Result remove( @PathVariable String id) {
-        return workService.remove(id);
+        WorkEntity byId = workService.getById(id);
+        if(ObjUtil.isNotNull(byId)){
+            workService.remove(id);
+            if (ObjUtil.isNotEmpty(byId.getNum())){
+                JSONObject params = new JSONObject();
+                params.put("sceneNum", byId.getNum());
+                params.put("platform", "qjkk");
+                fdkkClient.deleteScene(userRequest.getCurrentToken(),params.toJSONString());
+            }
+        }
+        return Result.success();
     }
 
 

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

@@ -17,6 +17,7 @@ import com.gis.domain.entity.WorkEntity;
 import com.gis.domain.vo.WorkVo;
 import com.gis.service.FodderService;
 import com.gis.service.WorkService;
+import com.gis.util.UserRequest;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +65,9 @@ public class WorkController extends BaseController {
     @Resource
     FdkkClient fdkkClient;
 
+    @Autowired
+    UserRequest userRequest;
+
     @ApiOperation(value = "列表", position = 1)
     @PostMapping("list")
     public Result<WorkEntity> list(@RequestBody AgePageDto param) {
@@ -134,7 +138,17 @@ public class WorkController extends BaseController {
     @ApiOperation(value = "删除", position = 1)
     @PostMapping("remove/{id}")
     public Result remove( @PathVariable String id) {
-        return workService.remove(id);
+        WorkEntity byId = workService.getById(id);
+        if(ObjUtil.isNotNull(byId)){
+            workService.remove(id);
+            if (ObjUtil.isNotEmpty(byId.getNum())){
+                JSONObject params = new JSONObject();
+                params.put("sceneNum", byId.getNum());
+                params.put("platform", "qjkk");
+                fdkkClient.deleteScene(userRequest.getCurrentToken(),params.toJSONString());
+            }
+        }
+        return Result.success();
     }
 
     @ApiOperation(value = "选择三维场景", position = 1)