1

pom.xml

@@ -20,20 +20,25 @@
 
     <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-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>
 
 

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,7 +1,8 @@
 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";   //获取临时文件目录

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

@@ -0,0 +1,43 @@
+package com.fdkankan.manage.common;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+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();
+    }
+
+
+}

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/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

@@ -15,7 +15,8 @@ import com.alibaba.nacos.common.utils.HttpMethod;
 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 org.apache.commons.lang3.StringUtils;
@@ -34,6 +35,8 @@ public class SaTokenConfigure {
 
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    ISysMenuService sysMenuService;
     // 注册Sa-Token的拦截器
     @Bean
     public SaServletFilter getSaServletFilter() {

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,8 +4,7 @@ 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;

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,8 +4,8 @@ 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;

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;

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;

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/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,8 @@ 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.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;

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/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/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,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.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.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/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/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;

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,8 @@
 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.vo.request.RequestBase;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SysMenu;
 import com.fdkankan.manage.vo.response.SysMenuVo;
 

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,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.SysUser;
 import com.fdkankan.manage.vo.request.SysUserParam;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;

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;

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;

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/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.*;

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,8 +40,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> implements IAppFileService {
 
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Resource
+    private FYunFileServiceInterface fYunFileServiceInterface;
     @Value("${upload.type}")
     private String ossType;
     @Value("${oss.prefix.ali}")
@@ -85,7 +86,7 @@ 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,"");
@@ -123,12 +124,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,7 @@ 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.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.CameraTypeEnum;
@@ -133,38 +133,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;
     }
 

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

@@ -11,7 +11,7 @@ import com.fdkankan.manage.common.ExcelErrorUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.Order;
 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.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.constant.CameraConstant;

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;
+    @Value("${fyun.host:https://4dkk.4dage.com/}")
+    private String ossUrlPrefix;
     @Resource
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    private FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     ISysUserService sysUserService;
 
@@ -100,12 +97,9 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         }
         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();

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;
+    @Resource
+    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/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;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.EmployNote;
 import com.fdkankan.manage.mapper.IEmployNoteMapper;
 import com.fdkankan.manage.service.IEmployNoteService;

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.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.IncrementOrder;
 import com.fdkankan.manage.mapper.IIncrementOrderMapper;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.IntercomMessage;
 import com.fdkankan.manage.mapper.IIntercomMessageMapper;
 import com.fdkankan.manage.service.IIntercomMessageService;

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

@@ -2,14 +2,14 @@ package com.fdkankan.manage.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.common.constant.InvoiceType;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.common.OssPath;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.service.*;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
 
 import com.google.common.base.Strings;
 import com.google.common.primitives.Ints;
