1

src/main/java/com/fdkankan/manage_jp/common/SceneSourceUtil.java

@@ -0,0 +1,14 @@
+package com.fdkankan.manage_jp.common;
+
+import lombok.Data;
+
+@Data
+public class SceneSourceUtil {
+
+    public static Boolean isLaser(Integer sceneSource){
+        if(sceneSource == 4 || sceneSource == 5 || sceneSource == 57){
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -1,9 +1,12 @@
 package com.fdkankan.manage_jp.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.manage_jp.common.Result;
+import com.fdkankan.manage_jp.common.ResultCode;
 import com.fdkankan.manage_jp.entity.User;
+import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.service.IUserRoleService;
 import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.LoginParam;
@@ -91,5 +94,34 @@ public class UserController extends BaseController {
 
         return Result.success(retrunList);
     }
+
+    /**
+     * 删除用户
+     */
+
+    @PostMapping("/delUser")
+    public Result delUser(@RequestBody UserParam param){
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        userService.removeById(param.getId());
+        return Result.success();
+    }
+
+    /**
+     * 停用启用
+     */
+
+    @PostMapping("/enableUser")
+    public Result enableUser(@RequestBody UserParam param){
+        if(param.getId() == null || param.getStatus() == null){
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
+        LambdaUpdateWrapper<User> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(User::getId,param.getId());
+        wrapper.set(User::getStatus,param.getStatus());
+        userService.update(wrapper);
+        return Result.success();
+    }
 }
 

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

@@ -6,6 +6,7 @@ import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.manage_jp.common.DownloadStatusEnum;
 import com.fdkankan.manage_jp.common.RedisKeyUtil;
 import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.common.SceneSourceUtil;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
@@ -55,7 +56,7 @@ public class DownService implements IDownService {
         }
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
         log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
-        if((sceneType == 4 || sceneType == 5 ) && isObj !=1){ //深时场景
+        if(SceneSourceUtil.isLaser(sceneType) && isObj !=1){ //深时场景
             return SSCheckDownload(sceneNum,lang);
         }
         SceneDownloadLog sceneDownloadLog;
@@ -131,7 +132,7 @@ public class DownService implements IDownService {
 
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
         log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
-        if((sceneType == 4 || sceneType == 5 )&& isObj !=1){ //深时场景
+        if(SceneSourceUtil.isLaser(sceneType)&& isObj !=1){ //深时场景
             return SSDownload(sceneNum,userId,lang);
         }
 
@@ -179,7 +180,7 @@ public class DownService implements IDownService {
         }
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
         log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
-        if((sceneType == 4 || sceneType == 5 ) && isObj !=1){ //深时场景
+        if(SceneSourceUtil.isLaser(sceneType) && isObj !=1){ //深时场景
             return SSDownloadProcess(sceneNum,lang);
         }
         String redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS;
@@ -292,6 +293,7 @@ public class DownService implements IDownService {
             LambdaUpdateWrapper<SceneDownloadLog> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(SceneDownloadLog::getSceneNum,sceneNum);
             wrapper.eq(SceneDownloadLog::getStatus,0);
+            wrapper.eq(SceneDownloadLog::getSysVersion,"ss");
             wrapper.set(SceneDownloadLog::getDownloadUrl,vo.getUrl());
             wrapper.set(SceneDownloadLog::getStatus,1);
             sceneDownloadLogService.update(wrapper);

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

@@ -15,6 +15,7 @@ import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.manage_jp.common.RedisKeyUtil;
 import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.common.SceneSourceUtil;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
@@ -280,7 +281,7 @@ public class SceneCommonService {
                 });
             }
 
-            if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
+            if(SceneSourceUtil.isLaser(scenePlus.getSceneSource())){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,true);
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
@@ -300,7 +301,7 @@ public class SceneCommonService {
             //修改马赛克图片
             this.updateOssFileName(oldNum,newNum);
 
-            if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
+            if(SceneSourceUtil.isLaser(scenePlus.getSceneSource())){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,false);
             }
             String redisKey = RedisKeyUtil.laserCopyLock + newNum;
@@ -396,7 +397,7 @@ public class SceneCommonService {
             oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(oldNum, scenePro.getNum()));
             sceneProEditService.save(oldEditScene);
 
-            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
+            if(SceneSourceUtil.isLaser(scenePro.getSceneSource())){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,false);
             }
             /*
@@ -430,7 +431,7 @@ public class SceneCommonService {
             String targetVoice = String.format(SceneResourcePath.voicePath, scenePro.getNum());
             this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
 
-            if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
+            if(SceneSourceUtil.isLaser(scenePro.getSceneSource())){  //深时复制
                 laserService.copy(oldNum,newNum,newDataSource,true);
             }
             scenePro.setStatus(-2);

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

@@ -10,10 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.SceneVersionType;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.manage_jp.common.OssPath;
-import com.fdkankan.manage_jp.common.RedisKeyUtil;
-import com.fdkankan.manage_jp.common.Result;
-import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.common.*;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
@@ -124,7 +121,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         scenePlus.setId(null);
         this.save(scenePlus);
 
-        if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){
+        if(SceneSourceUtil.isLaser(scenePlus.getSceneSource())){
             String redisKey = RedisKeyUtil.laserCopyLock + newNum;
             redisUtil.set(redisKey,"1",60*60);
         }
@@ -194,7 +191,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             updateOssPayStatus(String.format(OssPath.v4_statusPath,num),payStatus);
         }
 
-        if(sceneSource == 4 || sceneSource == 5){
+        if(SceneSourceUtil.isLaser(sceneSource)){
              laserService.updateStatus(num, payStatus == 1 ? 2 : 3);
         }
 

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

@@ -15,10 +15,7 @@ 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;
-import com.fdkankan.manage_jp.common.RedisKeyUtil;
-import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.common.*;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
@@ -298,7 +295,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),"I");
         }
         Integer sceneSource = scenePro == null ? scenePlus.getSceneSource() : scenePro.getSceneSource();
-        if(sceneSource == 4 || sceneSource == 5){
+        if(SceneSourceUtil.isLaser(sceneSource)){
             laserService.updateStatus(num,-1);
         }
         tmContractorNumService.deleteByNum(num);
@@ -507,7 +504,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail,user);
             scenePlusService.move(num,scenePro == null ?"v4":"v3",cameraDetail,user);
-            if(sceneSource == 4 || sceneSource == 5){
+            if(SceneSourceUtil.isLaser(sceneSource)){
                 laserService.move(num, oldCamera.getSnCode(), camera.getSnCode(), user.getId(),user.getUserName(), dataSource);
             }
             sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage_jp.common.PageInfo;
 import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.common.SceneSourceUtil;
 import com.fdkankan.manage_jp.entity.*;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
@@ -210,7 +211,7 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             }
             scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail,user);
             this.removeByIds(tmColdStorages);
-            if(sceneSource == 4 || sceneSource == 5){
+            if(SceneSourceUtil.isLaser(sceneSource)){
                 String dataSource = scenePro == null ? scenePlusExtService.getByPlusId(scenePlus.getId()).getDataSource() : scenePro.getDataSource();
                 laserService.move(num, oldCamera.getSnCode(), camera.getSnCode(), user.getId(),user.getUserName(), dataSource);
 

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

@@ -7,4 +7,5 @@ public class UserParam {
     private Integer id;
     private String newPassword;
     private String password;
+    private Integer status;
 }