Merge branch 'test'

README.md

@@ -1 +1,32 @@
-v1.0.0
+#**管理后台**
+
+###**v1.0.0** 
+~~~~
+1.数据看板
+2.埋点统计
+3.官网运营管理
+4.订单管理
+5.发票管理
+6.产品运营管理
+7.客户管理
+8.官网用户管理
+9.设备管理
+10.产品管理
+11.系统管理
+12.操作日志
+~~~~
+
+###**v1.1.0** 
+~~~~
+1.添加经销商管理
+    agentNew ,agentNewLog
+2.设备列表 /service/manage/camera/list
+    添加参数   agentName 模糊查询
+    添加返回值 agentName
+3.相机出库 /service/manage/camera/out
+    添加参数 agentId
+4.相机出库信息编辑 /service/manage/camera/update
+    添加参数 agentId
+5.出库模板 
+    添加经销商名称导入
+~~~~

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.fdkankan.manage</groupId>
   <artifactId>4dkankan-center-manage</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -20,20 +20,30 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <artifactId>4dkankan-utils-fyun-oss</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fdkankan</groupId>
+      <artifactId>4dkankan-utils-fyun-local</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fdkankan</groupId>
+      <artifactId>4dkankan-utils-fyun-s3</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-redis</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-mongodb</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
 
@@ -167,5 +177,4 @@
 
   </build>
 
-
 </project>

src/main/java/com/fdkankan/manage/ManageApplication.java

@@ -1,7 +1,9 @@
 package com.fdkankan.manage;
 
-import com.dtflys.forest.springboot.annotation.ForestScan;
+import com.fdkankan.manage.common.CacheUtil;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -15,10 +17,18 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})
 @MapperScan("com.fdkankan.**.mapper")
-public class ManageApplication {
+public class ManageApplication implements CommandLineRunner {
+
+    @Value("${fyun.type}")
+    private String uploadType;
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
     }
 
+    @Override
+    public void run(String... args) throws Exception {
+        CacheUtil.uploadType = uploadType;
+
+    }
 }

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

@@ -5,6 +5,8 @@ import com.fdkankan.manage.vo.request.OrderParam;
 
 public class CacheUtil {
 
+    public static String uploadType;
     public static OrderParam orderParam = new OrderParam();
     public static AgentNewLogParam agentParam = new AgentNewLogParam();
+
 }

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

@@ -7,5 +7,4 @@ public class FilePath {
 
     public static String appOssPath = "apps/customApp/";
 
-
 }

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

@@ -1,9 +1,13 @@
 package com.fdkankan.manage.common;
 
 public class OssPath {
-    public static String invoiceOssDir = "manage/invoice/";
+    public final static String MANAGE_FILE_PATH = "manage/file/%s/%s";
+    public final static String invoiceOssDir = "manage/invoice/";
     public final static String v3_statusPath = "data/data%s/status.json";
     public final static String v4_statusPath = "scene_view_data/%s/data/status.json";
     public final static String localStatusPath = System.getProperty("java.io.tmpdir") +"status.json";   //获取临时文件目录
 
+    public final static String default_head ="manage/user/newHead.png";
+
+
 }

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

