Merge branch 'test'

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

@@ -1,63 +1,64 @@
-package com.fdkankan.manage.common;
-
-import cn.hutool.cache.Cache;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum CameraTypeEnum {
-    DOUBLE_EYE(0,"KK-","4DKK_","旧双目相机"),
-    FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机"),
-    FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
-    ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
-    DOUBLE_EYE_TURN(9,"KJ-","4DKKMI_","双目转台"),
-    LASER_TURN(10,"SS-","4DSS_","激光转台");
-
-
-    private int type;
-    private String sceneNumPrefix;
-    private String wifiNamePrefix;
-    private String desc;
-
-    public int getType() {
-        return type;
-    }
-
-    public String getSceneNumPrefix() {
-        return sceneNumPrefix;
-    }
-
-    public String getWifiNamePrefix() {
-        return wifiNamePrefix;
-    }
-
-
-    public static Map<Integer,CameraTypeEnum> typeMaps = new HashMap<>(5);
-    public static Map<String,Integer> typePrefixMap = new HashMap<>(5);
-
-    static{
-        for (CameraTypeEnum typeEnum : CameraTypeEnum.values()) {
-            typeMaps.put(typeEnum.getType(),typeEnum);
-            typePrefixMap.put(typeEnum.getWifiNamePrefix(),typeEnum.getType());
-        }
-    }
-
-    CameraTypeEnum(Integer type, String sceneNumPrefix, String wifiNamePrefix, String desc) {
-        this.type = type;
-        this.sceneNumPrefix = sceneNumPrefix;
-        this.wifiNamePrefix = wifiNamePrefix;
-        this.desc = desc;
-    }
-
-    public static String getSceneNumPrefixByType(Integer type){
-        if(typeMaps.containsKey(type)){
-            return typeMaps.get(type).getSceneNumPrefix();
-        }
-        return "";
-    }
-
-    public static Integer getTypeByWifiNamePrefix(String wifiNamePrefix){
-        return typePrefixMap.get(wifiNamePrefix);
-    }
-
-}
+//package com.fdkankan.manage.common;
+//
+//import cn.hutool.cache.Cache;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//public enum CameraTypeEnum {
+//    DOUBLE_EYE(0,"KK-","4DKK_","旧双目相机"),
+//    FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机"),
+//    FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
+//    ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
+//    DOUBLE_EYE_TURN(9,"KJ-","4DKKMI_","双目转台"),
+//    LASER_TURN(10,"SS-","4DSS_","深时"),
+//    LASER_SG_TURN(13,"SG-","4DSG_","深光");
+//
+//
+//    private int type;
+//    private String sceneNumPrefix;
+//    private String wifiNamePrefix;
+//    private String desc;
+//
+//    public int getType() {
+//        return type;
+//    }
+//
+//    public String getSceneNumPrefix() {
+//        return sceneNumPrefix;
+//    }
+//
+//    public String getWifiNamePrefix() {
+//        return wifiNamePrefix;
+//    }
+//
+//
+//    public static Map<Integer,CameraTypeEnum> typeMaps = new HashMap<>(5);
+//    public static Map<String,Integer> typePrefixMap = new HashMap<>(5);
+//
+//    static{
+//        for (CameraTypeEnum typeEnum : CameraTypeEnum.values()) {
+//            typeMaps.put(typeEnum.getType(),typeEnum);
+//            typePrefixMap.put(typeEnum.getWifiNamePrefix(),typeEnum.getType());
+//        }
+//    }
+//
+//    CameraTypeEnum(Integer type, String sceneNumPrefix, String wifiNamePrefix, String desc) {
+//        this.type = type;
+//        this.sceneNumPrefix = sceneNumPrefix;
+//        this.wifiNamePrefix = wifiNamePrefix;
+//        this.desc = desc;
+//    }
+//
+//    public static String getSceneNumPrefixByType(Integer type){
+//        if(typeMaps.containsKey(type)){
+//            return typeMaps.get(type).getSceneNumPrefix();
+//        }
+//        return "";
+//    }
+//
+//    public static Integer getTypeByWifiNamePrefix(String wifiNamePrefix){
+//        return typePrefixMap.get(wifiNamePrefix);
+//    }
+//
+//}

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

