lyhzzz 1 年之前
父节点
当前提交
e677016b78

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ICaseService.java

@@ -35,4 +35,6 @@ public interface ICaseService extends IService<CaseEntity> {
     CaseEntity getByTmProjectId(String projectId);
 
     void updateIdenTityStatus(Integer caseId, Integer status);
+
+    String getDeptId(Integer caseId);
 }

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

@@ -254,4 +254,14 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             tmProjectService.updateIdenTityStatus(caseEntity.getTmProjectId(),status);
         }
     }
+
+    @Override
+    public String getDeptId(Integer caseId) {
+        CaseEntity caseEntity = this.getById(caseId);
+        String deptId = caseEntity.getDeptId();
+        if(caseEntity.getType() ==1){
+            deptId = tmProjectService.getById(caseEntity.getTmProjectId()).getDeptId();
+        }
+        return deptId;
+    }
 }

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

@@ -280,8 +280,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
         }
         if(param.getCaseId() !=null){
-            CaseEntity caseEntity = caseService.getById(param.getCaseId());
-            String deptId = caseEntity.getDeptId();
+            String deptId =  caseService.getDeptId(param.getCaseId());
             wrapper.eq(Model::getDeptId,deptId);
         }
         if(StringUtils.isNotBlank(param.getDeptId())){

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

@@ -111,11 +111,7 @@ public class SceneService implements ISceneService {
             param.setSnCodes(snCodes);
         }
         if(param.getCaseId() !=null){
-            CaseEntity caseEntity = caseService.getById(param.getCaseId());
-            String deptId = caseEntity.getDeptId();
-            if(caseEntity.getType() ==1){
-                deptId = tmProjectService.getById(caseEntity.getTmProjectId()).getDeptId();
-            }
+            String deptId =  caseService.getDeptId(param.getCaseId());
             List<TmCamera> tmCameras = tmCameraService.getByDeptIds(Arrays.asList(deptId));
             List<String> snCodes = param.getSnCodes();
             List<String> snCodes1 = tmCameras.stream().map(TmCamera::getCameraSn).collect(Collectors.toList());