1

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

@@ -109,9 +109,9 @@ public class AuthorizeRtk implements Serializable {
     /**
      * rtksn
      */
-    @TableField("rtk_code")
+    @TableField("rtk_sn_code")
     @ExcelProperty(value = "板卡SN号",index = 16)
-    private String rtkCode;
+    private String rtkSnCode;
 
     /**
      * 创建人

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

@@ -53,10 +53,10 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
     IExcelService excelService;
     @Override
     public void addAuth(AuthorizeRtk authorizeRtk) {
-        if(StringUtils.isBlank(authorizeRtk.getRtkCode()) ||authorizeRtk.getValidStartTime() == null || authorizeRtk.getValidEndTime() == null){
+        if(StringUtils.isBlank(authorizeRtk.getRtkSnCode()) ||authorizeRtk.getValidStartTime() == null || authorizeRtk.getValidEndTime() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        RtkDevice rtkDevice = rtkDeviceService.getByRtkSnCode(authorizeRtk.getRtkCode());
+        RtkDevice rtkDevice = rtkDeviceService.getByRtkSnCode(authorizeRtk.getRtkSnCode());
         if(rtkDevice == null || rtkDevice.getUseStatus() ==1){
             throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
         }
@@ -98,21 +98,21 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
 
     private Page<AuthorizeRtk> pageListByParam(AuthorizeParam param){
         LambdaQueryWrapper<AuthorizeRtk> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(param.getRktCode())){
-            wrapper.eq(AuthorizeRtk::getRtkCode,param.getRktCode());
+        if(StringUtils.isNotBlank(param.getRtkSnCode())){
+            wrapper.eq(AuthorizeRtk::getRtkSnCode,param.getRtkSnCode());
         }
         wrapper.orderByDesc(AuthorizeRtk::getId);
         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::getRtkCode).collect(Collectors.toSet());
+        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.getRtkCode());
+            RtkDevice rtkDevice = rtkMap.get(record.getRtkSnCode());
             if(rtkDevice!= null){
                 record.setSgRtkSn(rtkDevice.getSgRtkSn());
                 record.setCameraSn(rtkDevice.getCameraSn());
@@ -151,7 +151,7 @@ public class AuthorizeRtkServiceImpl extends ServiceImpl<IAuthorizeRtkMapper, Au
     @Override
     public List<AuthorizeRtk> getByRtkCode(String rtkSnCode) {
         LambdaQueryWrapper<AuthorizeRtk> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AuthorizeRtk::getRtkCode,rtkSnCode);
+        wrapper.eq(AuthorizeRtk::getRtkSnCode,rtkSnCode);
         return this.list(wrapper);
     }
 }

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

@@ -39,6 +39,6 @@ public class AuthorizeParam extends RequestBase{
 
     private String listType;
     private BigDecimal amount;
-    private String rktCode;
+    private String rtkSnCode;
 
 }