完善注释

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/CameraController.java

@@ -40,9 +40,9 @@ public class CameraController {
 
     /**
      * 获取参数下拉框列表
-     * @param type   0客户名称下拉框，1订单号下拉框，
-     * @param companyName
-     * @param orderSn
+     * @param type               0客户名称下拉框，1订单号下拉框，
+     * @param companyName        客户名称
+     * @param orderSn            订单号
      */
     @GetMapping("/getParam")
     public ResultData getOutParam(@RequestParam(required = false,defaultValue = "0") Integer type,
@@ -57,20 +57,35 @@ public class CameraController {
                 throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
     }
+
+    /**
+     * 相机出库
+     * outType          出库类型
+     * companyName      客户名称
+     * orderSn          订单号
+     */
     @PostMapping("/out")
     public ResultData out(@RequestBody CameraInOutParam param) {
         cameraService.out(param);
         return ResultData.ok();
     }
 
-
+    /**
+     * 出库信息修改
+     * outType          出库类型
+     * companyName      客户名称
+     * orderSn          订单号
+     */
     @PostMapping("/update")
     public ResultData update(@RequestBody CameraInOutParam param) {
         cameraService.updateCamera(param);
         return ResultData.ok();
     }
 
-
+    /**
+     * 入库信息删除
+     * id      相机id
+     */
     @PostMapping("/delete")
     public ResultData delete(@RequestBody CameraParam param){
         cameraService.deleteCamera(param.getId());

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/ExcelController.java

@@ -57,10 +57,15 @@ public class ExcelController {
             os.close();
         }
     }
-
+    /**
+     * 导入excel
+     * type 0 入库模板， 1出库模板 ，2 客户关联模板
+     */
     @PostMapping("uploadExcel")
     public ResultData uploadExcel(@RequestParam(required = false) MultipartFile file,
                                   @RequestParam(required = false,defaultValue = "0") Integer type) throws IOException {
         return ResultData.ok(excelService.uploadExcel(file,type));
     }
+
+
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/IncrementOrderController.java

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse;
  * @since 2022-06-20
  */
 @RestController
-@RequestMapping("/service/manage/order/Increment")
+@RequestMapping("/service/manage/order/increment")
 public class IncrementOrderController {
 
     @Autowired

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/SceneController.java

@@ -32,6 +32,11 @@ public class SceneController {
         return ResultData.ok(sceneProService.pageList(param));
     }
 
+    /**
+     * 场景迁移
+     * num     迁移场景码
+     * snCode  迁移至相机snCode
+     */
     @PostMapping("/move")
     public ResultData move(@RequestBody SceneParam param){
         if(StringUtils.isEmpty(param.getNum()) || StringUtils.isEmpty(param.getSnCode())){
@@ -41,6 +46,10 @@ public class SceneController {
         return ResultData.ok();
     }
 
+    /**
+     * 场景复制
+     * num      场景码
+     */
     @PostMapping("/copy")
     public ResultData copy(@RequestBody SceneParam param){
         if(StringUtils.isEmpty(param.getNum())){
@@ -49,6 +58,11 @@ public class SceneController {
         sceneProService.copy(param.getNum());
         return ResultData.ok();
     }
+
+    /**
+     * 场景删除
+     * num      场景码
+     */
     @PostMapping("/delete")
     public ResultData delete(@RequestBody SceneParam param){
         if(StringUtils.isEmpty(param.getNum())){
@@ -58,22 +72,37 @@ public class SceneController {
         return ResultData.ok();
     }
 
+    /**
+     * 检查下载
+     * num      场景码
+     */
     @GetMapping("/checkDownLoad")
     public ResultData checkDownLoad(@RequestParam(required = false) String num){
         return ResultData.ok(downService.checkDownLoad(num));
     }
 
+    /**
+     * 下载场景
+     * num      场景码
+     */
     @GetMapping("/downScene")
     public ResultData downScene(@RequestParam(required = false) String num){
         return ResultData.ok(downService.down(num));
     }
 
+    /**
+     * 下载场景进度条
+     * num      场景码
+     */
     @GetMapping("/downloadProcess")
     public ResultData downloadProcess(@RequestParam(required = false) String num){
         return ResultData.ok(downService.downloadProcess(num));
     }
 
-
+    /**
+     * 场景重算
+     * num      场景码
+     */
     @GetMapping("/rebuildScene")
     public ResultData rebuild(@RequestParam(required = false) String num){
         HashMap<String,Object> paramMap = new HashMap<>();

4dkankan-center-manage/src/main/java/com/fdkankan/manage/controller/UserController.java

@@ -4,7 +4,6 @@ package com.fdkankan.manage.controller;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.service.IUserService;
@@ -104,16 +103,10 @@ public class UserController {
     /**
      * 解绑相机
      * @param cameraId      相机id
-     * @param userId        用户id
      */
     @GetMapping("/unbindCamera")
-    public ResultData unbindCamera(@RequestParam(required = false)Long cameraId,
-                                   @RequestParam(required = false)Long userId){
-        User user = userService.getById(userId);
-        if(user == null){
-            throw new BusinessException(ErrorCode.USER_NOT_EXIST);
-        }
-        cameraService.unbindCamera(cameraId,user);
+    public ResultData unbindCamera(@RequestParam(required = false)Long cameraId){
+        cameraService.unbindCamera(cameraId);
         return ResultData.ok();
     }
 }

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

@@ -91,6 +91,9 @@ public class Company implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+    /**
+     * 是否启用弹性 伸缩
+     */
     @TableField("calculate_flexibility")
     private Boolean calculateFlexibility;
 
@@ -100,6 +103,9 @@ public class Company implements Serializable {
     @TableField("data_sync")
     private String dataSync;
 
+    /**
+     * 客户描述
+     */
     @TableField("company_desc")
     private String companyDesc;
 

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

@@ -1,8 +1,7 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.manage.entity.CameraDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.entity.User;
+import com.fdkankan.manage.entity.CameraDetail;
 
 import java.util.HashMap;
 import java.util.List;
@@ -17,7 +16,7 @@ import java.util.List;
  */
 public interface ICameraDetailService extends IService<CameraDetail> {
 
-    void unbindCamera(Long cameraId, User user);
+    void unbindCamera(Long cameraId);
 
     CameraDetail getByCameraId(Long cameraId);
 

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

@@ -3,7 +3,6 @@ package com.fdkankan.manage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Camera;
-import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.CameraParam;
 
@@ -23,7 +22,7 @@ public interface ICameraService extends IService<Camera> {
 
     Camera getBySnCode(String snCode);
 
-    void unbindCamera(Long cameraId, User user);
+    void unbindCamera(Long cameraId);
 
     PageInfo pageList(CameraParam param);
 

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

@@ -40,15 +40,20 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     ISceneService sceneService;
     @Autowired
     IFdkkLaserService fdkkLaserService;
-
+    @Autowired
+    IUserService userService;
 
 
     @Override
-    public void unbindCamera(Long cameraId, User user) {
+    public void unbindCamera(Long cameraId) {
         CameraDetail cameraDetail = this.getByCameraId(cameraId);
         if(cameraDetail == null){
             throw new BusinessException(ErrorCode.CAMERA_BIND_NO_EXIST);
         }
+        User user = userService.getById(cameraDetail.getUserId());
+        if(user == null){
+            throw new BusinessException(ErrorCode.USER_NOT_EXIST);
+        }
         String snCode = null;
         String cooperationUserName = null;
         if(cameraDetail.getType() == CameraTypeEnum.LASER_TURN.getType()){

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

@@ -13,7 +13,6 @@ import com.fdkankan.manage.constant.CameraConstant;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.Company;
-import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.mapper.ICameraMapper;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
@@ -78,8 +77,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public void unbindCamera(Long cameraId, User user) {
-        cameraDetailService.unbindCamera(cameraId, user); //取消相机用户关联
+    public void unbindCamera(Long cameraId) {
+        cameraDetailService.unbindCamera(cameraId); //取消相机用户关联
         userIncrementService.unbindCamera(cameraId);        //取消关联用户权益
         sceneService.unbindCamera(cameraId);                //取消关联场景
         sceneProService.unbindCamera(cameraId);             //取消关联场景
@@ -264,6 +263,15 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(param.getId());
+        if(cameraDetail == null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        if(StringUtils.isNotBlank(param.getCompanyName())){
+            Company company = companyService.getCompanyByName(param.getCompanyName());
+            if(company !=null){
+                cameraDetail.setCompanyId(company.getId());
+            }
+        }
         cameraDetail.setOwn(param.getOutType());
         cameraDetail.setOrderSn(param.getOrderSn());
         cameraDetailService.updateById(cameraDetail);
@@ -274,6 +282,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         if(id == null){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(id);
+        if(cameraDetail !=null && cameraDetail.getUserId()!=null){
+            throw new BusinessException(-1,"相机已绑定，请先解绑后删除");
+        }
         this.removeById(id);
         cameraDetailService.deleteByCameraId(id);
     }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/request/OrderParam.java

@@ -5,10 +5,10 @@ import lombok.Data;
 
 @Data
 public class OrderParam extends RequestBase {
-    private String orderSn;
-    private String userName;
-    private String startTime;
-    private String endTime;
-    private String tradeNum;
-    private String expressNum;
+    private String orderSn;         //订单号
+    private String userName;        //用户账号
+    private String startTime;       //开始时间
+    private String endTime;         //结束时间
+    private String tradeNum;        //交易号
+    private String expressNum;      //快递单号
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -6,8 +6,8 @@ import lombok.Data;
 @Data
 public class SceneParam extends RequestBase {
     private String num;
-    private String sceneName;
-    private String snCode;
-    private String userName;
-    private Integer type = 0;  //0 看看，1看见，2深时
+    private String sceneName;   //场景标题
+    private String snCode;      //sn码
+    private String userName;    //绑定账号
+    private Integer type = 0;   //0 看看，1看见，2深时
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/CompanyVo.java

@@ -4,12 +4,12 @@ import lombok.Data;
 
 @Data
 public class CompanyVo {
-    private Long id;
-    private String companyName;
-    private String companyDesc;
-    private Long cameraCount;
-    private Long sceneCount;
-    private Long createUserId;
-    private String createUserName;
-    private String createTime;
+    private Long id;                        //客户ID
+    private String companyName;             //客户名称
+    private String companyDesc;             //客户描述
+    private Long cameraCount;               //设备数
+    private Long sceneCount;                //场景数
+    private Long createUserId;              //创建人id
+    private String createUserName;          //创建人名称
+    private String createTime;              //创建时间
 }

4dkankan-center-manage/src/main/java/com/fdkankan/manage/vo/response/OrderItemVo.java

@@ -4,8 +4,8 @@ import lombok.Data;
 
 @Data
 public class OrderItemVo {
-    private String goodsName;
-    private String goodsPrice;
-    private String goodsCount;
-    private String goodsPic;
+    private String goodsName;           //商品名称
+    private String goodsPrice;          //商品价格
+    private String goodsCount;          //购买数量
+    private String goodsPic;            //商品图片
 }