@@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author 
- * @since 2023-01-05
+ * @since 2023-04-11
  */
 @RestController
-@RequestMapping("/manage/mqBackup")
-public class MqBackupController {
+@RequestMapping("/manage/cameraType")
+public class CameraTypeController {
 
 }
 

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-09-22
- */
-@RestController
-@RequestMapping("/manage/mailTemplate")
-public class MailTemplateController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景编码表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/scene3dNum")
-public class Scene3dNumController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-15
- */
-@RestController
-@RequestMapping("/manage/sceneDelLog")
-public class SceneDelLogController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditControls")
-public class SceneEditControlsController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditInfo")
-public class SceneEditInfoController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-08-12
- */
-@RestController
-@RequestMapping("/manage/sceneEditInfoExt")
-public class SceneEditInfoExtController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-02
- */
-@RestController
-@RequestMapping("/manage/sceneMoveLog")
-public class SceneMoveLogController {
-
-}
-

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

@@ -0,0 +1,72 @@
+package com.fdkankan.manage.controller;
+
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.entity.ServiceUpTip;
+import com.fdkankan.manage.exception.BusinessException;
+import com.fdkankan.manage.service.IServiceUpTipService;
+import com.fdkankan.manage.vo.request.ServiceUPTipParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-03
+ */
+@RestController
+@RequestMapping("/service/manage/serviceUpTip")
+public class ServiceUpTipController extends BaseController{
+
+    @Autowired
+    IServiceUpTipService serviceUpTipService;
+
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody ServiceUPTipParam param){
+        if(param.getType() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+
+        return ResultData.ok(serviceUpTipService.pageList(param));
+    }
+
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody ServiceUpTip param){
+
+        if(param.getId() != null){
+            ServiceUpTip entity = serviceUpTipService.getById(param.getId());
+            param.setType(entity.getType());
+        }
+        param.setCreateTime(null);
+        param.setUpdateTime(null);
+        param.setSysUserId(Long.valueOf((String)StpUtil.getLoginId()));
+        if(param.getBanStatus() !=null && param.getBanStatus() == 0){
+            serviceUpTipService.banOther(param.getType());
+        }
+        serviceUpTipService.saveOrUpdate(param);
+        return ResultData.ok();
+
+    }
+
+    @PostMapping("/delete")
+    public ResultData delete(@RequestBody ServiceUpTip param){
+        if(param.getId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        serviceUpTipService.removeById(param.getId());
+        return ResultData.ok();
+
+    }
+}
+

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

@@ -0,0 +1,66 @@
+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-04-11
+ */
+@Getter
+@Setter
+@TableName("t_camera_type")
+public class CameraType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 相机类型表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0 旧双目相机，1思维看看pro八目相机（看看），2看看lite,5指房宝，9双目转台（看见），10激光转台（深时），11激光转台（深光）
+     */
+    @TableField("camera_type")
+    private Integer cameraType;
+
+    /**
+     * 场景码前缀
+     */
+    @TableField("scene_prefix")
+    private String scenePrefix;
+
+    /**
+     * 相机WiFiname前缀
+     */
+    @TableField("wifi_name_prefix")
+    private String wifiNamePrefix;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("remark")
+    private String remark;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

@@ -0,0 +1,147 @@
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-03
+ */
+@Getter
+@Setter
+@TableName("t_service_up_tip")
+public class ServiceUpTip implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 版本号
+     */
+    @TableField("version")
+    private String version;
+
+    /**
+     * 类型，0看看，1深时，2全景，3带看
+     */
+    @TableField("type")
+    private Integer type;
+
+    @TableField("tip_start_time")
+    private String tipStartTime;
+
+    @TableField("tip_end_time")
+    private String tipEndTime;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+    /**
+     * 标题
+     */
+    @TableField("title_en")
+    private String titleEn;
+
+    /**
+     * 图片，视频url
+     */
+    @TableField("image_url")
+    private String imageUrl;
+    /**
+     * 图片，视频url
+     */
+    @TableField("image_url_en")
+    private String imageUrlEn;
+
+    /**
+     * 说明
+     */
+    @TableField("description")
+    private String description;
+    /**
+     * 说明
+     */
+    @TableField("description_en")
+    private String descriptionEn;
+
+    /**
+     * 详情链接
+     */
+    @TableField("info_url_en")
+    private String infoUrlEn;
+    /**
+     * 详情链接
+     */
+    @TableField("info_url")
+    private String infoUrl;
+
+    /**
+     * 0启用，1禁用
+     */
+    @TableField("ban_status")
+    private Integer banStatus;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
+    @TableField(exist = false)
+    private String createName;
+
+
+    @TableField(exist = false)
+    private List<String> timeList;
+
+    public String getTipStartTime() {
+        if(timeList != null && timeList.size() >0){
+            return timeList.get(0) + " 00:00:00";
+        }
+        return tipStartTime;
+    }
+
+    public String getTipEndTime() {
+        if(timeList != null && timeList.size() >1){
+            return timeList.get(1) + " 23:59:59";
+        }
+        return tipEndTime;
+    }
+
+    public List<String> getTimeList() {
+        if((timeList == null || timeList.size() <=0 )
+                && StringUtils.isNotBlank(tipStartTime) && StringUtils.isNotBlank(tipEndTime)){
+            timeList = new ArrayList<>();
+            timeList.add(tipStartTime.split(" ")[0]);
+            timeList.add(tipEndTime.split(" ")[0]);
+            return timeList;
+        }
+        return timeList;
+    }
+}

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_scene_del_log",
+                "t_camera_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneParam.java

