出库时间

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

@@ -1,15 +1,17 @@
 package com.fdkankan.manage.common;
 
+import cn.hutool.cache.Cache;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public enum CameraTypeEnum {
-    DOUBLE_EYE(0,"KK-","4DKKLITE_","旧双目相机"),
+    DOUBLE_EYE(0,"KK-","4DKK_","旧双目相机"),
     FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机"),
     FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
-    DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
-    LASER_TURN(10,"SS-","4DKKLA_","激光转台");
+    DOUBLE_EYE_TURN(9,"KJ-","4DKKMI_","双目转台"),
+    LASER_TURN(10,"SS-","4DSS_","激光转台");
 
 
     private int type;
@@ -30,8 +32,8 @@ public enum CameraTypeEnum {
     }
 
 
-    static Map<Integer,CameraTypeEnum> typeMaps = new HashMap<>(5);
-    static Map<String,Integer> typePrefixMap = new HashMap<>(5);
+    public static Map<Integer,CameraTypeEnum> typeMaps = new HashMap<>(5);
+    public static Map<String,Integer> typePrefixMap = new HashMap<>(5);
 
     static{
         for (CameraTypeEnum typeEnum : CameraTypeEnum.values()) {

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

@@ -79,5 +79,4 @@ public class Camera implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-    private Integer isOut;
 }

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

@@ -125,6 +125,11 @@ public class CameraDetail implements Serializable {
      */
     @TableField("update_time")
     private String updateTime;
+    /**
+     * 出库时间
+     */
+    @TableField("out_time")
+    private String outTime;
 
     /**
      * 记录的状态，A: 生效，I: 禁用

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

@@ -16,6 +16,7 @@ import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.Company;
 import com.fdkankan.manage.mapper.ICameraMapper;
 import com.fdkankan.manage.service.*;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
 import com.fdkankan.manage.vo.request.CameraParam;
 import com.fdkankan.manage.vo.response.CameraDetailVo;
@@ -124,7 +125,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             camera.setWifiPassword(CameraConstant.WIFI_PASSWORD_VALUE);
             camera.setChildPassword(CameraConstant.CHILD_PASSWORD_VALUE);
             camera.setActivatedTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
-            camera.setIsOut(0);
             cameraList.add(camera);
 
         }
@@ -134,6 +134,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (Camera camera : cameraList) {
             String wifiName = camera.getWifiName();
             Integer type = CameraTypeEnum.getTypeByWifiNamePrefix(wifiName.substring(0,wifiName.lastIndexOf("_") +1));
+            if(type == null){
+                throw new BusinessException(-1,"wifi名称前缀错误！");
+            }
             CameraDetail cameraDetail = new CameraDetail();
             cameraDetail.setAgency(CameraConstant.DEFAULT_AGENT);
             cameraDetail.setCameraId(camera.getId());
@@ -193,7 +196,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         for (String wifiName : newList) {
             int index = wifiNameList.indexOf(wifiName) + 3;
             if(bo){
-                if( !wifiName.contains("_") || !wifiName.contains("4D")){
+                if( !wifiName.contains("_") || !wifiName.contains("4D") || !CameraTypeEnum.typePrefixMap.containsKey(wifiName)){
                     errorIndexList.add(index);
                 }
             }else {
@@ -243,6 +246,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());
+            cameraDetail.setOutTime(Dateutils.getDate(new Date()));
             cameraDetails.add(cameraDetail);
         }
         return cameraDetailService.saveOrUpdateBatch(cameraDetails) ? cameraDetails.size() : 0;
@@ -356,7 +360,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         List<Integer> errorList = new ArrayList<>();
         for (String snCode : snCodeList) {
             Camera camera = snCodeMap.get(snCode);
-            if(camera == null || detailMap.get(camera.getId()) !=null){
+            if(camera == null || detailMap.get(camera.getId()) ==null){
                 errorList.add(snCodeList.indexOf(snCode) +3);
             }
         }

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

@@ -74,8 +74,8 @@ public class ExcelServiceImpl implements IExcelService {
         String originalFilename = file.getOriginalFilename();
         assert originalFilename != null;
         String fileType=originalFilename.substring(originalFilename.lastIndexOf(".")+1);
-        if (!fileType.equalsIgnoreCase("xls") && !fileType.equalsIgnoreCase("xlsx")) {
-            throw new BusinessException(50001,"文件格式校验，需为excel文件;");
+        if (!fileType.equalsIgnoreCase("xlsx")) {
+            throw new BusinessException(50001,"文件格式校验，需为xlsx文件;");
         }
         List<HashMap<Integer, String>> excelRowList = new ArrayList<>();
         try {
@@ -104,7 +104,9 @@ public class ExcelServiceImpl implements IExcelService {
                 int outType = outTypeEnum.getCode();
                 Company company = companyService.getCompanyByName(companyName);
                 CameraInOutParam param = new CameraInOutParam();
-                param.setCompanyId(company.getId());
+                if(company != null){
+                    param.setCompanyId(company.getId());
+                }
                 param.setOutType(outType);
                 param.setOrderSn(orderSn);
                 param.setSnCode(snCode);