Merge branch 'test'

# Conflicts:
#	src/main/java/com/fdkankan/manage/test/TestController.java

src/main/java/com/fdkankan/manage/common/ExcelErrorUtil.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.common;
 
 import com.fdkankan.manage.exception.BusinessException;
 
+import java.util.HashSet;
 import java.util.List;
 
 public class ExcelErrorUtil {
@@ -10,8 +11,9 @@ public class ExcelErrorUtil {
         if(errorList.size() <=0){
             return null;
         }
+        HashSet<Integer> set = new HashSet<>(errorList);
         StringBuilder res = new StringBuilder("第");
-        for (Integer index : errorList) {
+        for (Integer index : set) {
             res.append(index  +3).append(",");
         }
         res.deleteCharAt(res.lastIndexOf(","));

src/main/java/com/fdkankan/manage/controller/CameraTypeController.java

@@ -1,6 +1,11 @@
 package com.fdkankan.manage.controller;
 
 
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.ICameraTypeService;
+import com.fdkankan.manage.service.ICameraWifiPrefixService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-04-11
  */
 @RestController
-@RequestMapping("/manage/cameraType")
+@RequestMapping("/service/manage/cameraType")
 public class CameraTypeController {
 
+    @Autowired
+    ICameraTypeService cameraTypeService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+
+        return ResultData.ok(cameraTypeService.list());
+    }
 }
 

src/main/java/com/fdkankan/manage/controller/CameraWifiPrefixController.java

@@ -0,0 +1,40 @@
+package com.fdkankan.manage.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.common.Result;
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.entity.CameraWifiPrefix;
+import com.fdkankan.manage.service.ICameraWifiPrefixService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-11-01
+ */
+@RestController
+@RequestMapping("/service/manage/cameraWifiPrefix")
+public class CameraWifiPrefixController {
+
+    @Autowired
+    ICameraWifiPrefixService cameraWifiPrefixService;
+
+    @GetMapping("/allList")
+    public ResultData allList(@RequestParam(required = false) Integer cameraType){
+        LambdaQueryWrapper<CameraWifiPrefix> wr = new LambdaQueryWrapper<>();
+        if(cameraType != null){
+            wr.eq(CameraWifiPrefix::getCameraType,cameraType);
+        }
+        return ResultData.ok(cameraWifiPrefixService.list(wr));
+    }
+}
+

src/main/java/com/fdkankan/manage/entity/CameraType.java

@@ -56,6 +56,9 @@ public class CameraType implements Serializable {
     @TableField("remark")
     private String remark;
 
+    @TableField("name")
+    private String name;
+
     @TableField("create_time")
     private Date createTime;
 

src/main/java/com/fdkankan/manage/entity/CameraWifiPrefix.java

@@ -0,0 +1,54 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-11-01
+ */
+@Getter
+@Setter
+@TableName("t_camera_wifi_prefix")
+public class CameraWifiPrefix implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 相机 WiFiname_前缀
+     */
+    @TableField("wifi_name_prefix")
+    private String wifiNamePrefix;
+
+    /**
+     * 相机类型
+     */
+    @TableField("camera_type")
+    private Integer cameraType;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/entity/Company.java

@@ -109,5 +109,12 @@ public class Company implements Serializable {
     @TableField("company_desc")
     private String companyDesc;
 
+    /**
+     * 拍摄场景版本V3:计算为V3场景，V4:计算为V4场景，默认为V4场景
+     */
+    @TableField("scene_version")
+    private String sceneVersion;
+
+
 
 }

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_folder"
+                "t_camera_wifi_prefix"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

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

@@ -215,7 +215,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).map(CameraDetail::getCameraId).collect(Collectors.toSet());
+                    .filter(entity -> entity.getType() == 10 || entity.getType() == 11).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());

src/main/java/com/fdkankan/manage/mapper/ICameraWifiPrefixMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.CameraWifiPrefix;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-11-01
+ */
+@Mapper
+public interface ICameraWifiPrefixMapper extends BaseMapper<CameraWifiPrefix> {
+
+}

src/main/java/com/fdkankan/manage/service/ICameraWifiPrefixService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.CameraWifiPrefix;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-11-01
+ */
+public interface ICameraWifiPrefixService extends IService<CameraWifiPrefix> {
+
+}

src/main/java/com/fdkankan/manage/service/impl/AuthorizeCameraServiceImpl.java

@@ -70,6 +70,9 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         if(StringUtils.isNotBlank(param.getMachineUuid())){
             wrapper.like(AuthorizeCamera::getMachineUuid,param.getMachineUuid());
         }
+        if(StringUtils.isNotBlank(param.getMachineCode())){
+            wrapper.like(AuthorizeCamera::getMachineCode,param.getMachineCode());
+        }
         wrapper.orderByDesc(AuthorizeCamera::getCreateTime);
         Page<AuthorizeCamera> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeCamera::getSysUserId).collect(Collectors.toSet());