@@ -19,6 +19,8 @@ public class LaserSceneParam {
     private String startTime;
     private String endTime;
 
+    private Integer sceneSource = 4;
+
     private String orderBy = "shoot_time";
     private String sortBy = "DESC";
 }

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

@@ -154,14 +154,16 @@ public class LaserService {
             newParam.setOrderBy(param.getField());
         }
         newParam.setSortBy(param.getOrder());
-
+        if(param.getType() == 6){
+            newParam.setSceneSource(5);
+        }
         return newParam;
     }
 
     private List<String> setSnCodes(List<CameraDetail> cameraDetails) {
         if(cameraDetails != null && cameraDetails.size() >0){
             Set<Long> cameraIds = cameraDetails.stream()
-                    .filter(entity -> entity.getGoodsId() == 10).map(CameraDetail::getCameraId).collect(Collectors.toSet());
+                    .filter(entity -> entity.getType() == 10).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/inner/controller/InnerController.java

@@ -6,6 +6,7 @@ import com.fdkankan.manage.controller.BaseController;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.ICommonService;
 import com.fdkankan.manage.service.ISceneProService;
+import com.fdkankan.manage.service.IServiceUpTipService;
 import com.fdkankan.manage.vo.request.SceneParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,8 @@ public class InnerController extends BaseController {
 
     @Autowired
     private ISceneProService sceneProService;
+    @Autowired
+    IServiceUpTipService serviceUpTipService;
 
     @PostMapping("/move")
     public ResultData move(@RequestBody SceneParam param){
@@ -42,4 +45,10 @@ public class InnerController extends BaseController {
         return ResultData.ok();
     }
 
-}
+    @GetMapping("/getServiceUpTip")
+    public ResultData getServiceUpTip(@RequestParam(required = false) Integer type){
+
+        return ResultData.ok( serviceUpTipService.getServiceUpTipByType(type));
+    }
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.ServiceUpTip;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.ServiceUPTipParam;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-03
+ */
+public interface IServiceUpTipService extends IService<ServiceUpTip> {
+
+    Object pageList(ServiceUPTipParam param);
+
+    Object getServiceUpTipByType(Integer type);
+
+    void banOther(Integer type);
+}

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

@@ -8,7 +8,6 @@ import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.User;
@@ -67,7 +66,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         String snCode = null;
         String cooperationUserName = null;
-        if(cameraDetail.getType() == CameraTypeEnum.LASER_TURN.getType()){
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){
             Camera cameraEntity = cameraService.getById(cameraDetail.getCameraId());
             snCode = cameraEntity.getSnCode();
             cooperationUserName  = user.getUserName();

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

@@ -58,6 +58,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     IExcelService excelService;
     @Autowired
     IOrderService orderService;
+    @Autowired
+    ICameraTypeService cameraTypeService;
 
     @Override
     public List<Camera> getListByCameraIdList(List<Long> cameraIdList) {
@@ -107,19 +109,36 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(StringUtils.isEmpty(wifiName) ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if( !wifiName.contains("_") || !wifiName.contains("4D")){
+        List<CameraType> list = cameraTypeService.list();
+        Set<String> wifiNamePrefixList = list.stream().map(CameraType::getWifiNamePrefix).collect(Collectors.toSet());
+
+        if(!wifiName.contains("_")){
+            throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
+        }
+        String[] split = wifiName.split("_");
+        String cameraPrefix = split[0] +"_";
+        String snCode = split[1];
+
+        if(!wifiNamePrefixList.contains(cameraPrefix)){
             throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
         }
+        HashMap<String,CameraType> cameraTypeMap = new HashMap<>();
+        list.forEach(entity->cameraTypeMap.put(entity.getWifiNamePrefix(),entity));
+
+        if(cameraTypeMap.get(cameraPrefix) == null){
+            throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
+        }
+
         LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Camera::getSnCode,wifiName.split("_")[1]);
+        wrapper.eq(Camera::getSnCode,snCode);
         long count = this.count(wrapper);
         if(count > 0){
             throw new BusinessException(ResultCode.WIFI_NAME_REPEAT);
         }
-        saveBatchCamera(Collections.singletonList(wifiName));
+        saveBatchCamera(Collections.singletonList(wifiName),cameraTypeMap);
     }
 
-    private Integer saveBatchCamera(List<String> wifiNameList){
+    private Integer saveBatchCamera(List<String> wifiNameList,HashMap<String,CameraType> cameraTypeMap){
         HashSet<String> wifiNameSet = new HashSet<>(wifiNameList);
         List<Camera> cameraList = new ArrayList<>();
         for (String wifiName : wifiNameSet) {
@@ -127,6 +146,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(res.length !=2 || StringUtils.isBlank(res[1])){
                 throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
             }
+            if(cameraTypeMap.get(res[0] +"_") == null){
+                throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
+            }
             Camera camera = new Camera();
             camera.setWifiName(wifiName);
             camera.setSnCode(res[1]);
@@ -141,25 +163,23 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
         List<CameraDetail> cameraDetailList = new ArrayList<>();
         for (Camera camera : cameraList) {
-            String wifiName = camera.getWifiName();
-            Integer type = CameraTypeEnum.getTypeByWifiNamePrefix(wifiName.substring(0,wifiName.lastIndexOf("_") +1));
-
             CameraDetail cameraDetail = new CameraDetail();
             cameraDetail.setAgency(CameraConstant.DEFAULT_AGENT);
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
-            cameraDetail.setType(type);
-            if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType()){
+            String wifiNamePrix = camera.getWifiName().split("_")[0]+"_";
+            CameraType 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);
             }
-            if(type != 9 && type != 10){
-                type = type == 0 ? 1: 4;
-            }
             if("aws".equals(CacheUtil.uploadType)){
                 cameraDetail.setCountry(1);//1-国外
             }
-            cameraDetail.setGoodsId(Long.valueOf(type));
+            cameraDetail.setGoodsId(null);
+
             if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
                 cameraDetail.setCountry(2);
                 cameraDetail.setOwn(2);
@@ -172,7 +192,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
     @Override
     public Integer ins(List<String> wifiNameList){
-        List<Integer> errorRow = getErrorRow(wifiNameList);
+        List<CameraType> cameraTypeList = cameraTypeService.list();
+        Set<String> wifiNamePrefixList = cameraTypeList.stream().map(CameraType::getWifiNamePrefix).collect(Collectors.toSet());
+        List<Integer> errorRow = getErrorRow(wifiNameList,wifiNamePrefixList);
+        HashMap<String,CameraType> cameraTypeMap = new HashMap<>();
+        cameraTypeList.forEach(entity->cameraTypeMap.put(entity.getWifiNamePrefix(),entity));
+
         excelService.toExcelError(errorRow);
         List<String> snCodeList = new ArrayList<>();
         for (String wifiName : wifiNameList) {
@@ -186,12 +211,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             List<Integer> errorRow2 = getErrorRow(snCodeList, newList);
             excelService.toExcelError(errorRow2);
         }
-        return saveBatchCamera(wifiNameList);
+        return saveBatchCamera(wifiNameList,cameraTypeMap);
     }
 
 
 
-    private List<Integer> getErrorRow(List<String> wifiNameList){
+    private List<Integer> getErrorRow(List<String> wifiNameList,Set<String> wifiNamePrefixList){
         List<Integer> errorIndexList = new ArrayList<>();
         Set<String> wifiNameSet = new HashSet<>();
         Integer index = 0;
@@ -205,9 +230,16 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 errorIndexList.add(index);
                 continue;
             }
-            if( !wifiName.contains("_") || !wifiName.contains("4D")
-                    || !CameraTypeEnum.typePrefixMap.containsKey(wifiName.split("_")[0]+"_")){
+            if(!wifiName.contains("_")){
                 errorIndexList.add(index);
+                continue;
+            }
+            String[] split = wifiName.split("_");
+            String cameraPrefix = split[0] +"_";
+
+            if(!wifiNamePrefixList.contains(cameraPrefix)){
+                errorIndexList.add(index);
+                continue;
             }
             wifiNameSet.add(wifiName);
         }

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

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

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

@@ -111,9 +111,6 @@ public class ExcelServiceImpl implements IExcelService {
                     continue;
                 }
                 String wifiName = map.get(0);
-                if(StringUtils.isBlank(wifiName) || !wifiName.contains("_") || !wifiName.contains("4D")){
-                    errorIndex.add(index -3);
-                }
                 wifiNameList.add(wifiName);
             }else if(type == 1){    //出库
                 if(index == 0 && !map.get(0).equals("设备出库模板")){

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

@@ -3,7 +3,6 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.util.RandomUtil;
-import com.fdkankan.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.entity.Scene3dNum;
 import com.fdkankan.manage.mapper.IScene3dNumMapper;

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

@@ -317,7 +317,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public PageInfo pageList(SceneParam param) {
-        if(param.getType() == 2){  //深时
+        if(param.getType() == 2 || param.getType() == 6){  //深时
             return laserService.pageList(param);
         }
         if(param.getType() == 3){ //双目lite
@@ -395,7 +395,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         //深时场景无限容量
-        if(cameraDetail.getType() != 10 && totalSpace !=-1 &&  newUseSpace  > totalSpace){
+        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && totalSpace !=-1 &&  newUseSpace  > totalSpace){
             throw new BusinessException(ResultCode.CAMERA_SPACE_ERROR);
         }
 
@@ -418,13 +418,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         oldCameraDetail.setUsedSpace(oldUseSpace);
         Long subSpace =  oldCameraDetail.getTotalSpace() - oldUseSpace;
 
-        if(oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(oldCameraDetail,oldCameraDetail.getCameraId(),1);
         }
 
         Integer payStatus =  scenePro == null ? scenePlus.getPayStatus() : scenePro.getPayStatus();
 
-        if(cameraDetail.getType() != 10 && payStatus!=1){           //有剩余容量解封容量内场景
+        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && payStatus!=1){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(scenePro,scenePlus,1);
         }
         cameraDetailService.updateById(oldCameraDetail);
@@ -454,7 +454,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         //协作相机
         sceneResourceCameraService.setCooperationUser(cameraDetail,param.getNum());
-        if(cameraDetail.getType() == 10){       //深时场景
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){       //深时场景
             laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId());
         }
         updateFdageNewDataSource(scenePro,scenePlus,oldCamera.getSnCode(),param.getSnCode(),dataSource);
@@ -611,7 +611,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             scenePlusService.removeById(scenePlus.getId());
         }
-        if(sceneSource != null && sceneSource == 4){
+        if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
         if(cameraId != null){

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

@@ -0,0 +1,87 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.entity.ServiceUpTip;
+import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.mapper.IServiceUpTipMapper;
+import com.fdkankan.manage.service.IServiceUpTipService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
+import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.vo.request.ServiceUPTipParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-03
+ */
+@Service
+public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, ServiceUpTip> implements IServiceUpTipService {
+
+    @Autowired
+    ISysUserService sysUserService;
+
+    @Override
+    public Object pageList(ServiceUPTipParam param) {
+        LambdaQueryWrapper<ServiceUpTip> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ServiceUpTip::getType,param.getType());
+        if(StringUtils.isNotBlank(param.getVersion())){
+            wrapper.like(ServiceUpTip::getVersion,param.getVersion());
+        }
+        wrapper.orderByAsc(ServiceUpTip::getBanStatus);
+        wrapper.orderByDesc(ServiceUpTip::getVersion);
+        Page<ServiceUpTip> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> sysUserIds = page.getRecords().stream().map(ServiceUpTip::getSysUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> sysUserMap = sysUserService.getByIds(sysUserIds);
+
+        for (ServiceUpTip record : page.getRecords()) {
+            if(record.getSysUserId() != null){
+                SysUser sysUser = sysUserMap.get(record.getSysUserId());
+                if(sysUser !=null){
+                    record.setCreateName(sysUser.getNickName());
+                }
+            }
+        }
+        return PageInfo.PageInfo(page);
+    }
+
+    @Override
+    public Object getServiceUpTipByType(Integer type) {
+        LambdaQueryWrapper<ServiceUpTip> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ServiceUpTip::getType,type);
+        wrapper.eq(ServiceUpTip::getBanStatus,0);
+
+        String date = Dateutils.getDate(new Date());
+        wrapper.le(ServiceUpTip::getTipStartTime,date);
+        wrapper.ge(ServiceUpTip::getTipEndTime,date);
+        List<ServiceUpTip> list = this.list(wrapper);
+        if(list == null || list.size()<=0){
+            return null;
+        }
+        return list.get(0);
+    }
+
+    @Override
+    public void banOther(Integer type) {
+        LambdaUpdateWrapper<ServiceUpTip> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(ServiceUpTip::getType,type);
+        wrapper.eq(ServiceUpTip::getBanStatus,0);
+        wrapper.set(ServiceUpTip::getBanStatus,1);
+        this.update(wrapper);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.fdkankan.manage.vo.request;
+
+import lombok.Data;
+
+@Data
+public class ServiceUPTipParam extends RequestBase{
+
+    private String version;
+
+    private Integer type;
+}

src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/backend/4dkankan_v4/manage/logs" />
+	<property name="log.path" value="${LOG_PATH}/manage/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->

src/main/resources/mapper/manage/CameraTypeMapper.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.ICameraTypeMapper">
+
+</mapper>

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

@@ -73,6 +73,9 @@
         <if test="param.type !=null and param.type == 5">
             and s.scene_source = 4 and is_obj = 1
         </if>
+        <if test="param.type !=null and param.type == 7">
+            and s.scene_source = 5 and is_obj = 1
+        </if>
         <if test="param.companyId !=null ">
             and co.id = #{param.companyId}
         </if>

src/main/resources/mapper/manage/ServiceUpTipMapper.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.IServiceUpTipMapper">
+
+</mapper>