1

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

@@ -180,11 +180,11 @@ public class AuthorizeRtk implements Serializable {
     @ExcelProperty(value = "充值方式",index = 14)
     private String payMethod ="线下" ;
 
-    @TableField(exist = false)
+    @TableField("sg_rtk_sn")
     @ExcelProperty(value = "深光rtk插件SN号",index = 17)
     private String sgRtkSn  ;
 
-    @TableField(exist = false)
+    @TableField("camera_sn")
     @ExcelProperty(value = "相机SN",index = 15)
     private String cameraSn  ;
 

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

@@ -105,10 +105,10 @@ public class RtkDevice implements Serializable {
     private String createNickName;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField("valid_start_time")
+    @TableField(exist = false)
     private Date validStartTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField("valid_end_time")
+    @TableField(exist = false)
     private Date validEndTime;
 }

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

@@ -108,7 +108,7 @@ public class InnerController extends BaseController {
         }
         //2.9.0授权期限相机
         if(rtkDevice.getAccountType() ==2){
-            List<AuthorizeRtk> authorizeRtks = authorizeRtkService.getByRtkCode(rtkDevice.getRtkSnCode());
+            List<AuthorizeRtk> authorizeRtks = authorizeRtkService.getByRtkId(rtkDevice.getId());
             if(authorizeRtks == null || authorizeRtks.isEmpty()){
                 throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_AUTH);
             }

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

@@ -6,6 +6,7 @@ import com.fdkankan.manage.vo.request.AuthorizeParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -24,5 +25,7 @@ public interface IAuthorizeRtkService extends IService<AuthorizeRtk> {
 
     void export(HttpServletRequest req, HttpServletResponse resp);
 
-    List<AuthorizeRtk> getByRtkCode(String rtkSnCode);
+    List<AuthorizeRtk> getByRtkId(Integer rtkId);
+
+    HashMap<Integer, AuthorizeRtk> getByRtkIds(List<Integer> ids);
 }

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

@@ -35,7 +35,6 @@ public interface IRtkDeviceService extends IService<RtkDevice> {
 
     void updateTypeById(Integer id, Integer rtkType);
 
-    void updateValidTime(Integer id, String startTime, String endTime);
 
     HashMap<String, RtkDevice> getByRtkSnCodeList(Set<String> rtkCodes);
 }

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

@@ -70,25 +70,25 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
 
         DateTime startDate = DateUtil.parse(startTime);
         DateTime endDate = DateUtil.parse(endTime);
-        if(rtkDevice.getValidStartTime() != null && rtkDevice.getValidEndTime() != null){
 
-            if(startDate.isBefore(rtkDevice.getValidStartTime())){
-                throw new BusinessException(ResultCode.RTK_TIME_ERROR);
-            }
-            if(endDate.isBefore(rtkDevice.getValidEndTime())){
-                throw new BusinessException(ResultCode.RTK_TIME_ERROR);
-            }
-
-            if(DateUtil.isIn(startDate,rtkDevice.getValidStartTime(),rtkDevice.getValidEndTime())){
-                throw new BusinessException(ResultCode.RTK_TIME_ERROR);
-            }
-            if(DateUtil.isIn(endDate,rtkDevice.getValidStartTime(),rtkDevice.getValidEndTime())){
-                throw new BusinessException(ResultCode.RTK_TIME_ERROR);
+        List<AuthorizeRtk> authorizeRtks = this.getByRtkId(rtkDevice.getId());
+        if(authorizeRtks != null && !authorizeRtks.isEmpty()){
+            for (AuthorizeRtk db : authorizeRtks) {
+                if(startDate.isBefore(db.getValidStartTime())){
+                    throw new BusinessException(ResultCode.RTK_TIME_ERROR);
+                }
+                if(endDate.isBefore(db.getValidEndTime())){
+                    throw new BusinessException(ResultCode.RTK_TIME_ERROR);
+                }
+                if(DateUtil.isIn(startDate,db.getValidStartTime(),db.getValidEndTime())){
+                    throw new BusinessException(ResultCode.RTK_TIME_ERROR);
+                }
+                if(DateUtil.isIn(endDate,db.getValidStartTime(),db.getValidEndTime())){
+                    throw new BusinessException(ResultCode.RTK_TIME_ERROR);
+                }
             }
-
         }
 
-        rtkDeviceService.updateValidTime(rtkDevice.getId(),startTime,endTime);
 
         authorizeRtk.setValidStartTime(startDate);
         authorizeRtk.setValidEndTime(endDate);
@@ -143,18 +143,11 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
         Page<AuthorizeRtk> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> sysIds = page.getRecords().stream().map(AuthorizeRtk::getSysUserId).collect(Collectors.toSet());
         HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
-        Set<String> rtkCodes = page.getRecords().stream().map(AuthorizeRtk::getRtkSnCode).collect(Collectors.toSet());
-        HashMap<String, RtkDevice> rtkMap = rtkDeviceService.getByRtkSnCodeList(rtkCodes);
         for (AuthorizeRtk record : page.getRecords()) {
             SysUser sysUser = userMap.get(record.getSysUserId());
             if(sysUser != null){
                 record.setSysUserName(sysUser.getNickName());
             }
-            RtkDevice rtkDevice = rtkMap.get(record.getRtkSnCode());
-            if(rtkDevice!= null){
-                record.setSgRtkSn(rtkDevice.getSgRtkSn());
-                record.setCameraSn(rtkDevice.getCameraSn());
-            }
         }
         return page;
     }
@@ -186,10 +179,37 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
         }
     }
 
