Merge branch 'test'

pom.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-fyun-parent</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.fdkankan</groupId>

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

@@ -16,6 +16,8 @@ public class RedisKeyUtil {
 
     public static final String ipAddress= "manage:ip_address:%s";
 
+    public static final String SCENE_VERSION = "scenejson:num:%s";
+
 
 
 }

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

@@ -9,12 +9,11 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.Case;
 import com.fdkankan.manage.service.ICaseService;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.CaseAddParam;
 import com.fdkankan.manage.vo.request.CaseParam;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -73,7 +72,7 @@ public class CaseController {
         wrapper.eq(Case::getId,id);
         wrapper.set(Case::getIsPublic,isPublic);
         if(isPublic == 1){
-            wrapper.set(Case::getPublicTime, Dateutils.getDate(new Date()));
+            wrapper.set(Case::getPublicTime, DateUtils.getDate(new Date()));
         }else {
             wrapper.set(Case::getPublicTime,null);
         }

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

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

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

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

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

@@ -15,9 +15,12 @@ import com.fdkankan.manage.vo.request.CameraParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 /**
  * 用户管理
  */
@@ -87,6 +90,17 @@ public class UserController {
         return ResultData.ok();
     }
 
+    @PostMapping("/getAddUserIncrementTime")
+    public ResultData getAddUserIncrementTime(@RequestBody UserIncrementParam param){
+        if(param.getUserId() == null || param.getIncrementTypeId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        DateTime addUserIncrementTime = userIncrementService.getAddUserIncrementTime(param);
+        HashMap<String,Long> map = new HashMap<>();
+        map.put("deadLine",addUserIncrementTime.toDate().getTime());
+        return ResultData.ok(map );
+    }
+
     /**
      * 添加下载次数
      * userId        用户id

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

@@ -0,0 +1,57 @@
+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 2024-04-17
+ */
+@Getter
+@Setter
+@TableName("mq_camera_level")
+public class MqCameraLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计算优先级设置
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 相机id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 计算优先级队列id
+     */
+    @TableField("queue_config_id")
+    private Integer queueConfigId;
+
+    @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/MqNumLevel.java

@@ -0,0 +1,57 @@
+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 2024-04-17
+ */
+@Getter
+@Setter
+@TableName("mq_num_level")
+public class MqNumLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计算优先级设置
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 计算优先级队列id
+     */
+    @TableField("queue_config_id")
+    private Integer queueConfigId;
+
+    @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/generate/AutoGenerate.java

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

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

@@ -1,6 +1,5 @@
 package com.fdkankan.manage.httpClient.param;
 
-import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.FiledUtil;
 import com.fdkankan.manage.vo.request.RequestBase;
 import jodd.util.StringUtil;

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

@@ -85,18 +85,12 @@ public class LaserService {
                 SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
                 //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
                 JSONObject obj = (JSONObject) o;
-                vo.setStatusString(getLaserStatus(vo.getStatus()));
+                vo.setStatusString(getLaserStatus(vo.getStatus(),vo.getPayStatus()));
                 vo.setStatus(toFdStatus(vo.getStatus()));
-                if(vo.getStatus() == -3){
-                    vo.setPayStatus(-1);
-                }else {
-                    vo.setPayStatus(1);
-                }
                 vo.setSceneName(obj.getString("title"));
                 vo.setUserName(obj.getString("phone"));
                 vo.setThumb(obj.getString("thumb"));
                 vo.setWebSite(obj.getString("webSite"));
-                vo.setPayStatus(1);
                 vo.setIsObj(obj.getInteger("buildObjStatus"));
                 if(vo.getStatus() == -1){  //计算失败
                     SceneBuildProcessLog sceneBuildProcessLog = sceneBuildProcessLogService.getByNum(vo.getNum());
@@ -121,6 +115,13 @@ public class LaserService {
                 List<String> numList = sceneVoList.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
                 coldStorageMap = sceneColdStorageService.getByNumList(numList);
             }
+            Set<String> snCodes = sceneVoList.parallelStream().map(SceneVo::getSnCode).collect(Collectors.toSet());
+
+            HashMap<String,User> snUserMap = userService.getUserBySn(snCodes);
+
+
+
+
             for (SceneVo sceneVo : sceneVoList) {
                 if(coldStorageMap != null){
                     SceneColdStorage sceneColdStorage = coldStorageMap.get(sceneVo.getNum());
@@ -128,6 +129,11 @@ public class LaserService {
                         sceneVo.setIsColdStorage(true);
                     }
                 }
+                User user = snUserMap.get(sceneVo.getSnCode());
+                if(user != null){
+                    sceneVo.setUserId(user.getId());
+                    sceneVo.setUserName(user.getUserName());
+                }
             }
             Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
             voPage.setRecords(sceneVoList);
@@ -240,7 +246,10 @@ public class LaserService {
         }
     }
 
-    public static String getLaserStatus(Integer status){
+    public static String getLaserStatus(Integer status,Integer payStatus){
+        if(payStatus != null && payStatus == -2){
+            return "封存";
+        }
         //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中
         switch (status){
             case -1 : return "场景已删除";

src/main/java/com/fdkankan/manage/httpClient/vo/OverallParam.java

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.httpClient.vo;
 
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.util.FiledUtil;
 import jodd.util.StringUtil;
 import lombok.Data;
@@ -63,16 +63,16 @@ public class OverallParam {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 
     public String getWorkId() {

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

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

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

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

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

@@ -9,6 +9,7 @@ import com.fdkankan.manage.vo.request.CameraParam;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -49,4 +50,6 @@ public interface ICameraService extends IService<Camera> {
     List<Camera> getLikeBySnCode(String snCode);
 
     HashMap<Long, Camera> getByIds(List<Long> cameraIds);
+
+    List<Camera> getBySnCodes(Set<String> snCodes);
 }

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

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.MqCameraLevel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-17
+ */
+public interface IMqCameraLevelService extends IService<MqCameraLevel> {
+
+    MqCameraLevel getByCameraId(Long cameraId);
+
+    void saveEntity(Long cameraId, Integer configId);
+
+    void updateLevelById(Integer id, Integer configId);
+}

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

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.MqNumLevel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-17
+ */
+public interface IMqNumLevelService extends IService<MqNumLevel> {
+
+    MqNumLevel getByNum(String num);
+
+    void saveEntity(String num, Integer configId);
+
+    void updateLevelById(Integer id, Integer configId);
+}

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

@@ -26,7 +26,6 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void lockOrUnLockBySpace(CameraDetail cameraDetail);
     void lockOrUnLockBySpace(Long cameraId);
-    void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus);
 
     List<ScenePro> getListByCameraId(Long cameraId);
 

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

@@ -4,6 +4,7 @@ import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.UserIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
+import org.joda.time.DateTime;
 
 import java.util.HashMap;
 import java.util.List;
@@ -38,4 +39,6 @@ public interface IUserIncrementService extends IService<UserIncrement> {
     void delAgentId(Integer agentId);
 
     List<UserIncrement> getByOrderSn(String orderSn);
+
+    DateTime getAddUserIncrementTime(UserIncrementParam param);
 }

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

@@ -9,6 +9,7 @@ import com.fdkankan.manage.vo.response.UserVo;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -41,4 +42,6 @@ public interface IUserService extends IService<User> {
     void updateUcenterUser(UserParam userParam);
 
     List<User> getLikeByUserName(String userName);
+
+    HashMap<String, User> getUserBySn(Set<String> snCodes);
 }

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

@@ -102,6 +102,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public List<CameraDetail> getByCameraIds(List<Long> cameraIds) {
+        if(cameraIds.isEmpty()){
+            return new ArrayList<>();
+        }
         LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(CameraDetail::getCameraId,cameraIds);
         return  this.list(wrapper);
@@ -264,7 +267,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public Boolean checkSpace(CameraDetail detailEntity, Long space) {
-        if(detailEntity.getType() == 10 || detailEntity.getType() == 11){
+        if(!"aws".equals(CacheUtil.uploadType) && (detailEntity.getType() == 10 || detailEntity.getType() == 11)){
             return true;
         }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());

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

@@ -1,31 +1,25 @@
 package com.fdkankan.manage.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.util.MD5;
 import com.fdkankan.manage.common.*;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.constant.CameraConstant;
 import com.fdkankan.manage.mapper.ICameraMapper;
-import com.fdkankan.manage.mq.param.ScenePayStatusVo;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.CameraParam;
-import com.fdkankan.manage.vo.response.CameraDataVo;
 import com.fdkankan.manage.vo.response.CameraDetailVo;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -209,7 +203,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
                 cameraDetail.setCountry(2);
                 cameraDetail.setOwn(2);
-                cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+                cameraDetail.setOutTime(DateUtils.getDate(new Date()));
             }
             cameraDetailList.add(cameraDetail);
         }
@@ -367,11 +361,11 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 throw new BusinessException(ResultCode.CAMERA_NOT_IN);
             }
             cameraDetail.setAgentId(param.getAgentId());
-            cameraDetail.setBuyDate(Dateutils.getDayDate(param.getBuyDate()));
+            cameraDetail.setBuyDate(DateUtils.getDayDate(param.getBuyDate()));
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());
-            cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+            cameraDetail.setOutTime(DateUtils.getDate(new Date()));
             cameraDetail.setUnit(CacheUtil.cameraUnit);
             if(cameraDetail.getUnit().equals("SP")){
                 cameraDetail.setTotalSpace(Long.valueOf(CacheUtil.cameraSpaceNum));
@@ -629,4 +623,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         }
         return map;
     }
+
+    @Override
+    public List<Camera> getBySnCodes(Set<String> snCodes) {
+        if(snCodes.isEmpty()){
+            return new ArrayList<>();
+        }
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(Camera::getSnCode,snCodes);
+        return this.list(wrapper);
+    }
 }

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

@@ -6,14 +6,11 @@ import com.fdkankan.manage.mapper.IDataMapper;
 import com.fdkankan.manage.service.IDataService;
 import com.fdkankan.manage.service.ISceneProService;
 import com.fdkankan.manage.service.IUserService;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.response.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.Count;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 @Service
@@ -74,12 +71,12 @@ public class DataService implements IDataService {
 
     @Override
     public List<DataGroupByCount> userTrend(Integer type,Integer dataType,String startTime,String endTime) {
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+        startTime = DateUtils.formatStartTime(startTime);
+        endTime = DateUtils.formatEndTime(endTime);
 
         List<DataGroupByCount> dataList = new ArrayList<>();
         List<DataGroupByCount> result = new ArrayList<>();
-        int rule = Dateutils.DAY;
+        int rule = DateUtils.DAY;
         String tb = "t_user";
         if(dataType == 2){
             tb = "t_login_log";
@@ -89,11 +86,11 @@ public class DataService implements IDataService {
                 dataList = dataMapper.userDataGroupBy(tb, dayFormat, startTime, endTime);
                 break;
             case 1 :
-                rule = Dateutils.WEEK;
+                rule = DateUtils.WEEK;
                 dataList = dataMapper.userDataGroupByWeek(tb,startTime,endTime);
                 break;
             case 2 :
-                rule = Dateutils.MONTH;
+                rule = DateUtils.MONTH;
                 dataList =  dataMapper.userDataGroupBy(tb,mouthFormat,startTime,endTime);
                 break;
         }
@@ -106,7 +103,7 @@ public class DataService implements IDataService {
         //查询从开始时间到结束时间为止所有天数，月份，不存在结果补零
         HashMap<String,Long> map = new HashMap<>();
         dataList.forEach(entity -> map.put(entity.getGroupKey(),entity.getCount()));
-        List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
+        List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
 
         setListData(result,map,dates,dataType,totalCount);
 
@@ -115,8 +112,8 @@ public class DataService implements IDataService {
 
     @Override
     public HashMap<String, Object> orderTrend(Integer type,Integer dataType,String startTime,String endTime) {
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+        startTime = DateUtils.formatStartTime(startTime);
+        endTime = DateUtils.formatEndTime(endTime);
 
         HashMap<String,Object> map = new HashMap<>();
         if(dataType == 1){
@@ -128,7 +125,7 @@ public class DataService implements IDataService {
         List<DataGroupByCount> incrementOrderResultList = new ArrayList<>();
         List<DataGroupByCount> downOrderResultList = new ArrayList<>();
         List<DataGroupByCount> partOrderResultList = new ArrayList<>();
-        int rule = Dateutils.DAY;
+        int rule = DateUtils.DAY;
         switch (type){
             case 0 :
                 incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",dayFormat,startTime,endTime);
@@ -136,13 +133,13 @@ public class DataService implements IDataService {
                 partOrderList = dataMapper.userDataGroupBy("t_order",dayFormat,startTime,endTime);
                 break;
             case 1 :
-                rule = Dateutils.WEEK;
+                rule = DateUtils.WEEK;
                 incrementOrderList = dataMapper.userDataGroupByWeek("t_increment_order",startTime,endTime);
                 downOrderList = dataMapper.userDataGroupByWeek("t_download_order",startTime,endTime);
                 partOrderList = dataMapper.userDataGroupByWeek("t_order",startTime,endTime);
                 break;
             case 2 :
-                rule = Dateutils.MONTH;
+                rule = DateUtils.MONTH;
                 incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",mouthFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataGroupBy("t_download_order",mouthFormat,startTime,endTime);
                 partOrderList = dataMapper.userDataGroupBy("t_order",mouthFormat,startTime,endTime);
@@ -156,7 +153,7 @@ public class DataService implements IDataService {
         downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
         partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
 
-        List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
+        List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
         for (String date : dates) {
             DataGroupByCount groupByCount = new DataGroupByCount();
             groupByCount.setGroupKey(date);
@@ -186,7 +183,7 @@ public class DataService implements IDataService {
         List<DataGroupBySum> incrementOrderResultList = new ArrayList<>();
         List<DataGroupBySum> downOrderResultList = new ArrayList<>();
         List<DataGroupBySum> partOrderResultList = new ArrayList<>();
-        int rule = Dateutils.DAY;
+        int rule = DateUtils.DAY;
         switch (type){
             case 0 :
                 incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",dayFormat,startTime,endTime);
@@ -194,13 +191,13 @@ public class DataService implements IDataService {
                 partOrderList = dataMapper.userDataSumGroupBy("t_order",dayFormat,startTime,endTime);
                 break;
             case 1 :
-                rule = Dateutils.WEEK;
+                rule = DateUtils.WEEK;
                 incrementOrderList = dataMapper.userDataSumGroupByWeek("t_increment_order",startTime,endTime);
                 downOrderList = dataMapper.userDataSumGroupByWeek("t_download_order",startTime,endTime);
                 partOrderList = dataMapper.userDataSumGroupByWeek("t_order",startTime,endTime);
                 break;
             case 2 :
-                rule = Dateutils.MONTH;
+                rule = DateUtils.MONTH;
                 incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",mouthFormat,startTime,endTime);
                 downOrderList = dataMapper.userDataSumGroupBy("t_download_order",mouthFormat,startTime,endTime);
                 partOrderList = dataMapper.userDataSumGroupBy("t_order",mouthFormat,startTime,endTime);
@@ -214,7 +211,7 @@ public class DataService implements IDataService {
         downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
         partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
 
-        List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
+        List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
         for (String date : dates) {
             DataGroupBySum groupByCount = new DataGroupBySum();
             groupByCount.setGroupKey(date);
@@ -239,8 +236,8 @@ public class DataService implements IDataService {
 
     @Override
     public HashMap<String, List<DataGroupByCount>> sceneTrend(Integer type,Integer dataType,String startTime,String endTime) {
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+        startTime = DateUtils.formatStartTime(startTime);
+        endTime = DateUtils.formatEndTime(endTime);
 
         HashMap<String,List<DataGroupByCount>> map = new HashMap<>();
         List<DataGroupByCount> kkList = new ArrayList<>();
@@ -251,7 +248,7 @@ public class DataService implements IDataService {
         List<DataGroupByCount> plusList = new ArrayList<>();
         List<DataGroupByCount> proObjList = new ArrayList<>();
         List<DataGroupByCount> plusObjList = new ArrayList<>();
-        int rule = Dateutils.DAY;
+        int rule = DateUtils.DAY;
         switch (type){
             case 0 :
                 proList = dataMapper.sceneGroupBy("t_scene_pro",dayFormat,startTime,endTime);
@@ -260,14 +257,14 @@ public class DataService implements IDataService {
                 plusObjList = dataMapper.sceneObjGroupBy("t_scene_plus",dayFormat,startTime,endTime);
                 break;
             case 1 :
-                rule = Dateutils.WEEK;
+                rule = DateUtils.WEEK;
                 proList = dataMapper.sceneGroupByWeek("t_scene_pro",startTime,endTime);
                 plusList = dataMapper.sceneGroupByWeek("t_scene_plus",startTime,endTime);
                 proObjList = dataMapper.sceneObjGroupByWeek("t_scene_pro",startTime,endTime);
                 plusObjList = dataMapper.sceneObjGroupByWeek("t_scene_plus",startTime,endTime);
                 break;
             case 2 :
-                rule = Dateutils.MONTH;
+                rule = DateUtils.MONTH;
                 proList = dataMapper.sceneGroupBy("t_scene_pro",mouthFormat,startTime,endTime);
                 plusList = dataMapper.sceneGroupBy("t_scene_plus",mouthFormat,startTime,endTime);
                 proObjList = dataMapper.sceneObjGroupBy("t_scene_pro",mouthFormat,startTime,endTime);
@@ -320,7 +317,7 @@ public class DataService implements IDataService {
             ssCount = sceneProService.getSsCount(Arrays.asList("4"),startTime);
             ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"),startTime);
         }
-        List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
+        List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
         setListData(kkList,kkMap,dates,dataType,kkCount);
         setListData(kjList,kjMap,dates,dataType,KjCount);
         setListData(ssList,ssMap,dates,dataType,ssCount);
@@ -359,25 +356,25 @@ public class DataService implements IDataService {
 
     @Override
     public HashMap<String, Object> cameraTrend(Integer type, String startTime, String endTime) {
-        startTime = Dateutils.formatStartTime(startTime);
-        endTime = Dateutils.formatEndTime(endTime);
+        startTime = DateUtils.formatStartTime(startTime);
+        endTime = DateUtils.formatEndTime(endTime);
 
         HashMap<String,Object> map = new HashMap<>();
         List<DataGroupByCount> allList = new ArrayList<>();
         List<DataGroupByCount> kkList = new ArrayList<>();
         List<DataGroupByCount> kjList = new ArrayList<>();
         List<DataGroupByCount> ssList = new ArrayList<>();
-        int rule = Dateutils.DAY;
+        int rule = DateUtils.DAY;
         switch (type){
             case 0 :
                 allList = dataMapper.sceneOutTimeGroupBy("t_camera_detail",dayFormat,startTime,endTime);
                 break;
             case 1 :
-                rule = Dateutils.WEEK;
+                rule = DateUtils.WEEK;
                 allList = dataMapper.sceneOutTimeGroupByWeek("t_camera_detail",startTime,endTime);
                 break;
             case 2 :
-                rule = Dateutils.MONTH;
+                rule = DateUtils.MONTH;
                 allList = dataMapper.sceneOutTimeGroupBy("t_camera_detail",mouthFormat,startTime,endTime);
                 break;
         }
@@ -395,7 +392,7 @@ public class DataService implements IDataService {
                 kkMap.merge(dataGroupByCount.getGroupKey(),dataGroupByCount.getCount(), Long:: sum);
             }
         }
-        List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
+        List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
         setListData(kkList,kkMap,dates);
         setListData(kjList,kjMap,dates);
         setListData(ssList,ssMap,dates);

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.manage.common.DownloadStatusEnum;
@@ -102,11 +103,18 @@ public class DownService implements IDownService {
             version = proEdit.getVersion();
         }
         if(scenePro == null && scenePlus !=null){
-            SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-            if(sceneEditInfo == null){
-                throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+            String redisKey = String.format(RedisKeyUtil.SCENE_VERSION,scenePlus.getNum());
+            if(!redisUtil.hasKey(redisKey) || StringUtils.isBlank(redisUtil.get(redisKey))){
+                SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+                if(sceneEditInfo == null){
+                    throw new com.fdkankan.common.exception.BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
+                }
+                version = sceneEditInfo.getVersion();
+            }else {
+                String redisObj = redisUtil.get(redisKey);
+                JSONObject obj = JSONObject.parseObject(redisObj);
+                version = obj.getInteger("version");
             }
-            version = sceneEditInfo.getVersion();
         }
         return version;
     }

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

@@ -1,14 +1,11 @@
 package com.fdkankan.manage.service.impl;
-import java.math.BigDecimal;
-import java.util.Date;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.fdkankan.manage.entity.DownloadOrder;
 import com.fdkankan.manage.entity.DownloadOrderMg;
 import com.fdkankan.manage.mapper.IDownloadOrderMgMapper;
 import com.fdkankan.manage.service.IDownloadOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +24,7 @@ public class DownloadOrderMgServiceImpl extends ServiceImpl<IDownloadOrderMgMapp
     public DownloadOrderMg addOrder(UserIncrementParam param) {
         DownloadOrderMg downloadOrder = new DownloadOrderMg();
         BeanUtil.copyProperties(param,downloadOrder);
-        downloadOrder.setOrderSn(Dateutils.getOrderSn());
+        downloadOrder.setOrderSn(DateUtils.getOrderSn());
         downloadOrder.setPayStatus(1);
         this.save(downloadOrder);
         return downloadOrder;

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

@@ -6,13 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.CacheUtil;
-import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.DownloadOrder;
-import com.fdkankan.manage.entity.ScenePlus;
-import com.fdkankan.manage.entity.ScenePro;
 import com.fdkankan.manage.mapper.IDownloadOrderMapper;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.OrderParam;
 import com.fdkankan.manage.vo.response.DownOrderVo;
 import org.apache.commons.lang3.StringUtils;
@@ -66,7 +63,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
             }
             String tradeTime = record.getTradeTime();
             if(record.getTimeZoneOff() != null){
-                tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
+                tradeTime = DateUtils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
             }
             if(StringUtils.isNotBlank(record.getSnCode())){
                 record.setDownTypeStr(snCodeMap.get(record.getSnCode()));

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

@@ -1,6 +1,4 @@
 package com.fdkankan.manage.service.impl;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -10,7 +8,7 @@ import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.mapper.IIncrementOrderMgMapper;
 import com.fdkankan.manage.service.IIncrementOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -32,7 +30,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
         BeanUtil.copyProperties(param,incrementOrderMg);
         incrementOrderMg.setId(null);
         incrementOrderMg.setIncrementId(param.getId());
-        incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
+        incrementOrderMg.setOrderSn(DateUtils.getOrderSn());
         incrementOrderMg.setPayStatus(1);
         incrementOrderMg.setIncrementType(incrementType.getId());
         if(incrementType.getValidTimeType() == 0){

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

@@ -14,7 +14,7 @@ import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IIncrementOrderService;
 import com.fdkankan.manage.service.IUserIncrementService;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.OrderParam;
 import com.fdkankan.manage.vo.response.IncrementOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         for (IncrementOrderVo record : page.getRecords()) {
             String tradeTime = record.getTradeTime();
             if(record.getTimeZoneOff() != null){
-                tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
+                tradeTime = DateUtils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
             }
             record.setCreateTime(tradeTime);
             UserIncrement userIncrement = null;
@@ -68,8 +68,8 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
                 }
             }
             if(userIncrement != null){
-                record.setIncrementStartTime(Dateutils.getDate(userIncrement.getIncrementStartTime()));
-                record.setIncrementEndTime(Dateutils.getDate(userIncrement.getIncrementEndTime()));
+                record.setIncrementStartTime(DateUtils.getDate(userIncrement.getIncrementStartTime()));
+                record.setIncrementEndTime(DateUtils.getDate(userIncrement.getIncrementEndTime()));
                 Camera camera = cameraService.getById(userIncrement.getCameraId());
                 if(camera!=null){
                     record.setSnCode(camera.getSnCode());

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

@@ -13,7 +13,7 @@ import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
@@ -23,9 +23,6 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Strings;
-import com.google.common.primitives.Ints;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -104,7 +101,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
             invoiceRegister.setCreaterId(userId);
         }else{
             invoiceRegister.setUpdaterId(userId);
-            invoiceRegister.setUpdateTime(Dateutils.getDate(new Date()));
+            invoiceRegister.setUpdateTime(DateUtils.getDate(new Date()));
         }
         //普通发票
         if(InvoiceType.ORDINARY.code().equals(type)){

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

@@ -0,0 +1,44 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.manage.entity.MqCameraLevel;
+import com.fdkankan.manage.mapper.IMqCameraLevelMapper;
+import com.fdkankan.manage.service.IMqCameraLevelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-17
+ */
+@Service
+public class MqCameraLevelServiceImpl extends ServiceImpl<IMqCameraLevelMapper, MqCameraLevel> implements IMqCameraLevelService {
+
+    @Override
+    public MqCameraLevel getByCameraId(Long cameraId) {
+        LambdaQueryWrapper<MqCameraLevel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqCameraLevel::getCameraId,cameraId);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public void saveEntity(Long cameraId, Integer configId) {
+        MqCameraLevel cameraLevel = new MqCameraLevel();
+        cameraLevel.setCameraId(cameraId);
+        cameraLevel.setQueueConfigId(configId);
+        this.save(cameraLevel);
+    }
+
+    @Override
+    public void updateLevelById(Integer id, Integer configId) {
+        LambdaUpdateWrapper<MqCameraLevel> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(MqCameraLevel::getId,id);
+        wrapper.set(MqCameraLevel::getQueueConfigId,configId);
+        this.update(wrapper);
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.manage.entity.MqCameraLevel;
+import com.fdkankan.manage.entity.MqNumLevel;
+import com.fdkankan.manage.mapper.IMqNumLevelMapper;
+import com.fdkankan.manage.service.IMqNumLevelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-17
+ */
+@Service
+public class MqNumLevelServiceImpl extends ServiceImpl<IMqNumLevelMapper, MqNumLevel> implements IMqNumLevelService {
+
+    @Override
+    public MqNumLevel getByNum(String num) {
+        LambdaQueryWrapper<MqNumLevel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqNumLevel::getNum,num);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public void saveEntity(String num, Integer configId) {
+        MqNumLevel mqNumLevel = new MqNumLevel();
+        mqNumLevel.setNum(num);
+        mqNumLevel.setQueueConfigId(configId);
+        this.save(mqNumLevel);
+    }
+
+    @Override
+    public void updateLevelById(Integer id, Integer configId) {
+        LambdaUpdateWrapper<MqNumLevel> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(MqNumLevel::getId,id);
+        wrapper.set(MqNumLevel::getQueueConfigId,configId);
+        this.update(wrapper);
+    }
+}

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.manage.common.PageInfo;
-import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.mapper.INewsMapper;
 import com.fdkankan.manage.service.INewsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.BaseParamVO;
 import com.fdkankan.manage.vo.NewsDisplayParamVO;
 import com.fdkankan.manage.vo.NewsPublicParamVO;
@@ -112,7 +110,7 @@ public class NewsServiceImpl extends ServiceImpl<INewsMapper, News> implements I
     @Override
     public ResultData updateNews(Long userId, UpdateNewsParamVO param) {
         News news = BeanUtil.copyProperties(param, News.class);
-        news.setUpdateTime(Dateutils.getDate(new Date()));
+        news.setUpdateTime(DateUtils.getDate(new Date()));
         news.setUpdaterId(userId);
         this.updateById(news);
         return ResultData.ok();

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

@@ -1,15 +1,13 @@
 package com.fdkankan.manage.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fdkankan.manage.entity.OperLog;
 import com.fdkankan.manage.service.OperLogService;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.OperLogPageParamVO;
 import com.fdkankan.mongodb.base.MongoPageResult;
 import com.fdkankan.mongodb.service.impl.MongodbBaseServiceImpl;
-import java.util.ArrayList;
-import java.util.List;
+
 import java.util.Objects;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -37,7 +35,7 @@ public class OperLogServiceImpl extends MongodbBaseServiceImpl<OperLog> implemen
             query.addCriteria(Criteria.where("userName").regex(param.getUserName()));
         }
         if(Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
-            query.addCriteria (Criteria.where("createTime").gte(Dateutils.getDate(param.getStartTime())).lte(Dateutils.getDate(param.getEndTime())));
+            query.addCriteria (Criteria.where("createTime").gte(DateUtils.getDate(param.getStartTime())).lte(DateUtils.getDate(param.getEndTime())));
         }
         //默认按操作时间降序排序
         param.setOrderBy("createTime");

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

@@ -2,14 +2,10 @@ package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.codec.Caesar;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.amazonaws.services.s3.AmazonS3;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,10 +23,8 @@ import com.fdkankan.manage.mq.common.MqQueueUtil;
 import com.fdkankan.manage.mq.param.ScenePayStatusVo;
 import com.fdkankan.manage.mq.param.SceneRestStoreVo;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.thread.ThreadService;
 import com.fdkankan.manage.util.CameraUtils;
-import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.manage.util.ProvinceUtils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.util.SceneStatusUtil;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.response.*;
@@ -39,14 +33,9 @@ import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
-import java.io.File;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -161,7 +150,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      */
     @Override
     public void lockOrUnLockBySpace(CameraDetail cameraDetail) {
-        if(cameraDetail == null || cameraDetail.getType() ==10 || cameraDetail.getType() == 11){
+        if(cameraDetail == null ){
+            return;
+        }
+        if(!"aws".equals(CacheUtil.uploadType) && ( cameraDetail.getType() ==10 || cameraDetail.getType() == 11)){
             return;
         }
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraDetail.getCameraId());
@@ -175,14 +167,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.lockOrUnLockBySpace(cameraDetail);
     }
 
-    @Override
-    public void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus) {
-        Long sceneId = scenePro == null ? scenePlus.getId() : scenePro.getId();
-        ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(sceneId,payStatus);
-        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
-        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
-    }
-
 
     /**
      * 从oss中获取文件，并重写,上传替换
@@ -338,7 +322,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         cameraDetailService.initSpace(cameraDetail.getCameraId());
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail, space);
         //深时场景无限容量
-        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && !checkSpace){
+        if( !checkSpace){
             throw new BusinessException(ResultCode.CAMERA_SPACE_ERROR);
         }
 
@@ -366,15 +350,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
 //        }
 
-        if((cameraDetail.getType() == 10 || cameraDetail.getType() == 11) && status ==-2) {       //深时场景
-            //迁移深时 dataSource
-            File file = new File(dataSource + "_laserData");
-            if (!file.exists()) {
-                log.info("迁移失败--dataSource:{}，sceneNum:{},toSnCode:{}",dataSource + "_laserData",param.getNum(),param.getSnCode());
-                throw new BusinessException(ResultCode.MOVE_ERROR);
-            }
-        }
-
         Long oldUseSpace = oldCameraDetail.getUsedSpace() - space < 0 ? 0 : oldCameraDetail.getUsedSpace() - space;
         if("GB".equals(oldCameraDetail.getUnit())){
             oldUseSpace = 1L;
@@ -415,10 +390,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         cameraDetailService.initSpace(oldCameraDetail);
         cameraDetailService.initSpace(cameraDetail);
 
-        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+        if(!"aws".equals(CacheUtil.uploadType) && oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+            this.lockOrUnLockBySpace(oldCameraDetail.getCameraId());
+        }
+        if(!"aws".equals(CacheUtil.uploadType) && cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
+            this.lockOrUnLockBySpace(cameraDetail.getCameraId());
+        }
+
+        if("aws".equals(CacheUtil.uploadType) && subSpace >0){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(oldCameraDetail.getCameraId());
         }
-        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
+        if("aws".equals(CacheUtil.uploadType)){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(cameraDetail.getCameraId());
         }
         sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);
@@ -759,7 +741,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             Integer code = jsonObject.getInteger("code");
             if(code != 0){
                 log.error("场景重算失败：{},{}",num,jsonObject);
-                throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
+                throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR.code(), jsonObject.getString("msg"));
             }
         }catch (Exception e){
             throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
@@ -796,8 +778,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void restStoreSuccess(String num) {
         Integer sceneResource = null;
         ScenePro scenePro = this.getByNum(num);
-        Date time = Dateutils.dateAddOneMonth(new Date(),-11);
-        String date = Dateutils.getDate(time);
+        Date time = DateUtils.dateAddOneMonth(new Date(),-11);
+        String date = DateUtils.getDate(time);
         if(scenePro!=null ){
             sceneResource = scenePro.getSceneSource();
             LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();

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

@@ -12,7 +12,7 @@ import com.fdkankan.manage.service.ISceneCooperationService;
 import com.fdkankan.manage.service.ISceneResourceCameraService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.ISceneResourceCooperationService;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -64,8 +63,8 @@ public class SceneResourceCameraServiceImpl extends ServiceImpl<ISceneResourceCa
                 sceneCooperationEntity.setUserId(cameraDetail.getCooperationUser());
                 sceneCooperationEntity.setSceneNum(num);
                 sceneCooperationEntity.setRecStatus("A");
-                sceneCooperationEntity.setCreateTime(Dateutils.getDate(new Date()));
-                sceneCooperationEntity.setUpdateTime(Dateutils.getDate(new Date()));
+                sceneCooperationEntity.setCreateTime(DateUtils.getDate(new Date()));
+                sceneCooperationEntity.setUpdateTime(DateUtils.getDate(new Date()));
                 sceneCooperationService.save(sceneCooperationEntity);
                 redisUtil.hset(RedisKeyUtil.SCENE_COOPERATION_NUM_USERID, sceneCooperationEntity.getSceneNum(), sceneCooperationEntity.getUserId() + "");
 
@@ -76,8 +75,8 @@ public class SceneResourceCameraServiceImpl extends ServiceImpl<ISceneResourceCa
                     sceneResourceCooperation.setSceneResourceId(resourceId);
                     sceneResourceCooperation.setSceneCooperationId(sceneCooperationEntity.getId());
                     sceneResourceCooperation.setRecStatus("A");
-                    sceneResourceCooperation.setCreateTime(Dateutils.getDate(new Date()));
-                    sceneResourceCooperation.setUpdateTime(Dateutils.getDate(new Date()));
+                    sceneResourceCooperation.setCreateTime(DateUtils.getDate(new Date()));
+                    sceneResourceCooperation.setUpdateTime(DateUtils.getDate(new Date()));
                     resourceCooperationList.add(sceneResourceCooperation);
                 }
                 if(resourceCooperationList.size() >0){

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

@@ -10,7 +10,7 @@ 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.util.DateUtils;
 import com.fdkankan.manage.vo.request.ServiceUPTipParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, Se
         wrapper.eq(ServiceUpTip::getType,type);
         wrapper.eq(ServiceUpTip::getBanStatus,0);
 
-        String date = Dateutils.getDate(new Date());
+        String date = DateUtils.getDate(new Date());
         wrapper.le(ServiceUpTip::getTipStartTime,date);
         wrapper.ge(ServiceUpTip::getTipEndTime,date);
         List<ServiceUpTip> list = this.list(wrapper);

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

@@ -15,7 +15,6 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysUserService;
-import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.mapper.ISpaceSdkMapper;
 import com.fdkankan.manage.service.ISpaceSdkService;
@@ -29,11 +28,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 

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

@@ -13,10 +13,11 @@ import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.mapper.IUserIncrementMapper;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.response.GroupByCount;
 import com.fdkankan.manage.vo.response.UserIncrementVo;
+import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -136,7 +137,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         String incrementEndTime = userIncrement.getIncrementEndTime();
         if(userIncrement.getIsExpired() == 1){
-            incrementEndTime = Dateutils.getDate(new Date());
+            incrementEndTime = DateUtils.getDate(new Date());
         }
         userIncrement.setIsExpired(0);
         Date date = DateUtil.string2Date(incrementEndTime, DateUtil.DEFAULT_DATE_FORMAT);
@@ -185,6 +186,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
         IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.addOrder(param, incrementType);
 
+
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
@@ -199,6 +201,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
                 userIncrement.setIncrementStartTime(date);
                 userIncrement.setCreateTime(date);
                 userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
+            }else {
+                DateTime dateTime = this.getDateTime(incrementType, param.getId(), param.getCount());
+                userIncrement.setIncrementEndTime(DateUtil.date2String(dateTime.toDate(),"yyyy-MM-dd HH:mm:ss"));
             }
             if(incrementType.getValidTimeType() == 0){
                 userIncrement.setMemberLevels("PR");
@@ -234,6 +239,24 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
     }
 
+    @Override
+    public DateTime getAddUserIncrementTime(UserIncrementParam param) {
+        IncrementType incrementType = incrementTypeService.getById(param.getIncrementTypeId());
+        return this.getDateTime(incrementType,param.getId(),param.getCount());
+    }
+
+
+    @Autowired
+    IUserIncrementService userIncrementService;
+
+    public DateTime getDateTime(IncrementType incrementType, Long userIncrementId,Integer count) {
+        Date userTime = new Date();
+        if(userIncrementId != null){
+            UserIncrement userIncrement = userIncrementService.getById(userIncrementId);
+            userTime = DateUtils.getDate(userIncrement.getIncrementEndTime());
+        }
+        return  DateUtils.getDateTime(userTime, incrementType,count);
+    }
 
     @Override
     public void unbindCamera(Long cameraId) {

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

@@ -11,16 +11,13 @@ import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.OssPath;
 import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.entity.CameraDetail;
-import com.fdkankan.manage.entity.SysUser;
-import com.fdkankan.manage.entity.UserIncrement;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
-import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.IUserMapper;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
@@ -47,6 +44,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Autowired
     private IUserIncrementService userIncrementService;
     @Autowired
+    private ICameraService cameraService;
+    @Autowired
     private ICameraDetailService cameraDetailService;
     @Autowired
     private ISceneService sceneService;
@@ -167,10 +166,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public HashMap<Long, User> getByIds(List<Long> userIds) {
+        HashMap<Long,User> map = new HashMap<>();
+        if(userIds.isEmpty()){
+            return map;
+        }
         LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(User::getId,userIds);
         List<User> list = this.list(wrapper);
-        HashMap<Long,User> map = new HashMap<>();
         list.forEach(entity -> map.put(entity.getId(),entity));
         return map;
     }
@@ -207,15 +209,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             user.setPassword(passwordMd5);
             user.setStatus(1);
             user.setIsNotice(1);
-            user.setRegisterTime(Dateutils.getDate(new Date()));
+            user.setRegisterTime(DateUtils.getDate(new Date()));
             user.setUserName(param.getUserName());
             user.setNickName(param.getNickName());
             user.setCountry("86");
             user.setDownloadNumTotal(1000);
             user.setDownloadNum(0);
-            user.setCreateTime(Dateutils.getDate(new Date()));
+            user.setCreateTime(DateUtils.getDate(new Date()));
             user.setRecStatus("A");
-            user.setUpdateTime(Dateutils.getDate(new Date()));
+            user.setUpdateTime(DateUtils.getDate(new Date()));
             user.setSysUserId(Long.valueOf((String) StpUtil.getLoginId()));
             this.save(user);
 
@@ -274,4 +276,28 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         wrapper.like(User::getUserName,userName);
         return this.list(wrapper);
     }
+
+    @Override
+    public HashMap<String, User> getUserBySn(Set<String> snCodes) {
+        HashMap<Long,User> map = new HashMap<>();
+        HashMap<String,User> mapUser = new HashMap<>();
+        List<Camera> cameraList = cameraService.getBySnCodes(snCodes);
+        List<Long> cameraIds = cameraList.parallelStream().map(Camera::getId).collect(Collectors.toList());
+        List<CameraDetail> cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
+        List<Long> userIds = cameraDetails.parallelStream().map(CameraDetail::getUserId).collect(Collectors.toList());
+        HashMap<Long, User> useMap  = this.getByIds(userIds);
+
+        for (CameraDetail cameraDetail : cameraDetails) {
+            if(cameraDetail.getUserId() != null){
+                User user = useMap.get(cameraDetail.getUserId());
+                if(user != null){
+                    map.put(cameraDetail.getCameraId(),user);
+                }
+            }
+        }
+
+        cameraList.forEach(e -> mapUser.put(e.getSnCode(),map.get(e.getId())));
+
+        return mapUser;
+    }
 }

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

@@ -1,4 +1,5 @@
 package com.fdkankan.manage.test;
+import com.fdkankan.manage.vo.request.ModelingLevelParam;
 import com.google.common.collect.Lists;
 
 import com.alibaba.fastjson.JSONObject;
@@ -18,16 +19,14 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
-import static com.amazonaws.util.CredentialUtils.getCredentialsProvider;
-import static com.fdkankan.manage.util.RsaUtils.getKeyPair;
 
 @Slf4j
 @RestController
@@ -227,19 +226,33 @@ public class TestController {
         return ResultData.ok();
     }
 
-    public static void main(String[] args) {
-        List<Integer> list1 = new ArrayList<>();
-
-        List<Integer> list2 = new ArrayList<>();
-        list2.add(3);
-        list2.add(4);
-        list2.add(5);
-        list2.add(6);
+    @Autowired
+    IMqCameraLevelService mqCameraLevelService;
+    @Autowired
+    IMqNumLevelService mqNumLevelService;
 
-        List<Integer> intersection = list1.stream()
-                .filter(list2::contains)
-                .collect(Collectors.toList());
+    @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());
+            if(mqNumLevel == null){
+                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId());
+            }else {
+                mqNumLevelService.updateLevelById(mqNumLevel.getId(),param.getConfigId());
+            }
+        }
 
-        System.out.println("交集：" + intersection);
+        return ResultData.ok();
     }
 }

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -1,14 +1,13 @@
 package com.fdkankan.manage.util;
 
+import com.fdkankan.manage.entity.IncrementType;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
-public class Dateutils {
+public class DateUtils {
 
     public static int  DAY =  Calendar.DAY_OF_MONTH;
     public static int  WEEK =  Calendar.WEEK_OF_MONTH;
@@ -128,7 +127,7 @@ public class Dateutils {
 
     public static String formatStartTime(String startTime) {
         if(StringUtils.isBlank(startTime)){
-            startTime = Dateutils.getHalfYearStr();
+            startTime = DateUtils.getHalfYearStr();
         }
         if(startTime.length() <12){  //月，开始时间到1号 0点
             startTime +=  " 00:00:00";
@@ -137,7 +136,7 @@ public class Dateutils {
     }
     public static String formatEndTime(String endTime) {
         if(StringUtils.isBlank(endTime)){
-            endTime = Dateutils.getDate(new Date());
+            endTime = DateUtils.getDate(new Date());
         }
         if(endTime.length() <12 ){  //月，开始时间到1号 0点
             endTime +=  " 23:59:59";
@@ -225,4 +224,20 @@ public class Dateutils {
         return date;
 
     }
+
+    public static DateTime getDateTime(Date userTime, IncrementType incrementType, Integer count) {
+        DateTime dateTime = new DateTime();
+        if(userTime.getTime() >new Date().getTime()){
+            dateTime = new DateTime(userTime);
+        }
+        if(count == null){
+            count = 1;
+        }
+        switch (incrementType.getValidTimeType()){
+            case 0 : return dateTime.plusYears(incrementType.getValidTime() * count);
+            case 1 : return dateTime.plusMonths(incrementType.getValidTime() * count);
+            case 2 : return dateTime.plusDays(incrementType.getValidTime() * count);
+            default: return dateTime;
+        }
+    }
 }

src/main/java/com/fdkankan/manage/vo/InvoicePageParamVO.java

@@ -1,13 +1,8 @@
 package com.fdkankan.manage.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.common.PageInfo;
-import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.mongodb.base.BaseRequestMongo;
-import java.util.Date;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -31,21 +26,21 @@ public class InvoicePageParamVO extends RequestBase {
     private String payTimeEnd;
 
     public String getInvoiceTimeStart() {
-        return Dateutils.getStartTime(invoiceTimeStart) ;
+        return DateUtils.getStartTime(invoiceTimeStart) ;
     }
 
 
     public String getInvoiceTimeEnd() {
-        return Dateutils.getEndTime(invoiceTimeEnd);
+        return DateUtils.getEndTime(invoiceTimeEnd);
     }
 
 
     public String getPayTimeStart() {
-        return Dateutils.getStartTime(payTimeStart) ;
+        return DateUtils.getStartTime(payTimeStart) ;
     }
 
 
     public String getPayTimeEnd() {
-        return Dateutils.getEndTime(payTimeEnd);
+        return DateUtils.getEndTime(payTimeEnd);
     }
 }

src/main/java/com/fdkankan/manage/vo/OperLogPageParamVO.java

@@ -1,12 +1,8 @@
 package com.fdkankan.manage.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.mongodb.base.BaseRequestMongo;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Date;
 
 /**
  * <p>
@@ -30,12 +26,12 @@ public class OperLogPageParamVO extends BaseRequestMongo {
     private String operationType = "manage";
 
     public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
 
     public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 
 }

src/main/java/com/fdkankan/manage/vo/PageNewsParamVO.java

@@ -1,10 +1,8 @@
 package com.fdkankan.manage.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.vo.request.RequestBase;
-import java.util.Date;
 
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 /**
@@ -27,10 +25,10 @@ public class PageNewsParamVO extends RequestBase {
     private String language = "cn";
 
     public String getPublicTimeStart() {
-        return Dateutils.getStartTime(publicTimeStart);
+        return DateUtils.getStartTime(publicTimeStart);
     }
 
     public String getPublicTimeEnd() {
-        return Dateutils.getEndTime(publicTimeEnd);
+        return DateUtils.getEndTime(publicTimeEnd);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 @Data
@@ -12,10 +11,10 @@ public class AgentAuditListParam  extends RequestBase {
     private Integer handleState = 0;        //0 待处理，1已处理
 
     public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -16,15 +15,15 @@ public class AgentNewLogParam extends RequestBase {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -30,15 +29,15 @@ public class CameraParam extends RequestBase {
 
     public String getActivatedStartTime() {
         if(activatedTime != null && activatedTime.size() >1){
-            return Dateutils.getStartTime(activatedTime.get(0));
+            return DateUtils.getStartTime(activatedTime.get(0));
         }
-        return Dateutils.getStartTime(activatedStartTime);
+        return DateUtils.getStartTime(activatedStartTime);
     }
 
     public String getActivatedEndTime() {
         if(activatedTime != null && activatedTime.size() >1){
-            return Dateutils.getEndTime(activatedTime.get(1));
+            return DateUtils.getEndTime(activatedTime.get(1));
         }
-        return Dateutils.getEndTime(activatedEndTime);
+        return DateUtils.getEndTime(activatedEndTime);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -19,15 +18,15 @@ public class CaseParam extends RequestBase {
 
     public String getStartTime() {
         if(publicTime != null && publicTime.size() >1){
-            return Dateutils.getStartTime(publicTime.get(0));
+            return DateUtils.getStartTime(publicTime.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(publicTime != null && publicTime.size() >1){
-            return Dateutils.getEndTime(publicTime.get(1));
+            return DateUtils.getEndTime(publicTime.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

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

@@ -1,7 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 @Data
@@ -16,11 +15,11 @@ public class IntercomMessageParam extends RequestBase {
 
 
     public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 
 }

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

@@ -0,0 +1,10 @@
+package com.fdkankan.manage.vo.request;
+
+import lombok.Data;
+
+@Data
+public class ModelingLevelParam {
+    private Long cameraId;
+    private String num;
+    private Integer configId;
+}

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

@@ -1,8 +1,7 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fdkankan.manage.vo.request.RequestBase;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -23,10 +22,10 @@ public class OrderParam extends RequestBase {
     private BigDecimal amount;      //订单金额
 
     public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

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

@@ -1,14 +1,10 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import com.fdkankan.manage.util.FiledUtil;
-import com.fdkankan.manage.vo.request.RequestBase;
 import jodd.util.StringUtil;
 import lombok.Data;
-import org.springframework.web.bind.annotation.GetMapping;
 
-import java.security.GeneralSecurityException;
 import java.util.List;
 @Data
 public class SceneParam extends RequestBase {
@@ -35,16 +31,16 @@ public class SceneParam extends RequestBase {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 
     public String getField() {

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

@@ -1,10 +1,8 @@
 package com.fdkankan.manage.vo.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fdkankan.manage.constant.CameraOutTypeEnum;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 
@@ -35,8 +33,8 @@ public class CameraDetailVo {
         if(buyDate ==null){
             return null;
         }
-        Date date = Dateutils.dateAddOneYear(buyDate, 1);
-        date = Dateutils.dateAddOne(date, 7);
-        return Dateutils.getDayDate(date) +" 23:59:59";
+        Date date = DateUtils.dateAddOneYear(buyDate, 1);
+        date = DateUtils.dateAddOne(date, 7);
+        return DateUtils.getDayDate(date) +" 23:59:59";
     }
 }

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

@@ -3,12 +3,8 @@ package com.fdkankan.manage.vo.response;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fdkankan.manage.common.typehandle.JsonArrayTypeHandler;
 import com.fdkankan.manage.entity.FeedbackOption;
-import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -185,7 +181,7 @@ public class FeedbackVo {
 
     public String getCreateTimeStr() {
         if(createTime != null){
-            return Dateutils.getDate(createTime);
+            return DateUtils.getDate(createTime);
         }
         return createTimeStr;
     }

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

@@ -2,12 +2,9 @@ package com.fdkankan.manage.vo.response;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.fdkankan.manage.util.Dateutils;
-import jdk.nashorn.internal.ir.annotations.Ignore;
+import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.omg.CORBA.INTERNAL;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -163,7 +160,7 @@ public class IncrementOrderVo {
         if(incrementStartTime==null || incrementEndTime == null){
             return "";
         }
-        return Dateutils.getDayDate(incrementStartTime) +"~" + Dateutils.getDayDate(incrementEndTime);
+        return DateUtils.getDayDate(incrementStartTime) +"~" + DateUtils.getDayDate(incrementEndTime);
     }
 
     public String getMemberLevels() {

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

@@ -18,7 +18,7 @@ public class SceneVo {
     private Integer status;         //状态
     private Integer buildObjStatus = 1;         //生成OBJ状态,0，未生成 1完成，2计算中
     private String statusString;    //中文状态
-    private Integer payStatus;      //
+    private Integer payStatus =1;      //
     private String sceneVersion;   //场景版本
 
     private String thumb;        //封面图

src/main/resources/bootstrap-test.yml

@@ -4,7 +4,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 120.24.144.164:8848
+        server-addr: 172.18.156.39:8848
         file-extension: yaml
         namespace: 4dkankan-v4-test
         extension-configs:

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

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