Merge branch 'test'

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

@@ -1,12 +1,11 @@
 package com.fdkankan.manage.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,6 +61,10 @@ public class RtkDevice implements Serializable {
     @TableField("del_user_id")
     private Long delUserId;
 
+    @TableField(value = "failure_time",updateStrategy = FieldStrategy.IGNORED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date failureTime;
+
     @TableField(exist = false)
     private String createUserName;
     @TableField(exist = false)

src/main/java/com/fdkankan/manage/inner/controller/InnerController.java

@@ -113,6 +113,10 @@ public class InnerController extends BaseController {
         rtkInfo.setRtkType(rtkDevice.getRtkType());
         //rtkDevice.getType() = 0板卡自带账号信息，无需关联
         Integer rtkAccountId = null;
+        if(rtkDevice.getRtkType() == 0 && rtkDevice.getFailureTime() != null && rtkDevice.getFailureTime().getTime() <= new Date().getTime()){
+            rtkDevice.setRtkType(1);
+            rtkDeviceService.updateTypeById(rtkDevice.getId(),1);
+        }
         if(rtkDevice.getRtkType() != 0){
             RtkAccount rtkAccount = rtkAccountService.getOneNotUseAccount(rtkSnCode,rtkDevice.getCameraSn());
             rtkAccountId = rtkAccount.getId();

src/main/java/com/fdkankan/manage/service/IRtkDeviceService.java

@@ -31,4 +31,6 @@ public interface IRtkDeviceService extends IService<RtkDevice> {
     RtkDevice getByCameraSn(String cameraSnCode);
 
     Integer insExcelList(List<HashMap<Integer, String>> excelRowList);
+
+    void updateTypeById(Integer id, Integer rtkType);
 }

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

@@ -83,10 +83,11 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
             String jsonStr = redisUtil.get(redisKey);
             RtkAccount rtkAccount = JSONObject.parseObject(jsonStr, RtkAccount.class);
             log.info("rtkAccount:{}",jsonStr);
-            Boolean flag = checkAccountFailureTime(rtkAccount.getId());
+            RtkAccount dbRtkAccount = this.getById(rtkAccount.getId());
+            Boolean flag = checkAccountFailureTime(dbRtkAccount);
             if(flag){
-                redisUtil.expire(redisKey,time);
-                return rtkAccount;
+                redisUtil.set(redisKey,JSONObject.toJSONString(dbRtkAccount),time);
+                return dbRtkAccount;
             }else {
                 redisUtil.del(redisKey);
             }
@@ -118,8 +119,8 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
     }
 
 
-    private Boolean checkAccountFailureTime(Integer accountId) {
-        RtkAccount dbRtkAccount = this.getById(accountId);
+    private Boolean checkAccountFailureTime(RtkAccount dbRtkAccount) {
+
         if(dbRtkAccount == null  || dbRtkAccount.getUseStatus() == 1){
             return false;
         }

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

@@ -169,6 +169,14 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
     }
 
     @Override
+    public void updateTypeById(Integer id, Integer rtkType) {
+        LambdaUpdateWrapper<RtkDevice> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(RtkDevice::getId,id);
+        wrapper.set(RtkDevice::getRtkType,rtkType);
+        this.update(wrapper);
+    }
+
+    @Override
     public Integer insExcelList(List<HashMap<Integer, String>> excelRowList) {
         List<RtkDeviceInParam> params = new ArrayList<>();
         List<Integer> errorIndex = new ArrayList<>();

src/main/java/com/fdkankan/manage/task/TaskService.java

@@ -68,6 +68,7 @@ public class TaskService {
         String redisKey = "4dkankan:rtk:snCode:*";
         Set<String> keys = redisUtil.keys(redisKey);
         if(keys!= null && !keys.isEmpty()){
+            log.debug("checkAccount-正在使用的rtk账号数量为：{}",keys);
             for (String key : keys) {
                 String jsonStr = redisUtil.get(key);
                 RtkAccount rtkAccount = JSONObject.parseObject(jsonStr, RtkAccount.class);

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

@@ -10,10 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 public class ExcelUtil {
 
@@ -65,7 +62,7 @@ public class ExcelUtil {
         //行List,也是最终要返回的List
         List<HashMap<Integer,String>> rowList=new ArrayList<>();
         Workbook workbook=getExcelWorkBook(multipartFile);
-        Sheet sheet = workbook.getSheetAt(0);
+        Sheet sheet = workbook.getSheetAt(1);
         if (sheet == null) {
             throw new IOException("创建Sheet失败！");
         }
@@ -80,7 +77,6 @@ public class ExcelUtil {
                 if(ObjectUtils.isNotEmpty(cell)){
                     DataFormatter dataFormatter = new DataFormatter();
                     String cellValue = dataFormatter.formatCellValue(cell);
-                    System.out.println(cellValue);
                     map.put(cellNum,cellValue);
                 }
 
@@ -91,7 +87,20 @@ public class ExcelUtil {
     }
 
     public static void main(String[] args) throws IOException {
-        getExcelRowList(new File("D:\\abc\\111111\\rtk账号导入模板 (1).xlsx"));
+        HashSet<String> strings = new HashSet<>();
+        List<HashMap<Integer, String>> excelRowList = getExcelRowList(new File("D:\\abc\\111111\\物料创建9.20.xlsx"));
+        Integer index = 0;
+        for (HashMap<Integer, String> map : excelRowList) {
+            index ++;
+            if(index == 1){
+                continue;
+            }
+            String num = map.get(1).trim();
+            if(strings.contains(num)){
+                System.out.println("重复："+num);
+            }
+            strings.add(num);
+        }
     }