设备出库，购买时间

README.md

@@ -60,4 +60,8 @@
     http://120.25.146.52:3090/project/102/interface/api/5750
 6.下载订单列表添加返回
     http://120.25.146.52:3090/project/102/interface/api/5942
+7.设备列表添加返回
+    http://120.25.146.52:3090/project/102/interface/api/5768
+8.相机出库添加参数
+    http://120.25.146.52:3090/project/102/interface/api/5786
 ~~~~

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

@@ -132,6 +132,12 @@ public class CameraDetail implements Serializable {
     private String outTime;
 
     /**
+     * 购买时间
+     */
+    @TableField("buy_date")
+    private String buyDate;
+
+    /**
      * 记录的状态，A: 生效，I: 禁用
      */
     @TableField("rec_status")

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

@@ -354,6 +354,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(param.getAgentId() != null){
                 cameraDetail.setAgentId(param.getAgentId());
             }
+            cameraDetail.setBuyDate(param.getBuyDate());
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());

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

@@ -124,8 +124,9 @@ public class ExcelServiceImpl implements IExcelService {
                 String companyName = map.get(2);
                 String orderSn = map.get(3);
                 String agentName = map.get(4);
+                String buyDate = map.get(5);
                 CameraOutTypeEnum outTypeEnum = CameraOutTypeEnum.getByMsg(outTypeString);
-                if(outTypeEnum == null || StringUtils.isBlank(snCode)){
+                if(outTypeEnum == null || StringUtils.isBlank(snCode) || StringUtils.isBlank(buyDate)){
                     log.error("outError-->出库错误:出库类型为空或snCode为空:snCode:{},outType:{},companyName:{},orderSn:{},agentName:{}"
                             ,snCode,outTypeString,companyName,orderSn,agentName);
                     errorIndex.add(index -3);
@@ -135,6 +136,7 @@ public class ExcelServiceImpl implements IExcelService {
                     int outType = outTypeEnum.getCode();
                     param.setOutType(outType);
                 }
+                param.setBuyDate(buyDate);
                 if(StringUtils.isNotBlank(agentName)){
                     AgentNew agentNew = agentNewService.getByName(agentName);
                     if(agentNew == null){

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

@@ -6,10 +6,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 public class Dateutils {
 
@@ -192,4 +189,24 @@ public class Dateutils {
         Date date = new Date();
         return simpleDateFormat.format(date);
     }
+
+    /*日期加+1天*/
+    public static Date dateAddOneYear(Date date,Integer i) {
+        Calendar  calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(Calendar.YEAR,i); //把日期往后增加一天,整数  往后推,负数往前移动
+        date=calendar.getTime(); //这个时间就是日期往后推一天的结果
+        return date;
+
+    }
+
+    /*日期加+1天*/
+    public static Date dateAddOne(Date date,Integer i) {
+        Calendar  calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE,i); //把日期往后增加一天,整数  往后推,负数往前移动
+        date=calendar.getTime(); //这个时间就是日期往后推一天的结果
+        return date;
+
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/CameraInOutParam.java

@@ -13,4 +13,6 @@ public class CameraInOutParam {
     private String companyName;     //客户名
 
     private Integer agentId;
+
+    private String buyDate;
 }

src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -1,9 +1,12 @@
 package com.fdkankan.manage.vo.response;
 
 import com.fdkankan.manage.constant.CameraOutTypeEnum;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Date;
+
 @Data
 public class CameraDetailVo {
     private Long id;                    //相机id
@@ -22,5 +25,16 @@ public class CameraDetailVo {
     private Integer agentId;
     private String agentName;
 
+    private String buyDate;
+    private String warrantyDate;
 
+    public String getWarrantyDate() {
+        if(StringUtils.isBlank(buyDate)){
+            return null;
+        }
+        Date outTime =  Dateutils.getDate(buyDate);
+        Date date = Dateutils.dateAddOneYear(outTime, 1);
+        date = Dateutils.dateAddOne(date, 7);
+        return Dateutils.getDayDate(date) +" 23:59:59";
+    }
 }

src/main/resources/mapper/manage/CameraMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.CameraDetailVo">
         select c.id ,c.sn_code,c.activated_time ,d.create_time as outTime ,d.type,d.own as outType ,co.company_name ,u.user_name, c.wifi_name,
-        d.order_sn,an.id as agentId,an.name as agentName
+        d.order_sn,an.id as agentId,an.name as agentName,d.buy_date
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
         left join t_company co on d.company_id = co.id