添加备注完善文档

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

@@ -4,20 +4,14 @@ 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.constant.CameraOutTypeEnum;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.ICompanyService;
 import com.fdkankan.manage.service.IOrderService;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.CameraParam;
-import com.fdkankan.manage.vo.response.CameraOutType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 @RestController
 @RequestMapping("/service/manage/camera")
 public class CameraController {
@@ -34,24 +28,30 @@ public class CameraController {
         return ResultData.ok(cameraService.pageList(param));
     }
 
+    /**
+     *  入库
+     *  wifiName  wifi名称
+     */
     @PostMapping("/in")
     public ResultData in(@RequestBody CameraInOutParam param) {
         cameraService.in(param.getWifiName());
         return ResultData.ok();
     }
-    @GetMapping("/getOutParam")
+
+    /**
+     * 获取参数下拉框列表
+     * @param type   0客户名称下拉框，1订单号下拉框，
+     * @param companyName
+     * @param orderSn
+     */
+    @GetMapping("/getParam")
     public ResultData getOutParam(@RequestParam(required = false,defaultValue = "0") Integer type,
                                   @RequestParam(required = false) String companyName,
                                   @RequestParam(required = false) String orderSn){
         switch (type){
             case 0:
-                List<CameraOutType> list  = new ArrayList<>();
-                Arrays.asList(CameraOutTypeEnum.values())
-                        .forEach((item -> list.add(new CameraOutType(item.getCode(),item.getMsg()))));
-                return ResultData.ok(list);
-            case 1:
                 return ResultData.ok(companyService.getCompanyName(companyName));
-            case 2:
+            case 1:
                 return ResultData.ok(orderService.getOrderSn(orderSn));
             default:
                 throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -11,6 +11,7 @@ import com.fdkankan.manage.service.IUserService;
 import com.fdkankan.manage.vo.request.CameraParam;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 import com.fdkankan.manage.vo.request.UserParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,13 +39,19 @@ public class UserController {
         return ResultData.ok(userService.pageList(param));
     }
 
-    @GetMapping("/getIncrementListByUserId")
-    public ResultData getIncrementListByUserId(@RequestParam(required = false)Long userId,
-                                               @RequestParam(required = false,defaultValue = "1") Integer pageNum,
-                                               @RequestParam(required = false,defaultValue = "10") Integer pageSize){
-        return ResultData.ok(userIncrementService.pageList(userId,pageNum,pageSize));
+    /**
+     *  权益详情
+     */
+    @PostMapping("/getIncrementListByUserId")
+    public ResultData getIncrementListByUserId(@RequestBody UserParam param){
+        return ResultData.ok(userIncrementService.pageList(param.getId(),param.getPageNum(),param.getPageSize()));
     }
 
+    /**
+     *  权益延期
+     *  id      权益id
+     *  year    延期年限
+     */
     @PostMapping("/IncrementDelay")
     public ResultData IncrementDelay(@RequestBody UserIncrementParam param){
         if(param.getId() == null){
@@ -54,24 +61,38 @@ public class UserController {
         return ResultData.ok();
     }
 
+    /**
+     * 添加用户权益
+     * userId 用户id
+     * incrementEndTime 权益到期日期
+     */
     @PostMapping("/addUserIncrement")
     public ResultData addUserIncrement(@RequestBody UserIncrementParam param){
-        if(param.getUserId() == null){
+        if(param.getUserId() == null || StringUtils.isEmpty(param.getIncrementEndTime())){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         userIncrementService.add(param);
         return ResultData.ok();
     }
 
+    /**
+     * 添加下载次数
+     * userId        用户id
+     * count        下载次数
+     */
     @PostMapping("/addDownNum")
     public ResultData addDownNum(@RequestBody UserIncrementParam param){
-        if(param.getUserId() == null){
+        if(param.getUserId() == null || param.getCount() == null){
             throw  new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
         userService.addDownNum(param);
         return ResultData.ok();
     }
 
+    /**
+     * 获取相机详情
+     * userId          用户id
+     */
     @PostMapping("/getCameraDetail")
     public ResultData getCameraDetail(@RequestBody CameraParam cameraParam){
         if(cameraParam.getUserId() == null){
@@ -80,6 +101,11 @@ public class UserController {
         return ResultData.ok(cameraService.pageList(cameraParam));
     }
 
+    /**
+     * 解绑相机
+     * @param cameraId      相机id
+     * @param userId        用户id
+     */
     @GetMapping("/unbindCamera")
     public ResultData unbindCamera(@RequestParam(required = false)Long cameraId,
                                    @RequestParam(required = false)Long userId){

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface ICompanyService extends IService<Company> {
 
-    List<Company> getCompanyName(String content);
+    List<String> getCompanyName(String content);
 
     Company getCompanyByName(String companyName);
 

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

@@ -10,7 +10,6 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.constant.CameraConstant;
-import com.fdkankan.manage.constant.CameraOutTypeEnum;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.Company;
@@ -90,14 +89,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     @Override
     public PageInfo pageList(CameraParam param) {
         Page<CameraDetailVo> voPage = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
-        for (CameraDetailVo record : voPage.getRecords()) {
-            CameraOutTypeEnum cameraOutTypeEnum = CameraOutTypeEnum.getByCode(record.getOutType());
-            if(cameraOutTypeEnum != null){
-                record.setOutTypeString(cameraOutTypeEnum.getMsg());
-            }else {
-                record.setOutTypeString("未出库");
-            }
-        }
         return PageInfo.PageInfo(voPage);
     }
 
@@ -185,9 +176,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
     @Override
     public void out(CameraInOutParam param) {
-        if(param.getOutType() == null || param.getCompanyId() == null || StringUtils.isEmpty(param.getSnCode())){
+        if(param.getOutType() == null || param.getCompanyName() == null || StringUtils.isEmpty(param.getSnCode())){
             throw  new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
         }
+        Company company = companyService.getCompanyByName(param.getCompanyName());
+        if(company == null){
+            throw new BusinessException(-1,"客户名称不存在");
+        }
+        param.setCompanyId(company.getId());
         Camera camera = this.getBySnCode(param.getSnCode());
         if(camera == null){
             throw new BusinessException(-1,"相机不存在");

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -31,10 +32,10 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     ICameraDetailService cameraDetailService;
 
     @Override
-    public List<Company> getCompanyName(String content) {
+    public List<String> getCompanyName(String content) {
         LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(Company::getCompanyName,content);
-        return this.list(wrapper);
+        return this.list(wrapper).parallelStream().map(Company::getCompanyName).collect(Collectors.toList());
     }
 
     @Override

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

@@ -4,6 +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.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
@@ -54,6 +55,9 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
     @Override
     public PageInfo pageList(Long userId, Integer pageNum, Integer pageSize) {
+        if(userId == null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
         LambdaQueryWrapper<UserIncrement> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(UserIncrement::getUserId,userId);
         Page<UserIncrement> page = this.page(new Page<>(pageNum, pageSize), wrapper);

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

@@ -6,9 +6,9 @@ import lombok.Data;
 public class CameraInOutParam {
     private Long id;
     private String wifiName;
-    private Integer outType;
+    private Integer outType;        //出库类型 0表示正常销售，1表示员工自用，2表示礼品赠送，3表示其他
     private Long companyId;
-    private String orderSn;
+    private String orderSn;         //订单号
     private String snCode;
-    private String companyName;
+    private String companyName;     //客户名
 }

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

@@ -5,13 +5,13 @@ import lombok.Data;
 
 @Data
 public class CameraParam extends RequestBase {
-    private Long id;
-    private Long userId;
-    private String snCode;
-    private String companyName;
-    private String userName;
-    private Integer outType;
-    private Integer type;
-    private String activatedStartTime;
-    private String activatedEndTime;
+    private Long id;                            //设备id
+    private Long userId;                        //用户id
+    private String snCode;                      //相机snCode
+    private String companyName;                 //客户名称
+    private String userName;                    //账号
+    private Integer outType;                    //出库类型 0表示正常销售，1表示员工自用，2表示礼品赠送，3表示其他
+    private Integer type;                       //设备类型  0旧双目相机，1 四维看看 ，2 四维看看lite，9四维看见，10四维深时
+    private String activatedStartTime;          //激活时间
+    private String activatedEndTime;            //激活时间
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 @Data
 public class UserParam extends RequestBase {
+    private Long id;
     private String userName;
     private String email;
 }

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

@@ -1,18 +1,39 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fdkankan.manage.constant.CameraOutTypeEnum;
 import lombok.Data;
 
 @Data
 public class CameraDetailVo {
-    private Long id;
-    private String snCode;
-    private String activatedTime;
-    private String outTime;
+    private Long id;                    //相机id
+    private String snCode;              //snCode
+    private String activatedTime;       //激活时间
+    private String outTime;             //出库时间
+
+    private String wifiName;            //wifi名称
+    private String type;                //相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+    private String outType;             //出库类型
+    private String companyName;         //客户名称
+    private String userName;            //绑定账号
+
+    public String getOutType(){
+        CameraOutTypeEnum cameraOutTypeEnum = CameraOutTypeEnum.getByCode(Integer.parseInt(outType));
+        if(cameraOutTypeEnum != null){
+            return cameraOutTypeEnum.getMsg();
+        }else {
+            return "未出库";
+        }
+    }
+
+    public String getType(){
+        switch (type){
+            case "0" :return "旧双目";
+            case "1" :return "四维看看";
+            case "2" :return "四维看看Lite";
+            case "9" :return "四维看见";
+            case "10" :return "四维深时";
+            default: return "";
+        }
+    }
 
-    private String wifiName;
-    private String type;
-    private Integer outType;
-    private String outTypeString;
-    private String companyName;
-    private String userName;
 }

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

@@ -4,8 +4,8 @@ import lombok.Data;
 
 @Data
 public class UserIncrementVo {
-    private Long id;
-    private String snCode;
-    private String incrementStartTime;
-    private String incrementEndTime;
+    private Long id;                                //会员权益id
+    private String snCode;                          //相机snCode
+    private String incrementStartTime;              //购买日期
+    private String incrementEndTime;                //到期日期
 }