lyhzzz 1 年之前
父节点
当前提交
80b92a45f0

+ 4 - 0
src/main/java/com/fdkankan/fusion/controller/BaseController.java

@@ -39,4 +39,8 @@ public class BaseController {
     protected String getDeptId(){
         return (String)StpUtil.getExtra("deptId");
     }
+
+    protected String getShare(){
+        return request.getHeader("share");
+    }
 }

+ 1 - 0
src/main/java/com/fdkankan/fusion/controller/SceneController.java

@@ -19,6 +19,7 @@ public class SceneController extends BaseController{
 
     @PostMapping("/list")
     public ResultData list(@RequestBody ScenePram param){
+        param.setShare(getShare());
         return ResultData.ok(sceneService.pageList(param));
     }
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/request/ScenePram.java

@@ -19,6 +19,8 @@ public class ScenePram extends RequestBase {
     private String deptId;
     private String snCode;
 
+    private String share;
+
     public String getSceneName() {
         return sceneName== null ?null :sceneName.trim();
     }

+ 1 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -116,6 +116,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             scenePram.setPageNum(1);
             scenePram.setPageSize(99999);
             scenePram.setNumList(param.getTypeMap().get(type));
+            scenePram.setShare("1");
             PageInfo pageInfo = sceneService.pageList(scenePram);
             List<SceneVo> list1 = (List<SceneVo>) pageInfo.getList();
             listAll.addAll(list1);

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -80,7 +80,7 @@ public class SceneService implements ISceneService {
         List<TmCamera> tmCameraList = null;
         String tokenValue = StpUtil.getTokenValue();
 
-        if(StringUtils.isNotBlank(tokenValue)){
+        if(StringUtils.isNotBlank(tokenValue) && StringUtils.isBlank(param.getShare()) ){
             tmCameraList = tmCameraService.getByDeptIds();
             List<String> snCodes = tmCameraList.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());
             if(CollectionUtil.isNotEmpty(snCodes)){