lyhzzz 10 meses atrás
pai
commit
c91c592ab0

+ 6 - 0
src/main/java/com/fdkankan/manage/entity/RtkDevice.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,6 +64,10 @@ public class RtkDevice implements Serializable {
     @TableField("del_user_id")
     private Long delUserId;
 
+    @TableField("failure_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date failureTime;
+
     @TableField(exist = false)
     private String createUserName;
     @TableField(exist = false)

+ 4 - 0
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();

+ 2 - 0
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);
 }

+ 8 - 0
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::getRtkType,rtkType);
+        wrapper.set(RtkDevice::getId,id);
+        this.update(wrapper);
+    }
+
+    @Override
     public Integer insExcelList(List<HashMap<Integer, String>> excelRowList) {
         List<RtkDeviceInParam> params = new ArrayList<>();
         List<Integer> errorIndex = new ArrayList<>();