Merge remote-tracking branch 'origin/master'

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformClient.java

@@ -1,6 +1,7 @@
 package com.fdkankan.platform.api.feign;
 
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.platform.api.vo.UserIncrement;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +27,7 @@ public interface PlatformClient {
 
     /**
      *
-     * @return String
+     * @return CameraDetail
      */
     @PostMapping("/updateCameraDetailByCameraIdAndSpace")
     ResultData updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
@@ -52,8 +53,14 @@ public interface PlatformClient {
     ResultData getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) ;
     /**
      *
-     * @return company
+     * @return user
      */
     @PostMapping("/getUserByName")
     ResultData getUserByName(@RequestParam(value = "userName", required = false) String userName) ;
+    /**
+     *
+     * @return UserIncrement
+     */
+    @PostMapping("/getUserIncrementByCameraId")
+    UserIncrement getUserIncrementByCameraId(@RequestParam(value = "cameraId", required = false) Long cameraId);
 }

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/vo/UserIncrement.java

@@ -0,0 +1,88 @@
+package com.fdkankan.platform.api.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户增值权益表
+ * </p>
+ *
+ * @author 
+ * @since 2021-12-24
+ */
+@Getter
+@Setter
+public class UserIncrement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 权益包标识
+     */
+    private String keyWord;
+
+    /**
+     * 用户表t_user的id
+     */
+    private Long userId;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    private Long cameraId;
+
+    /**
+     * 会员权益类型Id
+     */
+    private Integer incrementTypeId;
+
+    /**
+     * 结束时间
+     */
+    private Date incrementEndTime;
+
+    /**
+     * 是否过期（1过期，0未过期）
+     */
+    private Integer isExpired;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 扩容订单集合
+     */
+    private String orderSn;
+
+    /**
+     * 生效时间
+     */
+    private Date incrementStartTime;
+
+    private Integer downloadNum;
+
+    /**
+     * 0正常，1删除
+     */
+    private Integer tbStatus;
+
+
+}

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/feign/UserFeign.java

@@ -3,14 +3,20 @@ package com.fdkankan.modeling.feign;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.modeling.entity.ScenePro;
+import com.fdkankan.modeling.entity.SceneProExt;
+import com.fdkankan.modeling.service.ISceneProExtService;
 import com.fdkankan.modeling.service.ISceneProService;
 import com.fdkankan.platform.api.feign.PlatformClient;
+import com.fdkankan.platform.api.vo.CameraDetail;
 import com.fdkankan.platform.api.vo.User;
+import com.fdkankan.platform.api.vo.UserIncrement;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -20,6 +26,8 @@ public class UserFeign {
     private PlatformClient platformClient;
     @Autowired
     private ISceneProService sceneProService;
+    @Autowired
+    private ISceneProExtService sceneProExtService;
 
     public User findByUserName(String userName) {
         ResultData resultData  = platformClient.getUserByName(userName);
@@ -36,7 +44,23 @@ public class UserFeign {
             log.info("该场景不存在无法扣除容量，场景码为：" + projectNum);
             return -1;
         }
-        //todo
+        SceneProExt sceneProExt = sceneProExtService.getBySceneProId(sceneProEntity.getId());
+        ResultData resultData = platformClient.updateCameraDetailByCameraIdAndSpace(sceneProEntity.getCameraId(), sceneProExt.getSpace());
+        if(resultData.getCode() != 200){
+            log.info("调用platform服务updateCameraDetailByCameraIdAndSpace失败，参数{},{}" ,sceneProEntity.getCameraId(), sceneProExt.getSpace());
+            return -1;
+        }
+        CameraDetail detailEntity = JSONObject.parseObject(JSONObject.toJSONString(resultData.getData()), CameraDetail.class);
+
+        UserIncrement byCameraId = platformClient.getUserIncrementByCameraId(sceneProEntity.getCameraId());
+        if(byCameraId == null || byCameraId.getIsExpired().intValue() == 1){
+            // 新上传的场景，如果总容量小于使用容量，则该大场景保留在临时存储空间30天
+            if (detailEntity.getTotalSpace().compareTo(detailEntity.getUsedSpace()) == -1){
+                List<Long> ids = new ArrayList<>();
+                ids.add(sceneProEntity.getId());
+                sceneProService.tempScenes(ids);
+            }
+        }
         return 0;
     }
 }

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProExtService.java