src/main/java/com/fdkankan/manage/service/impl/AuthorizeInstallServiceImpl.java

@@ -57,6 +57,9 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
         if(StringUtils.isNotBlank(param.getMachineUuid())){
             wrapper.like(AuthorizeInstall::getMachineUuid,param.getMachineUuid());
         }
+        if(StringUtils.isNotBlank(param.getMachineCode())){
+            wrapper.like(AuthorizeInstall::getMachineCode,param.getMachineCode());
+        }
         wrapper.orderByDesc(AuthorizeInstall::getCreateTime);
         Page<AuthorizeInstall> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeInstall::getSysUserId).collect(Collectors.toSet());

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -62,6 +62,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Autowired
     IOrderService orderService;
     @Autowired
+    ICameraWifiPrefixService cameraWifiPrefixService;
+    @Autowired
     ICameraTypeService cameraTypeService;
 
     @Override
@@ -104,6 +106,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public PageInfo pageList(CameraParam param) {
         Page<CameraDetailVo> voPage = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<CameraType> list = cameraTypeService.list();
+        HashMap<String,CameraType> typeHashMap = new HashMap<>();
+        for (CameraType cameraType : list) {
+            typeHashMap.put(cameraType.getCameraType().toString(),cameraType);
+        }
+        for (CameraDetailVo record : voPage.getRecords()) {
+            record.setTypeStr(typeHashMap.get(record.getType()).getName());
+        }
         return PageInfo.PageInfo(voPage);
     }
 