@@ -0,0 +1,51 @@
+package com.fdkankan.manage.common;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.vo.response.SceneVo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageInfo<T> {
+
+    private long pageNum;
+
+    private long pageSize;
+
+    private long total;
+
+    private T list;
+
+    public static PageInfo PageInfo(Page page){
+        return PageInfo.builder()
+            .pageNum(page.getCurrent())
+            .pageSize(page.getSize())
+            .total(page.getTotal())
+            .list(page.getRecords())
+            .build();
+    }
+    public static PageInfo PageInfo(Long currentPage, Long pageSize, Long total, List<?> list){
+        return PageInfo.builder()
+            .pageNum(currentPage)
+            .pageSize(pageSize)
+            .total(total)
+            .list(list)
+            .build();
+    }
+
+
+    public static PageInfo PageInfoEmpty(Integer pageNum,Integer pageSize) {
+        Page<Object> voPage = new Page<>(pageNum,pageSize);
+        voPage.setRecords(new ArrayList<>());
+        voPage.setTotal(0);
+        return PageInfo.PageInfo(voPage);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.fdkankan.manage.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 通用返回类
+ *
+ * @author
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Result<T> implements Serializable {
+    private static final long serialVersionUID = -1491499610244557029L;
+    public static final String SUCCESS_MSG = "操作成功";
+    public static int CODE_SUCCESS = 0;
+    public static int CODE_FAILURE = -1;
+    public static String[] NOOP = new String[]{};
+
+    /**
+     * 处理状态：0: 成功, 1: 失败
+     */
+    private int code;
+    /**
+     * 消息
+     */
+    private String msg;
+    /**
+     * 返回数据
+     */
+    private T data;
+    /**
+     * 处理成功，并返回数据
+     *
+     * @param data 数据对象
+     * @return data
+     */
+    public static Result success(Object data) {
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, data);
+    }
+    /**
+     * 处理成功
+     *
+     * @return data
+     */
+    public static Result success() {
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, NOOP);
+    }
+    /**
+     * 处理成功
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public static Result success(String msg) {
+        return new Result(CODE_SUCCESS, msg, NOOP);
+    }
+    /**
+     * 处理成功
+     *
+     * @param msg  消息
+     * @param data 数据对象
+     * @return data
+     */
+    public static Result success(String msg, Object data) {
+        return new Result(CODE_SUCCESS, msg, data);
+    }
+    /**
+     * 处理失败，并返回数据（一般为错误信息）
+     *
+     * @param code 错误代码
+     * @param msg  消息
+     * @return data
+     */
+    public static Result failure(int code, String msg) {
+        return new Result(code, msg, NOOP);
+    }
+    /**
+     * 处理失败
+     *
+     * @param msg 消息
+     * @return data
+     */
+    public static Result failure(String msg) {
+        return failure(CODE_FAILURE, msg);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonResult [code=" + code + ", msg=" + msg + ", data="
+                + data + "]";
+    }
+}

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

@@ -57,6 +57,13 @@ public enum ResultCode  {
     INCREMENT_TYPE_EMPTY(50040, "权益类型不存在!"),
     AGENT_NEW_EMPTY(50041, "代理商不存在!"),
     SS_NO_COPY(50042, "深时场景暂不支持复制!"),
+    AGENT_NOT_EMPTY(50043, "经销商名称已存在!"),
+    CAMERA_NOT_MOVE(50044, "场景在改相机中，无需迁移!"),
+    SCENE_REBUILD_ERROR(50045, "场景重算失败。。。"),
+    PASSWORD_ERROR_G(50046, "密码格式错误！"),
+    AGENT_U_NOT_EMPTY(50047, "经销商账号已存在！"),
+    INCREMENT_TYPE_ERROR(50048, "权益类型错误！"),
+    DEL_UCENTER_ERROR(50049, "该用户已绑定相机，请先解绑再删除用户。"),
 
     ;
 

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

@@ -0,0 +1,69 @@
+package com.fdkankan.manage.common;
+
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.ServerCode;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResultData<T> implements Serializable {
+    /**
+     * 状态码
+     */
+    private int code;
+    /**
+     * 响应信息
+     */
+    private String message;
+    /**
+     * 后端返回结果
+     */
+    private T data;
+    /**
+     * 后端返回结果
+     */
+    private Boolean success;
+    /**
+     * 响应时间戳
+     */
+    private long timestamp = Calendar.getInstance().getTimeInMillis();
+
+    public static ResultData ok() {
+        return ok(null);
+    }
+    public static ResultData ok(Object data) {
+        return ok("成功", data);
+    }
+    public static ResultData ok(String msg, Object data) {
+        return base(ServerCode.SUCCESS.code(), msg, data,true);
+    }
+
+    public static ResultData error(int code, String msg) {
+        return error(code, msg, null); }
+    public static ResultData error(int code, String msg, Object data) {
+        return base(code, msg, data,false);
+    }
+    public static ResultData error(ErrorCode errorCode, Object data) {
+        return base(errorCode.code(), errorCode.message(), data,false);
+    }
+
+    public static ResultData error(ErrorCode errorCode) {
+        return error(errorCode.code(), errorCode.message());
+    }
+
+    private static ResultData  base(int code, String msg, Object data,Boolean success) {
+        ResultData rd = new ResultData();
+        rd.setCode(code);
+        rd.setMessage(msg);
+        rd.setData(data);
+        rd.setSuccess(success);
+        return rd;
+    }
+
+}

src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -12,12 +12,15 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.HttpMethod;
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.ISysMenuService;
 import com.fdkankan.redis.constant.RedisKey;
 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.context.annotation.Bean;
@@ -27,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 
 @Configuration
+@Slf4j
 public class SaTokenConfigure {
 
     public static HashMap<String, JSONObject> manageMenuUrl = new HashMap<>();
@@ -34,6 +38,8 @@ public class SaTokenConfigure {
 
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    ISysMenuService sysMenuService;
     // 注册Sa-Token的拦截器
     @Bean
     public SaServletFilter getSaServletFilter() {
@@ -42,7 +48,7 @@ public class SaTokenConfigure {
                 .addInclude("/**").addExclude("/**/reMyselfPassword","/test/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
-                    System.out.println("---------- 进入Sa-Token全局认证 -----------");
+                    log.info("---------- 进入Sa-Token全局认证 -----------");
                     // 登录认证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录
                     SaRouter.match("/**", "/service/manage/login", r ->checkLogin() );
                     String menu = redisUtil.get(RedisKey.MANAGE_MENU);

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.AgentAudit;
 import com.fdkankan.manage.service.IAgentAuditService;
 import com.fdkankan.manage.vo.request.AgentAuditListParam;

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

@@ -4,13 +4,14 @@ package com.fdkankan.manage.controller;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.response.Result;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AgentNew;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.IAgentNewService;
+import com.fdkankan.manage.service.ICameraDetailService;
+import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.service.IUserService;
 import com.fdkankan.manage.vo.request.AgentAddIncrementParam;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
@@ -40,6 +41,10 @@ public class AgentNewController {
     IAgentNewService agentNewService;
     @Autowired
     IUserService userService;
+    @Autowired
+    ICameraDetailService cameraDetailService;
+    @Autowired
+    IUserIncrementService userIncrementService;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody AgentParam agentParam){
@@ -68,9 +73,17 @@ public class AgentNewController {
         if(StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getUserName())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        userService.checkUserName(param.getUserName());
-        agentNewService.save(param);
+        Boolean bo  = userService.checkUserName(param.getUserName());
+        if(!bo){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+        AgentNew agentNew = agentNewService.getByName(param.getName().trim());
+        if(agentNew != null){
+            throw new BusinessException(ResultCode.AGENT_NOT_EMPTY);
+        }
+        agentNewService.checkUserName(param.getUserName());
         param.setSysUserId(Integer.valueOf((String)StpUtil.getLoginId()));
+        agentNewService.save(param);
         return ResultData.ok();
     }
     @PostMapping("/update")
@@ -78,6 +91,12 @@ public class AgentNewController {
         if(param.getId() == null || StringUtils.isBlank(param.getName())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(StringUtils.isNotBlank(param.getName())){
+            AgentNew agentNew = agentNewService.getByName(param.getName().trim());
+            if(agentNew != null && !agentNew.getId().equals(param.getId())){
+                throw new BusinessException(ResultCode.AGENT_NOT_EMPTY);
+            }
+        }
         LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(AgentNew::getId,param.getId());
         wrapper.set(AgentNew::getName,param.getName());
@@ -91,6 +110,8 @@ public class AgentNewController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         agentNewService.removeById(param.getId());
+        cameraDetailService.delAgentId(param.getId());
+        userIncrementService.delAgentId(param.getId());
         return ResultData.ok();
     }
 

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.service.IAppFileService;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.BuryPoint;
 import com.fdkankan.manage.service.IBuryPointService;
 import com.fdkankan.manage.vo.request.BuryPointListParam;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.ICompanyService;
 import com.fdkankan.manage.service.IOrderService;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IOrderItemService;
 import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.request.OrderParam;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.fdkankan.manage.service.ICameraVersionService;
 import com.fdkankan.manage.vo.request.CameraVersionParam;

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

@@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.Case;
 import com.fdkankan.manage.service.ICaseService;
 import com.fdkankan.manage.util.Dateutils;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.ICommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -5,7 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.service.ICameraDetailService;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IDataService;
 import com.fdkankan.manage.service.ISysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IDownloadOrderService;
 import com.fdkankan.manage.vo.request.OrderParam;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.MailTemplate;
 import com.fdkankan.manage.service.IMailTemplateService;
 import org.apache.commons.lang3.StringUtils;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.EmployNote;
 import com.fdkankan.manage.service.IEmployNoteService;

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

@@ -4,7 +4,7 @@ import cn.hutool.poi.word.WordUtil;
 import com.alibaba.nacos.common.codec.Base64;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IExcelService;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IIncrementOrderService;
 import com.fdkankan.manage.vo.request.OrderParam;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,7 @@ package com.fdkankan.manage.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.vo.request.OrderParam;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IIntercomMessageService;
 import com.fdkankan.manage.vo.request.IntercomMessageParam;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -5,8 +5,8 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IInvoiceService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;

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

@@ -2,7 +2,7 @@ package com.fdkankan.manage.controller;
 
 import cn.hutool.extra.servlet.ServletUtil;
 import com.dtflys.forest.annotation.BaseRequest;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.impl.ManageService;
 import com.fdkankan.manage.vo.request.ManageLoginRequest;
 import com.fdkankan.redis.util.RedisUtil;

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.LookSpace;
 import com.fdkankan.manage.service.ILookSpaceService;
 import com.fdkankan.manage.vo.request.LookSpaceParam;

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

@@ -3,8 +3,8 @@ package com.fdkankan.manage.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.service.INewsService;
 import com.fdkankan.manage.vo.BaseParamVO;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.OperLogService;
 import com.fdkankan.manage.vo.OperLogPageParamVO;
 import com.fdkankan.mongodb.base.MongoPageResult;

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

@@ -4,12 +4,13 @@ package com.fdkankan.manage.controller;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.httpClient.client.OverallClient;
 import com.fdkankan.manage.httpClient.vo.OverallParam;
 import com.fdkankan.manage.httpClient.vo.OverallVo;
 import org.apache.commons.lang3.StringUtils;
+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;
@@ -29,7 +30,7 @@ public class OverallController {
     private static String appId ="BDA385EC848C1A425F746869011C8D23";
     private static String key ="appId";
 
-    @Resource
+   @Autowired
     OverallClient overallClient;
 
     @PostMapping("/list")

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.SceneApply;
 import com.fdkankan.manage.service.ISceneApplyService;
 import com.fdkankan.manage.vo.request.AgentAuditListParam;

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

@@ -4,7 +4,7 @@ package com.fdkankan.manage.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.ScenePlus;
 import com.fdkankan.manage.entity.ScenePro;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
@@ -12,6 +12,7 @@ import com.fdkankan.manage.service.IDownService;
 import com.fdkankan.manage.service.IScenePlusService;
 import com.fdkankan.manage.service.ISceneProService;
 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.*;
@@ -25,6 +26,7 @@ import java.util.HashMap;
  */
 @RestController
 @RequestMapping("/service/manage/scene")
+@Slf4j
 public class SceneController {
 
     @Autowired
@@ -33,7 +35,7 @@ public class SceneController {
     IScenePlusService scenePlusService;
     @Autowired
     IDownService downService;
-    @Resource
+   @Autowired
     FdKKClient fdKKClient;
 
     @PostMapping("/list")
@@ -124,11 +126,17 @@ public class SceneController {
         }
         HashMap<String,Object> paramMap = new HashMap<>();
         paramMap.put("num",num);
-        JSONObject jsonObject = fdKKClient.rebuildScene(paramMap);
-        Integer code = jsonObject.getInteger("code");
-        if(code != 0){
-            return ResultData.error(code,jsonObject.getString("message"));
+        try {
+            JSONObject jsonObject = fdKKClient.rebuildScene(paramMap);
+            Integer code = jsonObject.getInteger("code");
+            if(code != 0){
+                log.error("场景重算失败：{},{}",num,jsonObject);
+                throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
+            }
+        }catch (Exception e){
+            throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
         }
+
         return ResultData.ok();
     }
 }

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.controller;
 
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.service.ISpaceSdkService;

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

@@ -3,9 +3,10 @@ package com.fdkankan.manage.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.config.MenuInit;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.request.RequestBase;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.vo.request.RequestBase;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.SysMenu;
 import com.fdkankan.manage.service.ISysMenuService;
@@ -25,11 +26,14 @@ public class SysMenuController extends BaseController{
 
     @Autowired
     ISysMenuService menuService;
+    @Autowired
+    MenuInit menuInit;
 
     @PostMapping("/add")
     public ResultData add(@RequestBody SysMenu param){
         param.setUpdateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
         menuService.saveOrUpdate(param);
+        menuInit.initMenu();
         return ResultData.ok();
     }
 
@@ -40,6 +44,7 @@ public class SysMenuController extends BaseController{
         }
         param.setUpdateTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
         menuService.saveOrUpdate(param);
+        menuInit.initMenu();
         return ResultData.ok();
     }
 
@@ -49,6 +54,7 @@ public class SysMenuController extends BaseController{
         wrapper.eq(SysMenu::getParentId,param.getId());
         menuService.remove(wrapper);
         menuService.removeById(param.getId());
+        menuInit.initMenu();
         return ResultData.ok();
     }
 

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

@@ -4,7 +4,7 @@ package com.fdkankan.manage.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.service.ISysRoleService;
 import com.fdkankan.manage.service.ISysUserService;

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

@@ -4,7 +4,7 @@ package com.fdkankan.manage.controller;
 import cn.dev33.satoken.stp.StpUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysRoleService;

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

@@ -6,7 +6,7 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.service.IUserIncrementService;
@@ -122,5 +122,27 @@ public class UserController {
         cameraService.unbindCamera(cameraId);
         return ResultData.ok();
     }
+
+    @PostMapping("/addUcenterUser")
+    public ResultData addUcenterUser(@RequestBody UserParam userParam){
+        userService.addUcenterUser(userParam);
+        return ResultData.ok();
+    }
+    @PostMapping("/updateUcenterUser")
+    public ResultData updateUcenterUser(@RequestBody UserParam userParam){
+        userService.updateUcenterUser(userParam);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/delUcenterUser")
+    public ResultData delUcenterUser(@RequestBody UserParam userParam){
+        userService.delUcenterUser(userParam);
+        return ResultData.ok();
+    }
+    @PostMapping("/ReUcenterUserPassword")
+    public ResultData ReUcenterUserPassword(@RequestBody UserParam userParam){
+        userService.ReUcenterUserPassword(userParam);
+        return ResultData.ok();
+    }
 }
 

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

@@ -38,12 +38,17 @@ public class AgentNewLog implements Serializable {
      */
     @TableField("type")
     private Integer type;
+    /**
+     * 0 经销商授权，1经销商续费,2官网自购，3平台授权
+     */
+    @TableField("give_type")
+    private Integer giveType;
 
     /**
      * 授权对象id
      */
     @TableField("user_id")
-    private Integer userId;
+    private Long userId;
 
     /**
      * 授权次数

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

@@ -147,5 +147,8 @@ public class CameraDetail implements Serializable {
     @TableField("last_request_time")
     private String lastRequestTime;
 
+    @TableField("agent_id")
+    private Integer agentId;
+
 
 }

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

@@ -0,0 +1,48 @@
+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 2022-11-18
+ */
+@Getter
+@Setter
+@TableName("t_folder_scene")
+public class FolderScene implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("folder_id")
+    private Long folderId;
+
+    @TableField("scene_id")
+    private Long sceneId;
+
+    @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/User.java

@@ -134,5 +134,8 @@ public class User implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
 
 }

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

@@ -94,5 +94,12 @@ public class UserIncrement implements Serializable {
     @TableField("download_num")
     private Integer downloadNum;
 
+    @TableField("agent_id")
+    private Integer agentId;
 
+    @TableField("member_levels")
+    private String memberLevels;
+
+    @TableField("month_qy")
+    private Integer monthQy;
 }

src/main/java/com/fdkankan/manage/exception/GlobalExceptionHandler.java

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.exception;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;

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

src/main/java/com/fdkankan/manage/httpClient/client/FdKKClient.java

@@ -13,7 +13,7 @@ import java.util.HashMap;
 public interface FdKKClient {
 
 
-    @Get("/api/scene/file/rebuildScene")
+    @Get(value = "/api/scene/file/rebuildScene" ,timeout = 60000,connectTimeout = 60000)
     JSONObject rebuildScene( @Query HashMap<String, Object> param);
 
     @Get("/ucenter/_manage/_copy_scene")

src/main/java/com/fdkankan/manage/httpClient/client/LaserClient.java

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.httpClient.client;
 
 import com.dtflys.forest.annotation.*;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.httpClient.address.LaserAddressSource;
 import com.fdkankan.manage.httpClient.param.LaserSceneMoveParam;
 import com.fdkankan.manage.httpClient.param.LaserSceneParam;

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

@@ -3,8 +3,9 @@ package com.fdkankan.manage.httpClient.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.manage.common.CacheUtil;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.User;
@@ -33,7 +34,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class LaserService {
 
-    @Resource
+   @Autowired
     LaserClient laserClient;
     @Value("${4dkk.laserService.basePath}")
     private String basePath;
@@ -46,22 +47,25 @@ public class LaserService {
 
 
     public PageInfo pageList(SceneParam param) {
+        if( !CacheUtil.uploadType.equals("oss")){
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+        }
         LaserSceneParam laserSceneParam = getLaserSceneParam(param);
+        if(laserSceneParam == null ){
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+        }
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
-            Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-            voPage.setRecords(new ArrayList<>());
-            voPage.setTotal(0);
-            return PageInfo.PageInfo(voPage);
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
         }
         JSONArray list = jsonObject.getJSONArray("list");
         long total =jsonObject.getLong("total");
 
         List<SceneVo> sceneVoList = new ArrayList<>();
         String newBasePath = basePath;
-        //String newBasePath = basePath.contains("uat")? basePath += "/uat" : basePath;
-        newBasePath = newBasePath.contains("dev")? newBasePath += "/dev" : newBasePath;
+        newBasePath = newBasePath.contains("dev")? newBasePath + "/dev" : newBasePath;
+        newBasePath = newBasePath.contains("uat")? newBasePath + "/uat" : newBasePath;
         newBasePath =  newBasePath.replace("/backend","");
         for (Object o : list) {
             String res = JSONObject.toJSONString(o);
@@ -89,9 +93,13 @@ public class LaserService {
     }
 
     private LaserSceneParam getLaserSceneParam(SceneParam param) {
+        LaserSceneParam newParam = new LaserSceneParam();
         if(param.getCompanyId()!= null){ //客户场景
             List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyId(param.getCompanyId());
             param.setSnCodes(this.setSnCodes(cameraDetails));
+            if(param.getSnCodes() == null || param.getSnCodes().size() <=0){
+                return null;
+            }
         }
         if(StringUtils.isNotBlank(param.getUserName())){
             List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getUserName());
@@ -101,7 +109,7 @@ public class LaserService {
                 (param.getSnCodes() == null || param.getSnCodes().size() <=0)){
             param.setSnCode("phoneEmptySelect");
         }
-        LaserSceneParam newParam = new LaserSceneParam();
+
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());
         return newParam;
@@ -179,13 +187,18 @@ public class LaserService {
     }
 
     public void delete(String num) {
-        Map<String,Object> params = new HashMap<>();
-        params.put("sceneCode", num);
-        params.put("status", -1);
-        Result result = laserClient.saveOrEdit(num, params);
-        if(result.getCode() != HttpStatus.OK.value()){
-            log.error("激光场景状态同步失败!");
+        try {
+            Map<String,Object> params = new HashMap<>();
+            params.put("sceneCode", num);
+            params.put("status", -1);
+            Result result = laserClient.saveOrEdit(num, params);
+            if(result.getCode() != HttpStatus.OK.value()){
+                log.error("激光场景状态同步失败!");
+            }
+        }catch (Exception e){
+            log.error("激光场景状态同步失败!",e);
         }
+
     }
 
 

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.FolderScene;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 文件夹和场景关联表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-18
+ */
+@Mapper
+public interface IFolderSceneMapper extends BaseMapper<FolderScene> {
+
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
 
-    List<GroupByCount> getCountGroupByUserId(List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList, @Param("isObj") Integer isObj);
 
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
 @Mapper
 public interface ISceneProMapper extends BaseMapper<ScenePro> {
 
-    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList);
+    List<GroupByCount> getCountGroupByUserId(@Param("userIdList") List<Long> userIdList,@Param("isObj") Integer isObj);
 
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.AgentAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.AgentAuditListParam;

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

@@ -3,6 +3,7 @@ package com.fdkankan.manage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.AgentNewLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
 import com.fdkankan.manage.vo.response.AgentNewLogVo;
 
@@ -19,4 +20,6 @@ import java.util.List;
 public interface IAgentNewLogService extends IService<AgentNewLog> {
 
     List<AgentNewLogVo> getVoList( AgentNewLogParam param);
+
+    void addByUserIncrement(UserIncrement userIncrement);
 }

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

@@ -27,4 +27,8 @@ public interface IAgentNewService extends IService<AgentNew> {
     Object logList(AgentNewLogParam param);
 
     void export(HttpServletRequest req, HttpServletResponse resp);
+
+    AgentNew getByName(String agentName);
+
+    void checkUserName(String userName);
 }

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.vo.request.AppFileParam;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.BuryPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.BuryPointListParam;

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

@@ -35,4 +35,8 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     List<CameraDetail> getListByCompanyId(Integer companyId);
 
     List<CameraDetail> getByUserName(String userName);
+
+    void delAgentId(Integer agentId);
+
+    List<CameraDetail> getByUserId(Long id);
 }

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.CameraParam;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.CameraVersionParam;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import java.io.IOException;
 import org.springframework.web.multipart.MultipartFile;
 

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.CompanyParam;

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

@@ -1,9 +1,11 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.OrderParam;
+import com.fdkankan.manage.vo.response.DownOrderVo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,4 +23,6 @@ public interface IDownloadOrderService extends IService<DownloadOrder> {
     PageInfo pageList(OrderParam param);
 
     void export(HttpServletRequest req, HttpServletResponse resp);
+
+    Page<DownOrderVo> pageListByParam(OrderParam orderParam);
 }

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.EmployNote;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.EmployNoteParam;

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

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.FolderScene;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 文件夹和场景关联表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-18
+ */
+public interface IFolderSceneService extends IService<FolderScene> {
+
+    void delBySceneId(Long sceneId);
+}

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.OrderParam;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.IntercomMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.IntercomMessageParam;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.Invoice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.InvoicePageParamVO;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.LookSpace;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.LookSpaceParam;

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.BaseParamVO;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.OrderParam;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SceneApply;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.AgentAuditListParam;

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

@@ -19,4 +19,6 @@ public interface IScenePlusExtService extends IService<ScenePlusExt> {
     ScenePlusExt getByPlusId(Long plusId);
 
     HashMap<Long, ScenePlusExt> getByPlusIds(List<Long> plusIds);
+
+    void delByPlus(Long plusId);
 }

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

@@ -22,7 +22,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     void unbindCamera(Long cameraId);
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj);
 
     HashMap<Long, Long> getCountGroupByCameraId(ArrayList<Long> longs);
 }

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.ScenePro;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -8,6 +8,7 @@ import com.fdkankan.manage.vo.request.SceneParam;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -25,7 +26,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<ScenePro> getListByCameraId(Long cameraId);
 
-    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList);
+    HashMap<Long, Long> getCountGroupByUserId(List<Long> userIdList,Integer isObj);
 
     HashMap<Long, Long>  getCountGroupByCameraId(List<Long> cameraIds);
 
@@ -42,4 +43,6 @@ public interface ISceneProService extends IService<ScenePro> {
     Long getKkCount(List<String> asList, String startTime);
     Long getSsCount(List<String> asList, String startTime);
     Long getSsObjCount(List<String> asList, String startTime);
+
+    HashMap<String, String> getSnCodeByNumList(Set<String> numList);
 }

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Scene;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.SceneParam;

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.SpaceSdkParam;

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

@@ -1,8 +1,10 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.request.RequestBase;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.entity.SysRole;
+import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.vo.request.RequestBase;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SysMenu;
 import com.fdkankan.manage.vo.response.SysMenuVo;
 
@@ -34,4 +36,6 @@ public interface ISysMenuService extends IService<SysMenu> {
     HashMap<Long, SysMenu> getByIds(List<Long> menuIds);
 
     List<Long> getMenuIdsByRoleId(Long roleId);
+
+    void setRoleAndMenuCache(SysRole role, SysUser sysUser);
 }

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.vo.request.SysRoleMenuParam;
 import com.fdkankan.manage.vo.request.SysRoleParam;

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

@@ -1,12 +1,13 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.vo.request.SysUserParam;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 
 import java.util.HashMap;
+import java.util.Set;
 
 /**
  * <p>
@@ -27,4 +28,6 @@ public interface ISysUserService extends IService<SysUser> {
     PageInfo pageList(SysUserParam param);
 
     HashMap<Long, Long> groupByRoleId();
+
+    HashMap<Long, SysUser> getByIds(Set<Long> sysUserIds);
 }

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

@@ -1,6 +1,6 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.common.response.PageInfo;
+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;
@@ -33,4 +33,7 @@ public interface IUserIncrementService extends IService<UserIncrement> {
     Long getValidCountByCameraId(Long cameraId);
 
     UserIncrement getByCameraId(Long cameraId);
+
+
+    void delAgentId(Integer agentId);
 }

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

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
@@ -31,4 +31,12 @@ public interface IUserService extends IService<User> {
     List<User> getByUserName(String userName);
 
     Boolean checkUserName(String userName);
+
+    void addUcenterUser(UserParam userParam);
+
+    void delUcenterUser(UserParam userParam);
+
+    void ReUcenterUserPassword(UserParam userParam);
+
+    void updateUcenterUser(UserParam userParam);
 }

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

@@ -3,7 +3,7 @@ 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.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.AgentAudit;
 import com.fdkankan.manage.mapper.IAgentAuditMapper;
 import com.fdkankan.manage.service.IAgentAuditService;

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

@@ -1,12 +1,16 @@
 package com.fdkankan.manage.service.impl;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.entity.AgentNew;
 import com.fdkankan.manage.entity.AgentNewLog;
+import com.fdkankan.manage.entity.IncrementType;
+import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.mapper.IAgentNewLogMapper;
 import com.fdkankan.manage.service.IAgentNewLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IAgentNewService;
+import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.vo.request.AgentNewLogParam;
 import com.fdkankan.manage.vo.response.AgentLogGVo;
 import com.fdkankan.manage.vo.response.AgentNewLogVo;
@@ -30,6 +34,8 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
     @Autowired
     IAgentNewService agentNewService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
 
     @Override
     public List<AgentNewLogVo> getVoList( AgentNewLogParam param) {
@@ -47,9 +53,9 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
             }
             switch (gVo.getType()){
-                case 0 : vo.setMajorNum(gVo.getNum() + vo.getMajorNum());
-                case 1 : vo.setHighNum(gVo.getNum() + vo.getHighNum());
-                case 2 : vo.setDownNum(gVo.getNum() + vo.getDownNum());
+                case 0 : vo.setMajorNum(gVo.getNum() + vo.getMajorNum());break;
+                case 1 : vo.setHighNum(gVo.getNum() + vo.getHighNum());break;
+                case 2 : vo.setDownNum(gVo.getNum() + vo.getDownNum());break;
             }
             map.put(gVo.getAgentId(),vo);
         }
@@ -59,4 +65,23 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
         }
         return list;
     }
+
+    @Override
+    public void addByUserIncrement(UserIncrement userIncrement) {
+        if(userIncrement.getAgentId() !=null){
+            AgentNewLog log = new AgentNewLog();
+            if(userIncrement.getIncrementTypeId() != null){
+                IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+                if(incrementType!=null){
+                    log.setType(incrementType.getValidTimeType());
+                }
+            }
+            log.setAgentId(userIncrement.getAgentId());
+            log.setUserId(userIncrement.getUserId());
+            log.setGiveType(3);
+            log.setCount(1);
+            this.save(log);
+        }
+
+    }
 }

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

@@ -2,11 +2,10 @@ package com.fdkankan.manage.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
-import com.amazonaws.services.lexmodelbuilding.model.Intent;
 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.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.*;
@@ -25,12 +24,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.WeakHashMap;
 
 /**
  * <p>
@@ -86,7 +87,7 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         if(agentNew == null){
             throw new BusinessException(ResultCode.AGENT_NEW_EMPTY);
         }
-        if(param.getDownAddNum() <=0 || param.getMajorAddNum() <=0 || param.getHighAddNum() <=0  ){
+        if(param.getDownAddNum() <=0 && param.getMajorAddNum() <=0 && param.getHighAddNum() <=0  ){
             return;
         }
         LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
@@ -105,12 +106,34 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
     }
 
     @Override
+    public AgentNew getByName(String agentName) {
+        LambdaQueryWrapper<AgentNew> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AgentNew::getName, agentName);
+        List<AgentNew> list = this.list(wrapper);
+        if(list == null || list.size() != 1) {
+            return null;
+        }
+        return list.get(0);
+    }
+
+    @Override
     public Object logList(AgentNewLogParam param) {
         CacheUtil.agentParam = param;
         return agentNewLogService.getVoList(param);
     }
 
     @Override
+    public void checkUserName(String userName) {
+        LambdaQueryWrapper<AgentNew> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AgentNew::getUserName,userName);
+        List<AgentNew> list = this.list(wrapper);
+        if(list !=null && list.size() >0){
+            throw new BusinessException(ResultCode.AGENT_U_NOT_EMPTY);
+        }
+
+    }
+
+    @Override
     public void export(HttpServletRequest req, HttpServletResponse resp) {
         AgentNewLogParam param = CacheUtil.agentParam;
         List<AgentNewLogVo> voList = agentNewLogService.getVoList(param);

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

@@ -3,13 +3,13 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.manage.common.FilePath;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.mapper.IAppFileMapper;
 import com.fdkankan.manage.service.IAppFileService;
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -39,11 +40,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> implements IAppFileService {
 
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
-    @Value("${upload.type}")
+   @Autowired
+    private FYunFileServiceInterface fYunFileServiceInterface;
+    @Value("${fyun.type}")
     private String ossType;
-    @Value("${oss.prefix.ali}")
+    @Value("${fyun.host}")
     private String prefixAli;
 
     @Override
@@ -85,12 +86,15 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
 
     @Override
     public Set<String> agentList(String agentName) {
-        List<String> strings = mangeUploadToOssUtil.listKeys(FilePath.appOssPath);
+        List<String> strings = fYunFileServiceInterface.listRemoteFiles(FilePath.appOssPath);
         Set<String> keys = new HashSet<>();
         for (String key : strings) {
             String agent = key.replace(FilePath.appOssPath,"");
             String[] split = agent.split("/");
-            keys.add(split[0]);
+            String res = split[0];
+            if(StringUtils.isNotBlank(res)){
+                keys.add(res);
+            }
         }
         return keys;
     }
@@ -123,12 +127,12 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
 
         String ossPathPrefix = FilePath.appOssPath + param.getAgent() + "/"+param.getAppType()+"/";
 
-        mangeUploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"4dkankan."+fileType);
+        fYunFileServiceInterface.uploadFile(param.getFileServerType(),filePath, ossPathPrefix+"4dkankan."+fileType);
         // 上传到 历史记录文件夹目录
-        mangeUploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"oldapps/" + file.getName());
+        fYunFileServiceInterface.uploadFile(param.getFileServerType(),filePath, ossPathPrefix+"oldapps/" + file.getName());
 
         // 上传到 version.json 文件
-        mangeUploadToOssUtil.upload(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
+        fYunFileServiceInterface.uploadFile(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
 
         // 删除旧文件
         FileUtils.deleteFile(filePath);

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.BuryPoint;
 import com.fdkankan.manage.mapper.IBuryPointMapper;
 import com.fdkankan.manage.service.IBuryPointService;

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

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.response.PageInfo;
+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;
@@ -81,7 +82,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.set(CameraDetail::getTotalSpace,Long.parseLong(Constant.EXPANSION_SPACE_VALUE_1G ) * 10L);
         this.update(wrapper);
 
-        sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        if(!"local".equals(CacheUtil.uploadType)){
+            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        }
 
     }
 
@@ -133,38 +136,40 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         List<CameraDetail> list = this.list(wrapper);
         Set<Long> cameraIds = list.parallelStream().map(CameraDetail::getCameraId).collect(Collectors.toSet());
         HashMap<Long, Long> resultMap = new HashMap<>();
-        HashMap<Long, Long> sceneProMap = sceneProService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
-        HashMap<Long, Long> sceneMap = sceneService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
-        HashMap<Long, Long> scenePlusMap = scenePlusService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
-
-        HashMap<Long,Camera> cameraHashMap = new HashMap<>();
-        List<Camera> cameraList = cameraService.listByIds(cameraIds);
-        cameraList.forEach(entity -> cameraHashMap.put(entity.getId(),entity));
-        HashMap<Long,List<String>> companySnCodeMap = new HashMap<>();
-        for (CameraDetail cameraDetail : list) {
-            Long sceneProCount = sceneProMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneProMap.get(cameraDetail.getCameraId());
-            Long sceneCount = sceneMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneMap.get(cameraDetail.getCameraId());
-            Long scenePlusCount = scenePlusMap.get(cameraDetail.getCameraId()) == null ? 0L : scenePlusMap.get(cameraDetail.getCameraId());
-            Long count =  sceneProCount + sceneCount + scenePlusCount;
-
-            List<String> snCodeList = companySnCodeMap.computeIfAbsent(cameraDetail.getCompanyId(), k -> new ArrayList<>());
-            Camera camera = cameraHashMap.get(cameraDetail.getCameraId());
-            if(camera != null){
-                snCodeList.add(camera.getSnCode());
+        if(cameraIds.size() >0){
+            HashMap<Long, Long> sceneProMap = sceneProService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
+            HashMap<Long, Long> sceneMap = sceneService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
+            HashMap<Long, Long> scenePlusMap = scenePlusService.getCountGroupByCameraId(new ArrayList<>(cameraIds));
+            HashMap<Long,Camera> cameraHashMap = new HashMap<>();
+            List<Camera> cameraList = cameraService.listByIds(cameraIds);
+            cameraList.forEach(entity -> cameraHashMap.put(entity.getId(),entity));
+            HashMap<Long,List<String>> companySnCodeMap = new HashMap<>();
+            for (CameraDetail cameraDetail : list) {
+                Long sceneProCount = sceneProMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneProMap.get(cameraDetail.getCameraId());
+                Long sceneCount = sceneMap.get(cameraDetail.getCameraId()) == null ? 0L : sceneMap.get(cameraDetail.getCameraId());
+                Long scenePlusCount = scenePlusMap.get(cameraDetail.getCameraId()) == null ? 0L : scenePlusMap.get(cameraDetail.getCameraId());
+                Long count =  sceneProCount + sceneCount + scenePlusCount;
+
+                List<String> snCodeList = companySnCodeMap.computeIfAbsent(cameraDetail.getCompanyId(), k -> new ArrayList<>());
+                Camera camera = cameraHashMap.get(cameraDetail.getCameraId());
+                if(camera != null){
+                    snCodeList.add(camera.getSnCode());
+                }
+                resultMap.merge(cameraDetail.getCompanyId(), count, Long::sum);
             }
-            resultMap.merge(cameraDetail.getCompanyId(), count, Long::sum);
-        }
 
-        for (Long companyId : companySnCodeMap.keySet()) {
-            List<String> snCodeList = companySnCodeMap.get(companyId);
-            if(snCodeList == null || snCodeList.size() <=0){
-                continue;
+            for (Long companyId : companySnCodeMap.keySet()) {
+                List<String> snCodeList = companySnCodeMap.get(companyId);
+                if(snCodeList == null || snCodeList.size() <=0){
+                    continue;
+                }
+                SceneParam param = new SceneParam();
+                param.setSnCodes(snCodeList);
+                PageInfo pageInfo = laserService.pageList(param);
+                resultMap.merge(companyId, pageInfo.getTotal(), Long::sum);
             }
-            SceneParam param = new SceneParam();
-            param.setSnCodes(snCodeList);
-            PageInfo pageInfo = laserService.pageList(param);
-            resultMap.merge(companyId, pageInfo.getTotal(), Long::sum);
         }
+
         return resultMap;
     }
 
@@ -197,4 +202,19 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         return null;
     }
+
+    @Override
+    public void delAgentId(Integer agentId) {
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getAgentId,agentId);
+        wrapper.set(CameraDetail::getAgentId,null);
+        this.update(wrapper);
+    }
+
+    @Override
+    public List<CameraDetail> getByUserId(Long userId) {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CameraDetail::getUserId,userId);
+        return this.list(wrapper);
+    }
 }

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

@@ -7,17 +7,11 @@ 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.ExcelErrorUtil;
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.entity.Order;
+import com.fdkankan.manage.common.*;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.constant.CameraConstant;
-import com.fdkankan.manage.entity.Camera;
-import com.fdkankan.manage.entity.CameraDetail;
-import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.mapper.ICameraMapper;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.util.Dateutils;
@@ -60,7 +54,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     ICompanyService companyService;
     @Autowired
     IExcelService excelService;
-    @Value("${upload.type}")
+    @Value("${fyun.type}")
     private String ossType;
 
     @Override
@@ -122,12 +116,15 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         }
         saveBatchCamera(Collections.singletonList(wifiName));
     }
-    
+
     private Integer saveBatchCamera(List<String> wifiNameList){
         HashSet<String> wifiNameSet = new HashSet<>(wifiNameList);
         List<Camera> cameraList = new ArrayList<>();
         for (String wifiName : wifiNameSet) {
             String[] res = wifiName.split("_");
+            if(res.length !=2 || StringUtils.isBlank(res[1])){
+                throw new BusinessException(ResultCode.WIFI_NAME_ERROR);
+            }
             Camera camera = new Camera();
             camera.setWifiName(wifiName);
             camera.setSnCode(res[1]);
@@ -149,9 +146,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setAgency(CameraConstant.DEFAULT_AGENT);
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
-            if("aws".equals(ossType)){
-                cameraDetail.setCountry(1);//1-国外
-            }
             cameraDetail.setType(type);
             if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType()){
                 cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
@@ -160,7 +154,15 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(type != 9 && type != 10){
                 type = type == 0 ? 1: 4;
             }
+            if("aws".equals(CacheUtil.uploadType)){
+                cameraDetail.setCountry(1);//1-国外
+            }
             cameraDetail.setGoodsId(Long.valueOf(type));
+            if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
+                cameraDetail.setCountry(2);
+                cameraDetail.setOwn(2);
+                cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+            }
             cameraDetailList.add(cameraDetail);
         }
         return  cameraDetailService.saveBatch(cameraDetailList) ? cameraList.size() : 0;
@@ -293,6 +295,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(cameraDetail == null){
                 throw new BusinessException(ResultCode.CAMERA_NOT_IN);
             }
+            if(param.getAgentId() != null){
+                cameraDetail.setAgentId(param.getAgentId());
+            }
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());
@@ -363,6 +368,11 @@ IOrderService orderService;
         }else {
             wrapper.set(CameraDetail::getOrderSn,null);
         }
+        if(param.getAgentId() != null){
+            wrapper.set(CameraDetail::getAgentId,param.getAgentId());
+        }else {
+            wrapper.set(CameraDetail::getAgentId,null);
+        }
         wrapper.set(CameraDetail::getOwn,param.getOutType());
         cameraDetailService.update(wrapper);
     }

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

@@ -5,10 +5,11 @@ 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.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.FilePath;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
@@ -17,7 +18,6 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysUserService;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.fdkankan.manage.mapper.ICameraVersionMapper;
 import com.fdkankan.manage.service.ICameraVersionService;
@@ -52,14 +52,11 @@ import java.util.List;
 public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper, CameraVersion> implements ICameraVersionService {
 
     public static String DIR_NAME = "camera_version/";
-    public static String YAMAXUN_S3_PATH = "https://eurs3.4dkankan.com/camera_version/";
 
-    @Value("${upload.type}")
-    private String ossType;
-    @Value("${oss.prefix.ali}")
-    private String prefixAli;
-    @Resource
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Value("${fyun.host:https://4dkk.4dage.com/}")
+    private String ossUrlPrefix;
+   @Autowired
+    private FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     ISysUserService sysUserService;
 
@@ -88,24 +85,21 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         file.transferTo(file1);
 
         // 添加对象信息
-        switch (type){
-            case 1: type = 1;break;
-            case 2: type = 9;break;
-            case 3: type = 10;break;
-            default: throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
-        }
+//        switch (type){
+//            case 1: type = 1;break;
+//            case 2: type = 9;break;
+//            case 3: type = 10;break;
+//            default: throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+//        }
         List<CameraVersion> cameraVersions = this.getByVersion(version,type);
         if(cameraVersions != null && cameraVersions.size() >0){
             throw new BusinessException(ResultCode.VISION_EXIST.code(),ResultCode.VISION_EXIST.message());
         }
         log.info("filePath: {}", filePath);
         // 上传到阿里云sso
-        mangeUploadToOssUtil.upload(filePath, DIR_NAME + fileName);
+        fYunFileServiceInterface.uploadFile(filePath, DIR_NAME + fileName);
         log.info("upload success");
-        String url = prefixAli + DIR_NAME + fileName;
-        if("aws".equals(ossType)){
-            url = YAMAXUN_S3_PATH + fileName;
-        }
+        String url = ossUrlPrefix + DIR_NAME + fileName;
         log.info("upload url: {}" + url);
 
         CameraVersion versionEntity = new CameraVersion();
@@ -133,12 +127,12 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     @Override
     public PageInfo pageList(CameraVersionParam param) {
         Integer type = param.getType();
-        switch (type){
-            case 1: type = 1;break;
-            case 2: type = 9;break;
-            case 3: type = 10;break;
-            default: throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
-        }
+//        switch (type){
+//            case 1: type = 1;break;     //看看
+//            case 2: type = 9;break;     //看见
+//            case 3: type = 10;break;    //深时
+//            default: throw new BusinessException(ResultCode.CAMERA_TYPE_ERROR);
+//        }
         LambdaQueryWrapper<CameraVersion> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CameraVersion::getType,type);
         if (StringUtils.isNotBlank(param.getVersion())) {
@@ -192,7 +186,6 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
                         .eq(CameraVersion::getType,param.getType());
                 this.update(updateWrapper);
             }
-            cameraVersion.setStatus(param.getStatus());
             this.updateById(param);
             return;
         }

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Case;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.ICaseMapper;

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

@@ -1,10 +1,10 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import com.fdkankan.common.constant.UploadFilePath;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.OssPath;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.service.ICommonService;
 import java.io.File;
 import java.io.IOException;
@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * TODO
@@ -26,21 +28,21 @@ import org.springframework.web.multipart.MultipartFile;
 @Service
 public class CommonServiceImpl implements ICommonService {
 
-    @Value("${oss.prefix.url}")
+    @Value("${fyun.host:https://4dkk.4dage.com/}")
     private String ossUrlPrefix;
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+   @Autowired
+    private FYunFileServiceInterface fYunFileServiceInterface;
 
     @Override
     public ResultData uploadFile(MultipartFile file) throws IOException {
         String uuid = UUID.randomUUID().toString();
         String originalFilename = file.getOriginalFilename();
         String  extName = originalFilename.substring(originalFilename.lastIndexOf("."));
-        String ossPath = String.format(UploadFilePath.MANAGE_FILE_PATH, DateUtil.format(Calendar.getInstance()
+        String ossPath = String.format(OssPath.MANAGE_FILE_PATH, DateUtil.format(Calendar.getInstance()
             .getTime(), DateExtUtil.dateStyle6), uuid + extName);
         File tempFile = File.createTempFile(uuid ,extName);
         file.transferTo(tempFile);
-        mangeUploadToOssUtil.upload(tempFile.getPath(), ossPath);
+        fYunFileServiceInterface.uploadFile(tempFile.getPath(), ossPath);
         tempFile.deleteOnExit();
         String url = this.ossUrlPrefix + ossPath;
         return ResultData.ok(url);

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

@@ -3,7 +3,7 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.mapper.ICompanyMapper;
 import com.fdkankan.manage.service.ICameraDetailService;

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

@@ -23,7 +23,7 @@ public class DataService implements IDataService {
     static String mouthFormat = "%Y-%m";
     static String yearFormat = "%Y";
 
-    @Resource
+   @Autowired
     IDataMapper dataMapper;
     @Autowired
     IUserService userService;

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

@@ -4,7 +4,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.DownloadOrder;
@@ -20,6 +20,9 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,30 +48,24 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Override
     public PageInfo pageList(OrderParam param) {
         CacheUtil.orderParam = param;
-        Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        return PageInfo.PageInfo(this.pageListByParam(param));
+    }
+
+    @Override
+    public Page<DownOrderVo> pageListByParam(OrderParam orderParam) {
+        Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(), orderParam.getPageSize()), orderParam);
+        Set<String> numList = page.getRecords().stream().map(DownOrderVo::getSceneNum).collect(Collectors.toSet());
+        HashMap<String,String> snCodeMap = new HashMap<>();
+        if(numList.size() >0){
+             snCodeMap = sceneProService.getSnCodeByNumList(numList);
+        }
         for (DownOrderVo record : page.getRecords()) {
-            record.setCreateTime(record.getTradeTime());
             if(StringUtils.isNotBlank(record.getSceneNum())){
-                Long cameraId = null;
-                ScenePro pro = sceneProService.getByNum(record.getSceneNum());
-                if(pro == null){
-                    ScenePlus plus = scenePlusService.getByNum(record.getSceneNum());
-                    if(plus!= null){
-                        cameraId = plus.getCameraId();
-                    }
-                }else {
-                    cameraId = pro.getCameraId();
-                }
-                if(cameraId != null){
-                    Camera camera = cameraService.getById(cameraId);
-                    if(camera != null){
-                        record.setSnCode(camera.getSnCode());
-                    }
-                }
+                record.setSnCode(snCodeMap.get(record.getSceneNum()));
             }
-
+            record.setCreateTime(record.getTradeTime());
         }
-        return PageInfo.PageInfo(page);
+        return page;
     }
 
     @Override
@@ -76,7 +73,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
         OrderParam orderParam = CacheUtil.orderParam;
         orderParam.setPageNum(1);
         orderParam.setPageSize(5000);
-        Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+        Page<DownOrderVo> page = this.pageListByParam(orderParam);
 
         ExcelWriter excelWriter = null;
         try {
@@ -84,7 +81,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
             excelService.commonExport(req,resp,"下载订单",page.getRecords(),excelWriter);
             while (page.hasNext()){
                 orderParam.setPageNum(orderParam.getPageNum()+1);
-                page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);
+                page = this.pageListByParam(orderParam);
                 if(page.getRecords().size() >0){
                     excelService.commonExport(req,resp,"下载订单",page.getRecords(),excelWriter);
                 }