@@ -13,4 +13,5 @@ import com.fdkankan.modeling.entity.SceneProExt;
  */
 public interface ISceneProExtService extends IService<SceneProExt> {
 
+    SceneProExt getBySceneProId(Long id);
 }

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProService.java

@@ -3,6 +3,8 @@ package com.fdkankan.modeling.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.modeling.entity.ScenePro;
 
+import java.util.List;
+
 /**
  * <p>
  * pro场景表 服务类
@@ -18,4 +20,6 @@ public interface ISceneProService extends IService<ScenePro> {
     ScenePro findBySceneNum(String projectNum);
 
     void updateTime(String projectNum, Long space, int payStatus, String toJSONString, long computeTime);
+
+    void tempScenes(List<Long> ids);
 }

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProExtServiceImpl.java

@@ -1,11 +1,14 @@
 package com.fdkankan.modeling.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.modeling.entity.SceneProExt;
 import com.fdkankan.modeling.mapper.ISceneProExtMapper;
 import com.fdkankan.modeling.service.ISceneProExtService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * pro场景表 服务实现类
@@ -17,4 +20,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneProExtServiceImpl extends ServiceImpl<ISceneProExtMapper, SceneProExt> implements ISceneProExtService {
 
+    @Override
+    public SceneProExt getBySceneProId(Long id) {
+        QueryWrapper<SceneProExt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SceneProExt::getSceneProId,id);
+        List<SceneProExt> list = this.list(queryWrapper);
+        if(list == null || list.size()<=0){
+            return null;
+        }
+        return list.get(0);
+    }
 }

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProServiceImpl.java

@@ -3,14 +3,21 @@ package com.fdkankan.modeling.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
+import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.modeling.entity.ScenePro;
+import com.fdkankan.modeling.entity.SceneProExt;
 import com.fdkankan.modeling.mapper.ISceneProMapper;
+import com.fdkankan.modeling.service.ISceneProExtService;
 import com.fdkankan.modeling.service.ISceneProService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,6 +30,8 @@ import java.util.List;
 @Service
 public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
 
+    @Autowired
+    private ISceneProExtService sceneProExtService;
 
     @Override
     public void updateStatus(String str, int i) {
@@ -45,4 +54,29 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void updateTime(String projectNum, Long space, int payStatus, String toJSONString, long computeTime) {
 
     }
+
+    @Override
+    public void tempScenes(List<Long> lockedIds) {
+        if (lockedIds == null || lockedIds.size() == 0){
+            return;
+        }
+        for (Long id : lockedIds){
+            SceneProExt sceneProExt = sceneProExtService.getBySceneProId(id);
+            sceneProExt.setPayStatus(-2);
+            sceneProExtService.updateById(sceneProExt);
+
+            ScenePro sceneProEntity = this.getById(id);
+//            sceneProEntity.setPayStatus(-2);
+//            this.updateById(sceneProEntity);
+
+            try{
+                Map<String, Object> map = new HashMap<>();
+                map.put("payStatus", -2);
+                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneProEntity.getSceneCode() + "/scene.json", map);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+
+        }
+    }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/PlatformApplication.java

@@ -16,7 +16,6 @@ public class PlatformApplication  {
 	public static void main(String[] args) {
 		SpringApplication.run(PlatformApplication.class, args);
 	}
-
 }
 
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/constant/AgentConstant.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.constant;
+package com.fdkankan.platform.agent.constant;
 
 public class AgentConstant {
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/api/AgentAuditController.java

@@ -1,8 +1,8 @@
-package com.fdkankan.agent.controller.api;
+package com.fdkankan.platform.agent.controller.api;
 
 
-import com.fdkankan.agent.request.RequestAgentAudit;
-import com.fdkankan.agent.service.IAgentAuditService;
+import com.fdkankan.platform.agent.request.RequestAgentAudit;
+import com.fdkankan.platform.agent.service.IAgentAuditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/api/AgentController.java

@@ -1,12 +1,12 @@
-package com.fdkankan.agent.controller.api;
+package com.fdkankan.platform.agent.controller.api;
 
 
 import com.auth0.jwt.JWT;
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.service.IAgentNoticeService;
-import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.agent.vo.AgentNoticeVo;
-import com.fdkankan.agent.vo.AgentVo;
+import com.fdkankan.platform.agent.entity.Agent;
+import com.fdkankan.platform.agent.service.IAgentNoticeService;
+import com.fdkankan.platform.agent.service.IAgentService;
+import com.fdkankan.platform.agent.vo.AgentNoticeVo;
+import com.fdkankan.platform.agent.vo.AgentVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/api/AgentLoginController.java

@@ -1,8 +1,8 @@
-package com.fdkankan.agent.controller.api;
+package com.fdkankan.platform.agent.controller.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.service.IAgentService;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.service.IAgentService;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/manager/ManagerAgentAuditController.java

@@ -1,11 +1,11 @@
-package com.fdkankan.agent.controller.manager;
+package com.fdkankan.platform.agent.controller.manager;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.agent.request.RequestNote;
-import com.fdkankan.agent.request.RequestSearch;
-import com.fdkankan.agent.service.IAgentAuditService;
-import com.fdkankan.agent.vo.AgentAuditVo;
+import com.fdkankan.platform.agent.entity.AgentAudit;
+import com.fdkankan.platform.agent.request.RequestNote;
+import com.fdkankan.platform.agent.request.RequestSearch;
+import com.fdkankan.platform.agent.service.IAgentAuditService;
+import com.fdkankan.platform.agent.vo.AgentAuditVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/manager/ManagerAgentController.java

@@ -1,21 +1,21 @@
-package com.fdkankan.agent.controller.manager;
+package com.fdkankan.platform.agent.controller.manager;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.request.RequestAgentFramework;
-import com.fdkankan.agent.request.RequestAgentNotice;
-import com.fdkankan.agent.service.IAgentFrameworkService;
-import com.fdkankan.agent.service.IAgentNoticeService;
-import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.agent.util.AgentFrameworkTree;
-import com.fdkankan.agent.util.AgentFrameworkTreeUtil;
-import com.fdkankan.agent.vo.AgentDetailTotalAmount;
-import com.fdkankan.agent.vo.AgentTotalAmountVo;
-import com.fdkankan.agent.vo.AgentVo;
-import com.fdkankan.agent.vo.ResponseAgentCamera;
+import com.fdkankan.platform.agent.entity.Agent;
+import com.fdkankan.platform.agent.entity.AgentFramework;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.request.RequestAgentFramework;
+import com.fdkankan.platform.agent.request.RequestAgentNotice;
+import com.fdkankan.platform.agent.service.IAgentFrameworkService;
+import com.fdkankan.platform.agent.service.IAgentNoticeService;
+import com.fdkankan.platform.agent.service.IAgentService;
+import com.fdkankan.platform.agent.util.AgentFrameworkTree;
+import com.fdkankan.platform.agent.util.AgentFrameworkTreeUtil;
+import com.fdkankan.platform.agent.vo.AgentDetailTotalAmount;
+import com.fdkankan.platform.agent.vo.AgentTotalAmountVo;
+import com.fdkankan.platform.agent.vo.AgentVo;
+import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/Agent.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.platform.agent.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentAudit.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.platform.agent.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentFramework.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.platform.agent.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/AgentNotice.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.platform.agent.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/entity/VaildCameras.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.entity;
+package com.fdkankan.platform.agent.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentAuditMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.platform.agent.mapper;
 
-import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.platform.agent.entity.AgentAudit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentFrameworkMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.platform.agent.mapper;
 
-import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.platform.agent.entity.AgentFramework;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.platform.agent.mapper;
 
-import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.platform.agent.entity.Agent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IAgentNoticeMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.platform.agent.mapper;
 
-import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.platform.agent.entity.AgentNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/mapper/IVaildCamerasMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.mapper;
+package com.fdkankan.platform.agent.mapper;
 
-import com.fdkankan.agent.entity.VaildCameras;
+import com.fdkankan.platform.agent.entity.VaildCameras;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestAgent.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestAgentAudit.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestAgentFramework.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestAgentNotice.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestNote.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/request/RequestSearch.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.request;
+package com.fdkankan.platform.agent.request;
 
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentAuditService.java

@@ -1,12 +1,12 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.platform.agent.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.agent.entity.AgentAudit;
+import com.fdkankan.platform.agent.entity.AgentAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.request.RequestAgentAudit;
-import com.fdkankan.agent.request.RequestNote;
-import com.fdkankan.agent.request.RequestSearch;
-import com.fdkankan.agent.vo.AgentAuditVo;
+import com.fdkankan.platform.agent.request.RequestAgentAudit;
+import com.fdkankan.platform.agent.request.RequestNote;
+import com.fdkankan.platform.agent.request.RequestSearch;
+import com.fdkankan.platform.agent.vo.AgentAuditVo;
 
 /**
  * <p>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentFrameworkService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.platform.agent.service;
 
-import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.platform.agent.entity.AgentFramework;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.request.RequestAgentFramework;
+import com.fdkankan.platform.agent.request.RequestAgentFramework;
 
 /**
  * <p>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentNoticeService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.platform.agent.service;
 
-import com.fdkankan.agent.entity.AgentNotice;
+import com.fdkankan.platform.agent.entity.AgentNotice;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.vo.AgentNoticeVo;
+import com.fdkankan.platform.agent.vo.AgentNoticeVo;
 
 /**
  * <p>

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IAgentService.java

@@ -1,14 +1,14 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.platform.agent.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.agent.entity.Agent;
+import com.fdkankan.platform.agent.entity.Agent;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.vo.AgentDetailTotalAmount;
-import com.fdkankan.agent.vo.AgentTotalAmountVo;
-import com.fdkankan.agent.vo.AgentVo;
-import com.fdkankan.agent.vo.ResponseAgentCamera;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.vo.AgentDetailTotalAmount;
+import com.fdkankan.platform.agent.vo.AgentTotalAmountVo;
+import com.fdkankan.platform.agent.vo.AgentVo;
+import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
 import org.springframework.web.multipart.MultipartFile;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/IVaildCamerasService.java

@@ -1,7 +1,7 @@
-package com.fdkankan.agent.service;
+package com.fdkankan.platform.agent.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.entity.VaildCameras;
+import com.fdkankan.platform.agent.entity.VaildCameras;
 
 import java.util.HashMap;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentAuditServiceImpl.java

@@ -1,15 +1,15 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.platform.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.entity.AgentAudit;
-import com.fdkankan.agent.mapper.IAgentAuditMapper;
-import com.fdkankan.agent.request.RequestAgentAudit;
-import com.fdkankan.agent.request.RequestNote;
-import com.fdkankan.agent.request.RequestSearch;
-import com.fdkankan.agent.service.IAgentAuditService;
-import com.fdkankan.agent.vo.AgentAuditVo;
+import com.fdkankan.platform.agent.entity.AgentAudit;
+import com.fdkankan.platform.agent.mapper.IAgentAuditMapper;
+import com.fdkankan.platform.agent.request.RequestAgentAudit;
+import com.fdkankan.platform.agent.request.RequestNote;
+import com.fdkankan.platform.agent.request.RequestSearch;
+import com.fdkankan.platform.agent.service.IAgentAuditService;
+import com.fdkankan.platform.agent.vo.AgentAuditVo;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentFrameworkServiceImpl.java

@@ -1,16 +1,16 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.platform.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fdkankan.agent.entity.AgentFramework;
-import com.fdkankan.agent.mapper.IAgentFrameworkMapper;
-import com.fdkankan.agent.request.RequestAgentFramework;
-import com.fdkankan.agent.service.IAgentFrameworkService;
+import com.fdkankan.platform.agent.entity.AgentFramework;
+import com.fdkankan.platform.agent.mapper.IAgentFrameworkMapper;
+import com.fdkankan.platform.agent.request.RequestAgentFramework;
+import com.fdkankan.platform.agent.service.IAgentFrameworkService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.user.entity.Manager;
-import com.fdkankan.user.service.IManagerService;
+import com.fdkankan.platform.user.entity.Manager;
+import com.fdkankan.platform.user.service.IManagerService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentNoticeServiceImpl.java

@@ -1,12 +1,12 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.platform.agent.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.agent.entity.AgentNotice;
-import com.fdkankan.agent.mapper.IAgentNoticeMapper;
-import com.fdkankan.agent.service.IAgentNoticeService;
+import com.fdkankan.platform.agent.entity.AgentNotice;
+import com.fdkankan.platform.agent.mapper.IAgentNoticeMapper;
+import com.fdkankan.platform.agent.service.IAgentNoticeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.vo.AgentNoticeVo;
+import com.fdkankan.platform.agent.vo.AgentNoticeVo;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/AgentServiceImpl.java

@@ -1,18 +1,18 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.platform.agent.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.entity.Agent;
-import com.fdkankan.agent.mapper.IAgentMapper;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.agent.util.ExcelUtil;
-import com.fdkankan.agent.vo.AgentDetailTotalAmount;
-import com.fdkankan.agent.vo.AgentTotalAmountVo;
-import com.fdkankan.agent.vo.AgentVo;
-import com.fdkankan.agent.vo.ResponseAgentCamera;
+import com.fdkankan.platform.agent.entity.Agent;
+import com.fdkankan.platform.agent.mapper.IAgentMapper;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.service.IAgentService;
+import com.fdkankan.platform.agent.util.ExcelUtil;
+import com.fdkankan.platform.agent.vo.AgentDetailTotalAmount;
+import com.fdkankan.platform.agent.vo.AgentTotalAmountVo;
+import com.fdkankan.platform.agent.vo.AgentVo;
+import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
@@ -20,11 +20,11 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.PasswordUtils;
 import com.fdkankan.common.util.SsoUtil;
-import com.fdkankan.goods.entity.Camera;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.service.ICameraDetailService;
-import com.fdkankan.goods.service.ICameraService;
-import com.fdkankan.order.service.IVirtualOrderService;
+import com.fdkankan.platform.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.service.ICameraDetailService;
+import com.fdkankan.platform.goods.service.ICameraService;
+import com.fdkankan.platform.order.service.IVirtualOrderService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/service/impl/VaildCamerasServiceImpl.java

@@ -1,12 +1,12 @@
-package com.fdkankan.agent.service.impl;
+package com.fdkankan.platform.agent.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.entity.VaildCameras;
-import com.fdkankan.agent.mapper.IVaildCamerasMapper;
-import com.fdkankan.agent.service.IVaildCamerasService;
+import com.fdkankan.platform.agent.entity.VaildCameras;
+import com.fdkankan.platform.agent.mapper.IVaildCamerasMapper;
+import com.fdkankan.platform.agent.service.IVaildCamerasService;
 import com.fdkankan.common.constant.CameraConstant;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
@@ -39,7 +39,7 @@ public class VaildCamerasServiceImpl extends ServiceImpl<IVaildCamerasMapper, Va
 
     private static Logger log = LoggerFactory.getLogger("programLog");
 
-    @Value("${main.url:https://test.4dkankan.com/}")
+    @Value("${main.url}")
     private String mainUrl;
 
     @Override

4dkankan-center-platform/src/main/java/com/fdkankan/agent/util/AgentFrameworkTree.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.util;
+package com.fdkankan.platform.agent.util;
 
 import java.util.List;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/util/AgentFrameworkTreeUtil.java

@@ -1,6 +1,6 @@
-package com.fdkankan.agent.util;
+package com.fdkankan.platform.agent.util;
 
-import com.fdkankan.agent.entity.AgentFramework;
+import com.fdkankan.platform.agent.entity.AgentFramework;
 
 import java.util.ArrayList;
 import java.util.List;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/util/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.util;
+package com.fdkankan.platform.agent.util;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentAuditVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentDetailTotalAmount.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentNoticeVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentTotalAmountVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/AgentVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

4dkankan-center-platform/src/main/java/com/fdkankan/agent/vo/ResponseAgentCamera.java

@@ -1,4 +1,4 @@
-package com.fdkankan.agent.vo;
+package com.fdkankan.platform.agent.vo;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/feign/ModelingFeign.java

@@ -1,7 +1,9 @@
-package com.fdkankan.feign;
+package com.fdkankan.platform.feign;
 
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.service.IUserService;
+import com.fdkankan.platform.user.entity.User;
+import com.fdkankan.platform.user.entity.UserIncrement;
+import com.fdkankan.platform.user.service.IUserIncrementService;
+import com.fdkankan.platform.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,10 +19,16 @@ public class ModelingFeign {
 
     @Autowired
     private IUserService userService;
+    @Autowired
+    private IUserIncrementService userIncrementService;
 
     @PostMapping("/getUserByName")
     public User getUserByName(@RequestParam(value = "userName", required = false) String userName) {
         return userService.getUserByUserName(userName);
     }
+    @PostMapping("/getUserIncrementByCameraId")
+    public UserIncrement getUserIncrementByCameraId(@RequestParam(value = "cameraId", required = false) Long cameraId) {
+        return userIncrementService.getByCameraId(cameraId);
+    }
 
 }

4dkankan-center-platform/src/main/java/com/fdkankan/feign/SceneFeign.java

@@ -1,13 +1,13 @@
-package com.fdkankan.feign;
+package com.fdkankan.platform.feign;
 
 import com.fdkankan.common.user.SSOUser;
-import com.fdkankan.goods.entity.Camera;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.entity.Company;
-import com.fdkankan.goods.service.ICameraDetailService;
-import com.fdkankan.goods.service.ICameraService;
-import com.fdkankan.goods.service.ICompanyService;
-import com.fdkankan.user.service.IUserService;
+import com.fdkankan.platform.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.entity.Company;
+import com.fdkankan.platform.goods.service.ICameraDetailService;
+import com.fdkankan.platform.goods.service.ICameraService;
+import com.fdkankan.platform.goods.service.ICompanyService;
+import com.fdkankan.platform.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,8 +41,8 @@ public class SceneFeign {
     }
 
     @PostMapping("/updateCameraDetailByCameraIdAndSpace")
-    public String updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
-                                                           @RequestParam(value = "space", required = false) Long space) {
+    public CameraDetail updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
+                                                             @RequestParam(value = "space", required = false) Long space) {
         return cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId,space);
     }
 

4dkankan-center-platform/src/main/java/com/fdkankan/generate/AutoGenerate.java

@@ -1,4 +1,4 @@
-package com.fdkankan.generate;
+package com.fdkankan.platform.generate;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/common/SkuCache.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.common;
+package com.fdkankan.platform.goods.common;
 
 import java.util.HashMap;
 import java.util.Map;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/controller/api/VaildCamerasController.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.controller.api;
+package com.fdkankan.platform.goods.controller.api;
 
-import com.fdkankan.agent.service.IVaildCamerasService;
+import com.fdkankan.platform.agent.service.IVaildCamerasService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Camera.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraDetail.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraDetailNumEntity.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import lombok.Data;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraOut.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraSpace.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/CameraVersion.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Cart.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Company.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/Goods.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSku.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpec.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpecValue.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/GoodsSpuSpec.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/entity/SnCode.java

@@ -1,4 +1,4 @@
-package com.fdkankan.goods.entity;
+package com.fdkankan.platform.goods.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraDetailMapper.java

@@ -1,8 +1,8 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.entity.CameraDetailNumEntity;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.entity.CameraDetailNumEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.Camera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraOutMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.CameraOut;
+import com.fdkankan.platform.goods.entity.CameraOut;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraSpaceMapper.java

@@ -1,8 +1,8 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.CameraSpace;
+import com.fdkankan.platform.goods.entity.CameraSpace;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICameraVersionMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.CameraVersion;
+import com.fdkankan.platform.goods.entity.CameraVersion;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICartMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.Cart;
+import com.fdkankan.platform.goods.entity.Cart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ICompanyMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.Company;
+import com.fdkankan.platform.goods.entity.Company;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.Goods;
+import com.fdkankan.platform.goods.entity.Goods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSkuMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.GoodsSku;
+import com.fdkankan.platform.goods.entity.GoodsSku;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.GoodsSpec;
+import com.fdkankan.platform.goods.entity.GoodsSpec;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpecValueMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.GoodsSpecValue;
+import com.fdkankan.platform.goods.entity.GoodsSpecValue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/IGoodsSpuSpecMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.GoodsSpuSpec;
+import com.fdkankan.platform.goods.entity.GoodsSpuSpec;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/mapper/ISnCodeMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.mapper;
+package com.fdkankan.platform.goods.mapper;
 
-import com.fdkankan.goods.entity.SnCode;
+import com.fdkankan.platform.goods.entity.SnCode;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraDetailService.java

@@ -1,13 +1,13 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.vo.ResponseAgentCamera;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.entity.CameraDetailNumEntity;
-import com.fdkankan.user.request.RequestCamera;
-import com.fdkankan.user.vo.ResponseCamera;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.entity.CameraDetailNumEntity;
+import com.fdkankan.platform.user.request.RequestCamera;
+import com.fdkankan.platform.user.vo.ResponseCamera;
 
 import java.util.HashMap;
 import java.util.List;
@@ -47,5 +47,5 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void bind(Long userId, Long cameraId);
 
-    String updateCameraDetailByCameraIdAndSpace(Long cameraId, Long space);
+    CameraDetail updateCameraDetailByCameraIdAndSpace(Long cameraId, Long space);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraOutService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.CameraOut;
+import com.fdkankan.platform.goods.entity.CameraOut;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraService.java

@@ -1,11 +1,11 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.request.RequestCamera;
-import com.fdkankan.user.vo.ResponseCamera;
-import com.fdkankan.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.user.request.RequestCamera;
+import com.fdkankan.platform.user.vo.ResponseCamera;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
 import javax.servlet.http.HttpServletResponse;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraSpaceService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.goods.entity.CameraSpace;
-import com.fdkankan.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.goods.entity.CameraSpace;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 
 import java.util.List;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICameraVersionService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.CameraVersion;
+import com.fdkankan.platform.goods.entity.CameraVersion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICartService.java

@@ -1,9 +1,9 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.Cart;
+import com.fdkankan.platform.goods.entity.Cart;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.request.RequestCart;
-import com.fdkankan.user.vo.ResponseCart;
+import com.fdkankan.platform.user.request.RequestCart;
+import com.fdkankan.platform.user.vo.ResponseCart;
 
 import java.util.List;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ICompanyService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.Company;
+import com.fdkankan.platform.goods.entity.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.Goods;
+import com.fdkankan.platform.goods.entity.Goods;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.goods.vo.ResponseGoods;
+import com.fdkankan.platform.goods.vo.ResponseGoods;
 
 /**
  * <p>

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSkuService.java

@@ -1,9 +1,9 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.GoodsSku;
+import com.fdkankan.platform.goods.entity.GoodsSku;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.goods.vo.ResponseGoodsSku;
-import com.fdkankan.user.request.RequestCamera;
+import com.fdkankan.platform.goods.vo.ResponseGoodsSku;
+import com.fdkankan.platform.user.request.RequestCamera;
 
 import java.util.List;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpecService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.GoodsSpec;
+import com.fdkankan.platform.goods.entity.GoodsSpec;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpecValueService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.GoodsSpecValue;
+import com.fdkankan.platform.goods.entity.GoodsSpecValue;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/IGoodsSpuSpecService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.GoodsSpuSpec;
+import com.fdkankan.platform.goods.entity.GoodsSpuSpec;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/ISnCodeService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.goods.service;
+package com.fdkankan.platform.goods.service;
 
-import com.fdkankan.goods.entity.SnCode;
+import com.fdkankan.platform.goods.entity.SnCode;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraDetailServiceImpl.java

@@ -1,33 +1,32 @@
-package com.fdkankan.goods.service.impl;
+package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.request.RequestAgent;
-import com.fdkankan.agent.vo.ResponseAgentCamera;
+import com.fdkankan.platform.agent.request.RequestAgent;
+import com.fdkankan.platform.agent.vo.ResponseAgentCamera;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
-import com.fdkankan.goods.entity.Camera;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.entity.CameraDetailNumEntity;
-import com.fdkankan.goods.mapper.ICameraDetailMapper;
-import com.fdkankan.goods.service.ICameraDetailService;
-import com.fdkankan.goods.service.ICameraService;
-import com.fdkankan.goods.service.ICameraSpaceService;
-import com.fdkankan.order.service.IVirtualOrderService;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.entity.UserIncrement;
-import com.fdkankan.user.request.RequestCamera;
-import com.fdkankan.user.service.IUserIncrementService;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.ResponseCamera;
-import com.fdkankan.user.vo.ResponseCameraSpace;
-import com.fdkankan.user.vo.ResponseUserIncrement;
+import com.fdkankan.platform.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.entity.CameraDetailNumEntity;
+import com.fdkankan.platform.goods.mapper.ICameraDetailMapper;
+import com.fdkankan.platform.goods.service.ICameraDetailService;
+import com.fdkankan.platform.goods.service.ICameraService;
+import com.fdkankan.platform.goods.service.ICameraSpaceService;
+import com.fdkankan.platform.order.service.IVirtualOrderService;
+import com.fdkankan.platform.user.entity.User;
+import com.fdkankan.platform.user.entity.UserIncrement;
+import com.fdkankan.platform.user.request.RequestCamera;
+import com.fdkankan.platform.user.service.IUserIncrementService;
+import com.fdkankan.platform.user.service.IUserService;
+import com.fdkankan.platform.user.vo.ResponseCamera;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.user.vo.ResponseUserIncrement;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
 import org.springframework.beans.BeanUtils;
@@ -381,15 +380,15 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public String updateCameraDetailByCameraIdAndSpace(Long cameraId, Long space) {
+    public CameraDetail updateCameraDetailByCameraIdAndSpace(Long cameraId, Long space) {
         CameraDetail cameraDetail = this.getByCameraId(cameraId);
-        cameraDetail.setUsedSpace(space);
+        cameraDetail.setUsedSpace(cameraDetail.getUsedSpace() + space);
         if(cameraDetail.getUsedSpace() < 0){
             cameraDetail.setUsedSpace(0L);
         }
         if(!this.updateById(cameraDetail)){
             throw new BusinessException(ErrorCode.ERROR_MSG);
         }
-        return ServerCode.SUCCESS.message();
+        return cameraDetail;
     }
 }

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraOutServiceImpl.java

@@ -1,8 +1,8 @@
-package com.fdkankan.goods.service.impl;
+package com.fdkankan.platform.goods.service.impl;
 
-import com.fdkankan.goods.entity.CameraOut;
-import com.fdkankan.goods.mapper.ICameraOutMapper;
-import com.fdkankan.goods.service.ICameraOutService;
+import com.fdkankan.platform.goods.entity.CameraOut;
+import com.fdkankan.platform.goods.mapper.ICameraOutMapper;
+import com.fdkankan.platform.goods.service.ICameraOutService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.goods.service.impl;
+package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.constant.AgentConstant;
+import com.fdkankan.platform.agent.constant.AgentConstant;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.constant.CameraConstant;
 import com.fdkankan.common.constant.ErrorCode;
@@ -12,21 +12,21 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
-import com.fdkankan.goods.entity.Camera;
-import com.fdkankan.goods.entity.CameraDetail;
-import com.fdkankan.goods.entity.Goods;
-import com.fdkankan.goods.mapper.ICameraMapper;
-import com.fdkankan.goods.service.ICameraDetailService;
-import com.fdkankan.goods.service.ICameraService;
-import com.fdkankan.goods.service.ICameraSpaceService;
-import com.fdkankan.goods.service.IGoodsService;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.entity.UserIncrement;
-import com.fdkankan.user.request.RequestCamera;
-import com.fdkankan.user.service.IUserIncrementService;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.ResponseCamera;
-import com.fdkankan.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.goods.entity.Camera;
+import com.fdkankan.platform.goods.entity.CameraDetail;
+import com.fdkankan.platform.goods.entity.Goods;
+import com.fdkankan.platform.goods.mapper.ICameraMapper;
+import com.fdkankan.platform.goods.service.ICameraDetailService;
+import com.fdkankan.platform.goods.service.ICameraService;
+import com.fdkankan.platform.goods.service.ICameraSpaceService;
+import com.fdkankan.platform.goods.service.IGoodsService;
+import com.fdkankan.platform.user.entity.User;
+import com.fdkankan.platform.user.entity.UserIncrement;
+import com.fdkankan.platform.user.request.RequestCamera;
+import com.fdkankan.platform.user.service.IUserIncrementService;
+import com.fdkankan.platform.user.service.IUserService;
+import com.fdkankan.platform.user.vo.ResponseCamera;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraSpaceServiceImpl.java

@@ -1,11 +1,11 @@
-package com.fdkankan.goods.service.impl;
+package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.goods.entity.CameraSpace;
-import com.fdkankan.goods.mapper.ICameraSpaceMapper;
-import com.fdkankan.goods.service.ICameraSpaceService;
-import com.fdkankan.user.vo.ResponseCameraSpace;
+import com.fdkankan.platform.goods.entity.CameraSpace;
+import com.fdkankan.platform.goods.mapper.ICameraSpaceMapper;
+import com.fdkankan.platform.goods.service.ICameraSpaceService;
+import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

4dkankan-center-platform/src/main/java/com/fdkankan/goods/service/impl/CameraVersionServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.goods.service.impl;
+package com.fdkankan.platform.goods.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.goods.entity.CameraVersion;
-import com.fdkankan.goods.mapper.ICameraVersionMapper;
-import com.fdkankan.goods.service.ICameraVersionService;
+import com.fdkankan.platform.goods.entity.CameraVersion;
+import com.fdkankan.platform.goods.mapper.ICameraVersionMapper;
+import com.fdkankan.platform.goods.service.ICameraVersionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;