@@ -112,8 +122,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(StringUtils.isEmpty(wifiName) ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        List<CameraType> list = cameraTypeService.list();
-        Set<String> wifiNamePrefixList = list.stream().map(CameraType::getWifiNamePrefix).collect(Collectors.toSet());
+        List<CameraWifiPrefix> list = cameraWifiPrefixService.list();
+        Set<String> wifiNamePrefixList = list.stream().map(CameraWifiPrefix::getWifiNamePrefix).collect(Collectors.toSet());
 
         if(!wifiName.contains("_")){
             throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
@@ -125,7 +135,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(!wifiNamePrefixList.contains(cameraPrefix)){
             throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
         }
-        HashMap<String,CameraType> cameraTypeMap = new HashMap<>();
+        HashMap<String,CameraWifiPrefix> cameraTypeMap = new HashMap<>();
         list.forEach(entity->cameraTypeMap.put(entity.getWifiNamePrefix(),entity));
 
         if(cameraTypeMap.get(cameraPrefix) == null){
@@ -141,7 +151,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         saveBatchCamera(Collections.singletonList(wifiName),cameraTypeMap);
     }
 
-    private Integer saveBatchCamera(List<String> wifiNameList,HashMap<String,CameraType> cameraTypeMap){
+    private Integer saveBatchCamera(List<String> wifiNameList,HashMap<String,CameraWifiPrefix> cameraTypeMap){
         HashSet<String> wifiNameSet = new HashSet<>(wifiNameList);
         List<Camera> cameraList = new ArrayList<>();
         for (String wifiName : wifiNameSet) {
@@ -171,13 +181,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
             String wifiNamePrix = camera.getWifiName().split("_")[0]+"_";
-            CameraType cameraType = cameraTypeMap.get(wifiNamePrix);
+            CameraWifiPrefix cameraType = cameraTypeMap.get(wifiNamePrix);
             cameraDetail.setType(cameraType.getCameraType());
 
-            if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType() || 11 == cameraDetail.getType()){
-                cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
-                cameraDetail.setUsedSpace(0L);
-            }
+            cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
+            cameraDetail.setUsedSpace(0L);
+
             cameraDetail.setUnit(CacheUtil.cameraUnit);
             if(cameraDetail.getUnit().equals("SP")){
                 cameraDetail.setTotalSpace(Long.valueOf(CacheUtil.cameraSpaceNum));
@@ -209,10 +218,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
     @Override
     public Integer ins(List<String> wifiNameList){
-        List<CameraType> cameraTypeList = cameraTypeService.list();
-        Set<String> wifiNamePrefixList = cameraTypeList.stream().map(CameraType::getWifiNamePrefix).collect(Collectors.toSet());
+        List<CameraWifiPrefix> cameraTypeList = cameraWifiPrefixService.list();
+        Set<String> wifiNamePrefixList = cameraTypeList.stream().map(CameraWifiPrefix::getWifiNamePrefix).collect(Collectors.toSet());
         List<Integer> errorRow = getErrorRow(wifiNameList,wifiNamePrefixList);
-        HashMap<String,CameraType> cameraTypeMap = new HashMap<>();
+        HashMap<String,CameraWifiPrefix> cameraTypeMap = new HashMap<>();
         cameraTypeList.forEach(entity->cameraTypeMap.put(entity.getWifiNamePrefix(),entity));
 
         excelService.toExcelError(errorRow);
@@ -578,13 +587,19 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(camera == null){
             throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
         }
-        CameraType cameraType = cameraTypeService.getByType(param.getCameraType());
-        if(cameraType == null){
-            throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+        String wifiNamePrefix = null;
+        if(StringUtils.isNotBlank(param.getWifiNamePrefix())){
+            wifiNamePrefix = param.getWifiNamePrefix();
+        }else {
+            CameraType cameraType = cameraTypeService.getByType(param.getCameraType());
+            if(cameraType == null){
+                throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+            }
+
         }
         LambdaUpdateWrapper<Camera> cameraLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         cameraLambdaUpdateWrapper.eq(Camera::getId,param.getId());
-        cameraLambdaUpdateWrapper.set(Camera::getWifiName,cameraType.getWifiNamePrefix()+ camera.getSnCode());
+        cameraLambdaUpdateWrapper.set(Camera::getWifiName,wifiNamePrefix+ camera.getSnCode());
         this.update(cameraLambdaUpdateWrapper);
 
 

src/main/java/com/fdkankan/manage/service/impl/CameraWifiPrefixServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.CameraWifiPrefix;
+import com.fdkankan.manage.mapper.ICameraWifiPrefixMapper;
+import com.fdkankan.manage.service.ICameraWifiPrefixService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-11-01
+ */
+@Service
+public class CameraWifiPrefixServiceImpl extends ServiceImpl<ICameraWifiPrefixMapper, CameraWifiPrefix> implements ICameraWifiPrefixService {
+
+}

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

@@ -313,10 +313,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //            throw new BusinessException(ResultCode.MOVE_ERROR);
 //        }
 
-        HashMap<String, SceneCopyLog> byNewNumList = copyLogService.getByNewNumList(Arrays.asList(param.getNum()));
-        if(byNewNumList.size() >0){
-            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
-        }
+//        HashMap<String, SceneCopyLog> byNewNumList = copyLogService.getByNewNumList(Arrays.asList(param.getNum()));
+//        if(byNewNumList.size() >0){
+//            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
+//        }
 
         if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11) {       //深时场景
             //迁移深时 dataSource

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -193,7 +193,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
             userIncrement.setIsExpired(0);
             userIncrement.setUpdateTime(date);
-            userIncrement.setIncrementEndTime(param.getIncrementEndTime());
+            userIncrement.setIncrementEndTime(param.getIncrementEndTime() +" 23:59:59");
             userIncrement.setIncrementTypeId(param.getIncrementTypeId());
             if(userIncrement.getId()== null){
                 userIncrement.setIncrementStartTime(date);

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -1,4 +1,5 @@
 package com.fdkankan.manage.test;
+import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,8 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.thread.ThreadService;
 import com.fdkankan.manage.util.ExcelUtil;
+import com.fdkankan.manage.util.RsaUtils;
+import com.fdkankan.manage.vo.request.SceneParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +26,7 @@ import java.io.IOException;
 import java.util.*;
 
 import static com.amazonaws.util.CredentialUtils.getCredentialsProvider;
+import static com.fdkankan.manage.util.RsaUtils.getKeyPair;
 
 @Slf4j
 @RestController
@@ -52,6 +56,16 @@ public class TestController {
 
         return ResultData.ok();
     }
+    //生成原世界相机授权码
+    @RequestMapping("/createCameraAuthCode")
+    public ResultData createCameraAuthCode(@RequestParam(required = false) String snCode) throws Exception {
+        RsaUtils rsa = new RsaUtils();
+
+        String ciphertext = rsa.encipher("4DKKPRO_"+snCode.toUpperCase(), CacheUtil.publicKey);
+        System.out.println(String.format("密文："+ciphertext));
+
+        return ResultData.ok(ciphertext);
+    }
 
     /**
      * 重置相机容量
@@ -113,7 +127,7 @@ public class TestController {
         String[] snCodes = this.getSnCodeTest();
         List<String> snCodeList = Arrays.asList(snCodes);
         LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(Camera::getSnCode,snCodeList);
+        wrapper.notIn(Camera::getSnCode,snCodeList);
         List<Camera> list = cameraService.list(wrapper);
         for (Camera camera : list) {
             if(camera == null){
@@ -140,42 +154,6 @@ public class TestController {
         return ResultData.ok();
     }
 
-    @GetMapping("/initCamerass")
-    public ResultData initCamerass(){
-        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CameraDetail::getType,10);
-        List<CameraDetail> list = cameraDetailService.list(wrapper);
-        for (CameraDetail cameraDetail : list) {
-            Long proSpace = sceneProService.getSpaceSumByCameraId(cameraDetail.getCameraId());
-            Long plusSpace = scenePlusService.getSpaceSumByCameraId(cameraDetail.getCameraId());
-            LambdaUpdateWrapper<CameraDetail> wrapper1 = new LambdaUpdateWrapper<>();
-            wrapper1.eq(CameraDetail::getId,cameraDetail.getId());
-            wrapper1.set(CameraDetail::getUnit,"GB");
-            wrapper1.set(CameraDetail::getTotalSpace,10737418240L);
-            wrapper1.set(CameraDetail::getUsedSpace,(plusSpace == null ?0L:plusSpace )+( proSpace == null ?0L:proSpace));
-            cameraDetailService.update(wrapper1);
-            sceneProService.lockOrUnLockBySpace(cameraDetail.getCameraId());
-        }
-        return ResultData.ok();
-    }
-    @GetMapping("/initCameraSpace")
-    public ResultData initCameraSpace(){
-        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CameraDetail::getUnit,"GB");
-        List<CameraDetail> list = cameraDetailService.list(wrapper);
-        for (CameraDetail cameraDetail : list) {
-            Long proSpace = sceneProService.getSpaceSumByCameraId(cameraDetail.getCameraId());
-            Long plusSpace = scenePlusService.getSpaceSumByCameraId(cameraDetail.getCameraId());
-            LambdaUpdateWrapper<CameraDetail> wrapper1 = new LambdaUpdateWrapper<>();
-            wrapper1.eq(CameraDetail::getId,cameraDetail.getId());
-            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();
@@ -215,129 +193,36 @@ public class TestController {
     }
 
 
-    private String[] getSnCodes(){
-        String res [] = {
-                "067E15841",
-                "07C3DA2E1",
-                "07EC6E0DC",
-                "06FFCBDA1",
-                "061D18D73",
-                "030285552",
-                "06EE53219",
-                "02452945D",
-                "060C4CB6A",
-                "06FAE7E46",
-                "06F860091",
-                "072D80097",
-                "073BD9E33",
-                "04AE6E2F5",
-                "071123F88",
-                "071256BC7",
-                "071210632",
-                "071265E8B",
-                "070D743D2",
-                "0700FA837",
-                "0703A543A",
-                "070B42A10",
-                "070BE22BA",
-                "0711305CA",
-                "0694087DB",
-                "070273265",
-                "071624ACD",
-                "072FAE15E",
-                "07F3DD250",
-                "0707D2A2C",
-                "0266F55AE",
-                "021DD5E87",
-                "02A80E87F",
-                "02C6209A2",
-                "02FE298D8",
-                "067B891A9",
-                "0408E93F5",
-                "0650ABFFB",
-                "070DE64AF",
-                "02D9E2F29",
-                "06B38A34F",
-                "063DE2E04",
-                "072ACF5F2",
-                "07288B5BF",
-                "02FFAB589",
-                "072D27B03",
-                "075BB0B0A",
-                "033869CC0",
-                "06EA790F7",
-                "06105B947",
-                "04FC2C13C",
-                "065E1EA54",
-                "06050CCD2",
-                "065DAAB57",
-                "06376454A",
-                "069CE5379",
-                "06FE7A53F",
-                "06DA9EADA",
-                "062B959FB",
-                "07058CC1C",
-                "0721ADBCF",
-                "0708E15A3",
-                "073B6BE96",
-                "07757C452",
-                "076A4A2C2",
-                "07467B94D",
-                "07F838850",
-                "076AAAA05",
-                "0766855A9",
-                "0765692AA",
-                "077A0D967",
-                "0707D67D9",
-                "07676CC0C",
-                "074C7BE97",
-                "0772F50DA",
-                "0712A8FA0",
-                "0768CD82B",
-                "0764A39B5",
-                "0771B69E4",
-                "07F66673D",
-                "077705FEE",
-                "07696266D",
-                "076F8D814",
-                "077EBF4FE",
-                "07109D1B0",
-                "06F83452B",
-                "0300B6F0A",
-                "0774EA21B",
-                "070D890E8",
-                "077E7B417",
-                "07DE244F1",
-                "070591078",
-                "03451435F",
-                "0775B3B58",
-                "07239FFFB",
-                "070E51723",
-                "076F1650D",
-                "07199F0E6",
-                "0703C265E",
-                "07451A77B",
-                "0711ABE58",
-                "07BE0B836",
-                "070AFD6DD",
-                "070A40E42",
-                "07143F457",
-                "0706CE0EC",
-                "0713DCCC0",
-                "073AFACA6",
-                "025D3928F",
-                "02D874C48",
-                "06042AB08",
-                "04CA21B73",
-                "02F7D171B",
-                "02C17AE5E",
-                "024696CB5",
-                "4DKKP01B000127",
-                "4DKKP01B000114",
-                "4DKKP01B000138",
-                "4DKKP01B000160",
-                "4DKKP01B000163",
-        };
-        return res;
+    /**
+     * 06F7B8204  -->  087EEF7B5
+     * 90F86252A  -->  92ED4458E
+     */
+    @PostMapping("/moveCamera")
+    public ResultData moveCamera(@RequestParam(required = false) String snCode,
+                                 @RequestParam(required = false) String toSnCode){
+        Camera camera = cameraService.getBySnCode(snCode);
+        if(camera == null){
+            throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
+        }
+        Camera camera2 = cameraService.getBySnCode(toSnCode);
+        if(camera2 == null){
+            throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
+        }
+        List<ScenePro> sceneProList = sceneProService.getListByCameraId(camera.getId());
+        List<ScenePlus> plusList = scenePlusService.getListByCameraId(camera.getId());
+        for (ScenePro scenePro : sceneProList) {
+            SceneParam param = new SceneParam();
+            param.setNum(scenePro.getNum());
+            param.setSnCode(toSnCode);
+            sceneProService.move(param);
+        }
+        for (ScenePlus scenePro : plusList) {
+            SceneParam param = new SceneParam();
+            param.setNum(scenePro.getNum());
+            param.setSnCode(toSnCode);
+            sceneProService.move(param);
+        }
+
+        return ResultData.ok();
     }
 }

src/main/java/com/fdkankan/manage/vo/request/AuthorizeParam.java

@@ -25,4 +25,5 @@ public class AuthorizeParam extends RequestBase{
 
     private String machineUuid;
 
+    private String machineCode;
 }

src/main/java/com/fdkankan/manage/vo/request/CameraInOutParam.java

@@ -17,4 +17,6 @@ public class CameraInOutParam {
     private String buyDate;
 
     private Integer cameraType;
+
+    private String wifiNamePrefix;
 }

src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -17,6 +17,7 @@ public class CameraDetailVo {
 
     private String wifiName;            //wifi名称
     private String type;                //相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+    private String typeStr;                //相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
     private String outType;             //出库类型
     private String companyName;         //客户名称
     private String userName;            //绑定账号

src/main/java/com/fdkankan/manage/vo/response/CompanyVo.java

@@ -16,4 +16,5 @@ public class CompanyVo {
     private String floorLogo;
     private String qrLogo;
     private Integer showLogo;               //是否显示初始logo，0隐藏，1显示
+    private String sceneVersion;
 }

src/main/resources/mapper/manage/CameraMapper.xml

@@ -17,9 +17,12 @@
         <if test="param.outType !=null ">
             and d.own = #{param.outType}
         </if>
-        <if test="param.type !=null ">
+        <if test="param.type !=null and param.type !=1">
             and d.type = #{param.type}
         </if>
+        <if test="param.type !=null and param.type == 1 ">
+            and d.type in (1,3)
+        </if>
         <if test="param.snCode !=null and param.snCode != '' ">
             and c.sn_code like concat ('%',#{param.snCode},'%')
         </if>

src/main/resources/mapper/manage/CameraWifiPrefixMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.ICameraWifiPrefixMapper">
+
+</mapper>

src/main/resources/mapper/manage/CompanyMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.CompanyVo">
         select c.id,c.company_name,c.company_desc ,c.sys_user_id as createUserId, u.user_name as createUserName,c.create_time,
-               c.top_logo,c.floor_logo,c.qr_logo,c.show_logo
+               c.top_logo,c.floor_logo,c.qr_logo,c.show_logo ,c.scene_version
         from  t_company c
         left join sys_user u on c.sys_user_id = u.id
         where c.rec_status = 'A'

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -38,7 +38,7 @@
             and s.scene_name like concat ('%',#{param.sceneName},'%')
         </if>
         and is_upgrade = 0
-        UNION
+        UNION ALL
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
         ,algorithm_time,data_source,e.shoot_count,e.gps