删除按钮控制

src/main/java/com/fdkankan/manage_jp/controller/SceneProController.java

@@ -52,17 +52,8 @@ public class SceneProController extends BaseController{
 
     @PostMapping("/list")
     public Result list(@RequestBody SceneParam param){
-        String username = JwtUtil.getUsername(getToken());
-        User user = userService.getByUserName(username);
 
-        Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5L)){      //平台管理员
-            param.setCompanyId(user.getCompanyId());
-//            if(!roleIds.contains(6L)){
-//                param.setUserId(user.getId());
-//            }
-        }
-        return Result.success(sceneProService.pageList(param,user));
+        return Result.success(sceneProService.pageList(param,getUser()));
     }
 
 

src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -89,9 +89,10 @@ public class LaserService {
                 vo.setWebSite(obj.getString("webSite"));
                 vo.setChildName(obj.getString("snCode"));
                 vo.setIsObj(obj.getInteger("buildObjStatus"));
-
+                vo.setIsDel(param.getIsDel());
                 if(param.getCooperateSceneCodes() != null && param.getCooperateSceneCodes().contains(vo.getNum())){
                     vo.setIsMain(false);
+                    vo.setIsDel(false);
                 }
                 sceneVoList.add(vo);
             }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneVersionType;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage_jp.common.OssPath;
 import com.fdkankan.manage_jp.common.PageInfo;
@@ -36,10 +37,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
@@ -76,6 +74,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     ITmContractorService tmContractorService;
     @Autowired
     ITmContractorNumService tmContractorNumService;
+    @Autowired
+    IUserRoleService userRoleService;
 
     @Override
     public Long getCountByUserIds(List<Long> userIds) {
@@ -106,11 +106,20 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public Object pageList(SceneParam param, User user) {
 
+        Set<Long> roleIds = userRoleService.getByUser(user);
+        if(!roleIds.contains(5L)){      //平台管理员
+            param.setCompanyId(user.getCompanyId());
+            if(!roleIds.contains(6L)){
+                //param.setUserId(user.getId());
+                param.setIsDel(false);
+            }
+        }
         List<String> numList = tmContractorNumService.getNumListByUserId(user.getId());
         param.setCooperateSceneCodes(numList);
         if(param.getType() == 2 || param.getType() == 6){  //深时
             return laserService.pageList(param);
         }
+
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (SceneVo record : page.getRecords()) {
             Company company = companyService.getByCameraId(record.getCameraId());
@@ -120,8 +129,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(record.getSceneVersion().equals("v3")){
                 record.setIsUpgrade(0);
             }
+            record.setIsDel(param.getIsDel());
             if(numList != null && numList.contains(record.getNum())){
                 record.setIsMain(false);
+                record.setIsDel(false);
             }
         }
         return PageInfo.PageInfo(page);

src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -25,4 +25,5 @@ public class SceneParam extends RequestBase {
     private List<String> numList;
     private List<String> cooperateSceneCodes;
     private Integer status;
+    private Boolean isDel = true;
 }

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -35,5 +35,6 @@ public class SceneVo {
     private Long cameraId ;
 
     private Boolean isMain = true;
+    private Boolean isDel = true;
 
 }