lyhzzz 3 ヶ月 前
コミット
16b4a7ed06

+ 2 - 1
src/main/java/com/fdkankan/manage/entity/CameraType.java

@@ -65,5 +65,6 @@ public class CameraType implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("is_laser")
+    private Boolean isLaser;
 }

+ 3 - 1
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -63,6 +63,8 @@ public class LaserService {
     RedisUtil redisUtil;
     @Autowired
     ISceneColdStorageService sceneColdStorageService;
+    @Autowired
+    ICameraTypeService cameraTypeService;
 
 
     public PageInfo pageList(SceneParam param) {
@@ -225,7 +227,7 @@ public class LaserService {
     private List<String> setSnCodes(List<CameraDetail> cameraDetails) {
         if(cameraDetails != null && cameraDetails.size() >0){
             Set<Long> cameraIds = cameraDetails.stream()
-                    .filter(entity -> entity.getType() == 10 || entity.getType() == 11).map(CameraDetail::getCameraId).collect(Collectors.toSet());
+                    .filter(entity -> cameraTypeService.isLaser(entity.getType())).map(CameraDetail::getCameraId).collect(Collectors.toSet());
             if(cameraIds.size() >0){
                 List<Camera> cameraList = cameraService.listByIds(cameraIds);
                 return cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());

+ 2 - 0
src/main/java/com/fdkankan/manage/service/ICameraTypeService.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ICameraTypeService extends IService<CameraType> {
 
     CameraType getByType(Integer cameraType);
+
+    Boolean isLaser(Integer type);
 }

+ 6 - 4
src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -53,6 +53,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     IIncrementTypeService incrementTypeService;
     @Autowired
     IFolderSceneService folderSceneService;
+    @Autowired
+    ICameraTypeService cameraTypeService;
 
 
     @Override
@@ -67,7 +69,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         String snCode = null;
         String cooperationUserName = null;
-        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){
+        if(cameraTypeService.isLaser(cameraDetail.getType())){
             Camera cameraEntity = cameraService.getById(cameraDetail.getCameraId());
             snCode = cameraEntity.getSnCode();
             cooperationUserName  = user.getUserName();
@@ -82,7 +84,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         //恢复10G基本容量
         this.update(wrapper);
 
-        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10 && cameraDetail.getType() !=11){
+        if(!"local".equals(CacheUtil.uploadType) && !cameraTypeService.isLaser(cameraDetail.getType())){
             sceneProService.lockOrUnLockBySpace(cameraDetail);     //封存场景
         }
         //解绑删除相机。文件夹与场景绑定关系
@@ -231,7 +233,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         long usedSpace = cameraDetail.getUsedSpace() - space ;
         cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
         //解封封存场景
-        if(cameraDetail.getType() != 10 && cameraDetail.getType() !=11){
+        if(!cameraTypeService.isLaser(cameraDetail.getType())){
             sceneProService.lockOrUnLockBySpace(cameraDetail);
         }
         this.updateById(cameraDetail);
@@ -267,7 +269,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public Boolean checkSpace(CameraDetail detailEntity, Long space) {
-        if(!"aws".equals(CacheUtil.uploadType) && (detailEntity.getType() == 10 || detailEntity.getType() == 11)){
+        if(!"aws".equals(CacheUtil.uploadType) && cameraTypeService.isLaser(detailEntity.getType())){
             return true;
         }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());

+ 9 - 0
src/main/java/com/fdkankan/manage/service/impl/CameraTypeServiceImpl.java

@@ -24,4 +24,13 @@ public class CameraTypeServiceImpl extends ServiceImpl<ICameraTypeMapper, Camera
         wrapper.eq(CameraType::getCameraType, cameraType);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public Boolean isLaser(Integer type) {
+        CameraType byType = this.getByType(type);
+        if(byType == null){
+            return false;
+        }
+        return byType.getIsLaser();
+    }
 }

+ 3 - 1
src/main/java/com/fdkankan/manage/service/impl/RtkAccountServiceImpl.java

@@ -65,6 +65,8 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
     ICameraDetailService cameraDetailService;
     @Autowired
     IExcelService excelService;
+    @Autowired
+    ICameraTypeService cameraTypeService;
 
     @Override
     public RtkAccount getOneNotUseAccount(String rtkSnCode,String cameraSn) {
@@ -74,7 +76,7 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
             Camera camera = cameraService.getBySnCode(cameraSn);
             if(camera != null){
                 CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
-                if(cameraDetail != null && ( cameraDetail.getType() == 10 || cameraDetail.getType() == 11)){
+                if(cameraDetail != null && cameraTypeService.isLaser(cameraDetail.getType())){
                     time = 4 * 60 * 60L;
                 }
             }

+ 8 - 11
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -17,11 +17,9 @@ import com.fdkankan.manage.constant.SceneTypeLabelEnum;
 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;
@@ -29,7 +27,6 @@ import com.fdkankan.manage.mq.param.SceneRestStoreVo;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.util.CameraUtils;
 import com.fdkankan.manage.util.DateUtils;
-import com.fdkankan.manage.util.NumTypeUtils;
 import com.fdkankan.manage.util.SceneStatusUtil;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.response.*;
@@ -107,6 +104,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IMqSendLogService mqSendLogService;
     @Autowired
     OverallService overallService;
+    @Autowired
+    ICameraTypeService cameraTypeService;
 
 
     @Override
@@ -162,7 +161,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(cameraDetail == null ){
             return;
         }
-        if(!"aws".equals(CacheUtil.uploadType) && ( cameraDetail.getType() ==10 || cameraDetail.getType() == 11)){
+        if(!"aws".equals(CacheUtil.uploadType) && cameraTypeService.isLaser(cameraDetail.getType())){
             return;
         }
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraDetail.getCameraId());
@@ -263,7 +262,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(param.getIsLaser()){
                 laserMap = laserService.list(sceneNumList,sceneTypeLabelEnum.getSceneSource().get(0));
-
             }
 
             List<String> modelingNumList = page.getRecords().stream().filter(e -> e.getStatus() == 0).map(SceneVo::getNum).collect(Collectors.toList());
@@ -467,19 +465,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         sceneResourceCameraService.setCooperationUser(cameraDetail,num);
 
         //String newDataSource = updateFdageNewDataSource(scenePro, scenePlus, oldCamera.getSnCode(), param.getSnCode(), dataSource);
-
-        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){       //深时场景
+        Boolean newIsLaser = cameraTypeService.isLaser(cameraDetail.getType());
+        Boolean oldIsLaser = cameraTypeService.isLaser(oldCameraDetail.getType());
+        if(newIsLaser){       //深时场景
             //迁移深时 dataSource
             //FileUtil.move(new File(dataSource +"_laserData"),new File(newDataSource+"_laserData"),true);
             laserService.move(num,oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId(),dataSource);
         }
-        cameraDetailService.updateUseSpace(oldCameraDetail.getCameraId(),oldCameraDetail.getUnit().equals("SP")?-1L: -space);
-        cameraDetailService.updateUseSpace(cameraDetail.getCameraId(),cameraDetail.getUnit().equals("SP")?+1L: +space);
 
-        if(!"aws".equals(CacheUtil.uploadType) && oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+        if(!"aws".equals(CacheUtil.uploadType) && !oldIsLaser && subSpace >0){           //有剩余容量解封容量内场景
             cameraIds.add(oldCameraDetail.getCameraId());
         }
-        if(!"aws".equals(CacheUtil.uploadType) && cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
+        if(!"aws".equals(CacheUtil.uploadType) && !oldIsLaser){           //有剩余容量解封容量内场景
             cameraIds.add(cameraDetail.getCameraId());
         }
         if("aws".equals(CacheUtil.uploadType) && subSpace >0){           //有剩余容量解封容量内场景

+ 0 - 153
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -64,130 +64,6 @@ public class TestController {
         return ResultData.ok(ciphertext);
     }
 
-    /**
-     * 重置相机容量
-     */
-    @RequestMapping("/testCameraSpace")
-    public ResultData testCameraSpace(@RequestParam(required = false) Long userId){
-        cameraService.initAllCameraSpace(userId);
-        return ResultData.ok();
-    }
-
-    @RequestMapping("/testCameraSpaceId")
-    public ResultData testCameraSpaceId(@RequestParam(required = false) Long cameraId){
-        cameraDetailService.initSpace(cameraId);
-        return ResultData.ok();
-    }
-
-
-    /**
-     * 导入excel
-     * type 0 入库模板, 1出库模板 ,2 客户关联模板 ,3 rtk设备模版,4rtk账号模版
-     */
-    @PostMapping("/uploadExcel")
-    public ResultData uploadExcel(@RequestParam(required = false) MultipartFile file) throws IOException {
-        String originalFilename = file.getOriginalFilename();
-        assert originalFilename != null;
-        String fileType=originalFilename.substring(originalFilename.lastIndexOf(".")+1);
-        if (!fileType.equalsIgnoreCase("xlsx")) {
-            throw new BusinessException(ResultCode.FILE_TYPE_ERROR);
-        }
-        List<HashMap<Integer, String>> excelRowList = new ArrayList<>();
-        try {
-            excelRowList = ExcelUtil.getExcelRowList(file);
-        }catch (Exception e){
-            throw new BusinessException(ResultCode.TEMPLATE_TYPE_ERROR);
-        }
-        System.out.println(excelRowList);
-        return ResultData.ok();
-    }
-    @Autowired
-    ThreadService threadService;
-
-    @GetMapping("/restStroeTest")
-    public ResultData restStoreTest() throws InterruptedException {
-        String bucket = "4dkankan";
-        String cloudBucket = "4dkk-bak";
-        String path = "test001";
-//        try {
-//            fYunFileServiceInterface.restoreFolder(cloudBucket,path,1);
-//        }catch (Exception e){
-//            throw new BusinessException(ResultCode.SCENE_STORE_ING);
-//        }
-        threadService.checkRestore("1",cloudBucket,bucket,path);
-        return ResultData.ok();
-    }
-
-
-    @GetMapping("/initCamera")
-    public ResultData initCamera(){
-        String[] snCodes = this.getSnCodeTest();
-        List<String> snCodeList = Arrays.asList(snCodes);
-        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
-        wrapper.notIn(Camera::getSnCode,snCodeList);
-        List<Camera> list = cameraService.list(wrapper);
-        for (Camera camera : list) {
-            if(camera == null){
-                continue;
-            }
-            CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
-            if(cameraDetail == null){
-                continue;
-            }
-            if(cameraDetail.getType() == 10){
-                continue;
-            }
-            Long proSpace = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
-            Long plusSpace = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
-            LambdaUpdateWrapper<CameraDetail> wrapper1 = new LambdaUpdateWrapper<>();
-            wrapper1.eq(CameraDetail::getId,cameraDetail.getId());
-            wrapper1.set(CameraDetail::getUnit,"SP");
-            wrapper1.set(CameraDetail::getTotalSpace,5);
-            wrapper1.set(CameraDetail::getUsedSpace,(plusSpace == null ?0L:plusSpace )+( proSpace == null ?0L:proSpace));
-            cameraDetailService.update(wrapper1);
-            sceneProService.lockOrUnLockBySpace(cameraDetail.getCameraId());
-        }
-
-        return ResultData.ok();
-    }
-
-    @RequestMapping("/restFolderScene")
-    public ResultData restFolderScene(){
-        List<FolderScene> list = folderSceneService.list();
-        for (FolderScene folderScene : list) {
-            Long sceneId = folderScene.getSceneId();
-            Long folderId = folderScene.getFolderId();
-            Folder folder = folderService.getById(folderId);
-            if(folder == null){
-                folderSceneService.removeById(folderScene.getId());
-                continue;
-            }
-            Long fUserId = folder.getUserId();
-            Long sUserId = null;
-            ScenePro pro = sceneProService.getById(sceneId);
-            if(pro != null && pro.getIsUpgrade() == 0){
-                sUserId = pro.getUserId();
-            }
-            ScenePlus plus = scenePlusService.getById(sceneId);
-            if(plus != null ){
-                sUserId = plus.getUserId();
-            }
-            if(sUserId != null && !sUserId.equals(fUserId)){
-                folderSceneService.removeById(folderScene.getId());
-            }
-            if(sUserId == null){
-                folderSceneService.removeById(folderScene.getId());
-            }
-        }
-        return ResultData.ok();
-    }
-
-    private String[] getSnCodeTest(){
-        String res [] = {
-                "0292D9F64",
-        };
-        return res;
-    }
 
 
     /**
@@ -223,34 +99,5 @@ public class TestController {
         return ResultData.ok();
     }
 
-    @Autowired
-    IMqCameraLevelService mqCameraLevelService;
-    @Autowired
-    IMqNumLevelService mqNumLevelService;
-
-    @PostMapping("/updateModelingLevel")
-    public ResultData updateModelingLevel(@RequestBody ModelingLevelParam param){
-        if(param.getConfigId() == null && (param.getCameraId() == null || StringUtils.isBlank(param.getNum()))){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        if(param.getCameraId() != null){
-            MqCameraLevel cameraLevel = mqCameraLevelService.getByCameraId(param.getCameraId());
-            if(cameraLevel == null){
-                mqCameraLevelService.saveEntity(param.getCameraId(),param.getConfigId());
-            }else {
-                mqCameraLevelService.updateLevelById(cameraLevel.getId(),param.getConfigId());
-            }
-        }
-        if(StringUtils.isNotBlank(param.getNum())){
-            MqNumLevel mqNumLevel = mqNumLevelService.getByNum(param.getNum(),param.getType());
-            if(mqNumLevel == null){
-                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId(),param.getType());
-            }else {
-                mqNumLevelService.updateLevelById(mqNumLevel.getId(),param.getConfigId());
-            }
-        }
-
-        return ResultData.ok();
-    }
 
 }

+ 0 - 22
src/main/java/com/fdkankan/manage/util/NumTypeUtils.java

@@ -1,22 +0,0 @@
-package com.fdkankan.manage.util;
-
-public class NumTypeUtils {
-
-    public static Boolean isLaser(Integer type){
-        switch (type){
-            case 0:
-            case 1:
-            case 3:
-            case 4:
-            case 5:
-            case 7:
-                return false;
-            case 2:
-            case 6:
-            case 8:
-            case 57:
-                return true;
-        }
-        return false;
-    }
-}