+import jdk.nashorn.internal.ir.annotations.Reference;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,9 +44,8 @@ import org.springframework.web.multipart.MultipartFile;
 @Service
 public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> implements IInvoiceService {
 
-    @Value("${oss.prefix.url}")
-    private String ossPrefixUrl;
-
+    @Value("${fyun.host:https://4dkk.4dage.com/}")
+    private String ossUrlPrefix;
     @Autowired
     private IMailTemplateService mailTemplateService;
     @Autowired
@@ -59,8 +59,8 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
 
     @Autowired
     private IInvoiceRegisterService invoiceRegisterService;
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Reference
+    private FYunFileServiceInterface fYunFileServiceInterface;
 
     @Autowired
     IReceiverInfoService receiverInfoService;
@@ -116,8 +116,8 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
             File  localFile = File.createTempFile(fileName,suffixName);
             file.transferTo(localFile);
             String ossFilePath = OssPath.invoiceOssDir + fileName + suffixName;
-            mangeUploadToOssUtil.upload(localFile.getPath(),ossFilePath);
-            invoiceRegister.setInvoiceUrl(ossPrefixUrl + ossFilePath);
+            fYunFileServiceInterface.uploadFile(localFile.getPath(),ossFilePath);
+            invoiceRegister.setInvoiceUrl(ossUrlPrefix + ossFilePath);
 
             String orderNum  = null;
             if(invoice.getOrderId()!= null){

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

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.manage.entity.LookSpace;
 import com.fdkankan.manage.mapper.ILookSpaceMapper;

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.common.response.Result;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.PageInfo;
+import com.fdkankan.manage.common.Result;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.mapper.INewsMapper;
 import com.fdkankan.manage.service.INewsService;

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

@@ -5,7 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 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.common.CacheUtil;
 import com.fdkankan.manage.entity.Order;
 import com.fdkankan.manage.mapper.IOrderMapper;

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

@@ -7,7 +7,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.AgentAudit;
 import com.fdkankan.manage.entity.MailTemplate;
 import com.fdkankan.manage.entity.SceneApply;

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.httpClient.service.LaserService;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.IScenePlusMapper;
 import com.fdkankan.manage.service.*;
@@ -30,8 +29,6 @@ import java.util.List;
 public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlus> implements IScenePlusService {
 
     @Autowired
-    MangerUploadToOssUtil mangeUploadToOssUtil;
-    @Autowired
     ISceneProService sceneProService;
     @Autowired
     LaserService laserService;

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

@@ -7,18 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
-import com.fdkankan.common.constant.UploadFilePath;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.OssPath;
 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.*;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
 import com.fdkankan.manage.httpClient.service.LaserService;
-import com.fdkankan.manage.util.CreateObjUtilSelf;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.common.CameraConstant;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.ISceneProMapper;
@@ -67,8 +64,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IIncrementTypeService incrementTypeService;
     @Autowired
     ISceneProEditService sceneProEditService;
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Resource
+    FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
@@ -263,10 +260,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      */
     private void updateOssStatus(String path,Integer payStatus) {
         try {
-            if(!mangeUploadToOssUtil.existKey(path)){
+            if(!fYunFileServiceInterface.fileExist(path)){
                 return;
             }
-            String data = mangeUploadToOssUtil.getObjectContent("4dkankan",path);
+            String data = fYunFileServiceInterface.getFileContent("4dkankan",path);
             if(StringUtils.isBlank(data)){
                 return;
             }
@@ -275,7 +272,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             String json = JSONUtil.toJsonStr(jsonObject);
             FileUtils.writeFile(OssPath.localStatusPath ,json);
             log.info("updateOssStatus--localPath:{},ossPath:{}",OssPath.localStatusPath,path);
-            mangeUploadToOssUtil.upload(OssPath.localStatusPath,path);
+            fYunFileServiceInterface.uploadFile(OssPath.localStatusPath,path);
         }catch (Exception e){
             e.printStackTrace();
         }finally {

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Scene;
 import com.fdkankan.manage.mapper.ISceneMapper;
 import com.fdkankan.manage.service.ISceneService;

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

@@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.FileUtils;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.mapper.ISpaceSdkMapper;
 import com.fdkankan.manage.service.ISpaceSdkService;
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -50,12 +51,14 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
 
     private static String DIR_NAME = "new4dkk/v2/images/_/common/data/";
 
-    @Autowired
-    private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Resource
+    FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     ISysUserService sysUserService;
 
-    @Value("${oss.prefix.sdk}")
+    @Value("${space-sdk.bucket:4dscene}")
+    private String sdkBucket;
+    @Value("${space-sdk.url:https://4dscene.4dage.com/}")
     private String prefixAli;
 
 
@@ -97,7 +100,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         log.info("filePath: {}", filePath);
 
         // 上传到阿里云sso
-        mangeUploadToOssUtil.uploadSdk(filePath, DIR_NAME + fileName);
+        fYunFileServiceInterface.uploadFile(sdkBucket,filePath, DIR_NAME + fileName);
         log.info("upload success");
 
         String url = prefixAli + DIR_NAME + fileName;

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

@@ -3,8 +3,8 @@ 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.request.RequestBase;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.vo.request.RequestBase;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Meta;
 import com.fdkankan.manage.entity.SysMenu;
 import com.fdkankan.manage.entity.SysRoleMenu;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.manage.entity.SysRole;
 import com.fdkankan.manage.entity.SysUser;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.Base64Converter;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.SecurityUtil;

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

@@ -8,7 +8,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.PageInfo;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.UserIncrement;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.User;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.IUserMapper;

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

@@ -1,12 +1,11 @@
 package com.fdkankan.manage.test;
 
 import cn.hutool.core.io.FileUtil;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.FilePath;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -1,25 +0,0 @@
-package com.fdkankan.manage.util;
-
-import com.fdkankan.common.util.ConstantCmd;
-import com.fdkankan.common.util.CreateObjUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-
-@Slf4j
-public class CreateObjUtilSelf extends CreateObjUtil {
-
-    static  String oss_folder ="bash /opt/ossutil/upload.sh %s %s";
-
-    public static void ossUtilCpFolder(String sourceFolder , String targetFolder){
-        File sourceFile = new File(sourceFolder);
-        if (!sourceFile.exists()) {
-            log.error("oss文件夹上传异常，文件夹不存在{}", sourceFolder);
-        }
-        String command = String.format(oss_folder,targetFolder,sourceFolder);
-        Long start = System.currentTimeMillis();
-        log.info("开始上传oss文件夹：" + command);
-        callshell(command);
-        log.info("oss文件夹上传完成,时间为：" + (System.currentTimeMillis() - start));
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.fdkankan.manage.util;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -38,7 +37,6 @@ public class ExcelUtil {
             }
             rowList.add(map);
         }
-        workbook.close();
         return rowList;
     }
 

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

@@ -1,8 +1,8 @@
 package com.fdkankan.manage.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fdkankan.common.request.RequestBase;
-import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.vo.request.RequestBase;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.mongodb.base.BaseRequestMongo;
 import java.util.Date;