+
     @Override
-    public List<AuthorizeRtk> getByRtkCode(String rtkSnCode) {
+    public List<AuthorizeRtk> getByRtkId(Integer rtkId) {
         LambdaQueryWrapper<AuthorizeRtk> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AuthorizeRtk::getRtkSnCode,rtkSnCode);
+        wrapper.eq(AuthorizeRtk::getRtkDeviceId,rtkId);
+        wrapper.orderByDesc(AuthorizeRtk::getId);
         return this.list(wrapper);
     }
+
+    @Override
+    public HashMap<Integer, AuthorizeRtk> getByRtkIds(List<Integer> ids) {
+        HashMap<Integer, AuthorizeRtk> map = new HashMap<>();
+        if(ids == null || ids.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<AuthorizeRtk> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AuthorizeRtk::getRtkDeviceId,ids);
+        wrapper.orderByDesc(AuthorizeRtk::getId);
+        List<AuthorizeRtk> list = this.list(wrapper);
+
+        for (AuthorizeRtk authorizeRtk : list) {
+            if(map.get(authorizeRtk.getRtkDeviceId()) == null){
+                map.put(authorizeRtk.getRtkDeviceId(),authorizeRtk);
+            }else {
+                AuthorizeRtk authorizeRtk1 = map.get(authorizeRtk.getRtkDeviceId());
+                if(authorizeRtk.getId() > authorizeRtk1.getId()){
+                    map.put(authorizeRtk.getRtkDeviceId(),authorizeRtk);
+                }
+            }
+        }
+
+        return map;
+    }
 }

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

@@ -46,6 +46,8 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
     ICameraService cameraService;
     @Autowired
     ICameraDetailService cameraDetailService;
+    @Autowired
+    IAuthorizeRtkService authorizeRtkService;
     @Override
     public RtkDevice getByRtkSnCode(String rtkSnCode) {
         LambdaQueryWrapper<RtkDevice> wrapper = new LambdaQueryWrapper<>();
@@ -85,7 +87,9 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
         wrapper.orderByDesc(RtkDevice::getId);
         Page<RtkDevice> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         Set<Long> createUserIds = page.getRecords().stream().map(RtkDevice::getCreateUserId).collect(Collectors.toSet());
+        List<Integer> ids = page.getRecords().stream().map(RtkDevice::getId).collect(Collectors.toList());
         HashMap<Long, SysUser> byIds = sysUserService.getByIds(createUserIds);
+        HashMap<Integer,AuthorizeRtk> map =  this.authorizeRtkService.getByRtkIds(ids);
 
         for (RtkDevice record : page.getRecords()) {
             SysUser sysUser = byIds.get(record.getCreateUserId());
@@ -291,14 +295,6 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
     }
 
 
-    @Override
-    public void updateValidTime(Integer id, String startTime, String endTime) {
-        LambdaUpdateWrapper<RtkDevice> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(RtkDevice::getId,id);
-        wrapper.set(RtkDevice::getValidStartTime,startTime);
-        wrapper.set(RtkDevice::getValidEndTime,endTime);
-        this.update(wrapper);
-    }
 
     @Override
     public HashMap<String, RtkDevice> getByRtkSnCodeList(Set<String> rtkCodes) {