1

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

@@ -31,8 +31,8 @@ public class RtkDevice implements Serializable {
     @TableField("rtk_sn_code")
     private String rtkSnCode;
 
-    @TableField("camera_sn_code")
-    private String cameraSnCode;
+    @TableField("camera_sn")
+    private String cameraSn;
 
     @TableField("sg_rtk_sn")
     private String sgRtkSn;

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

@@ -104,7 +104,7 @@ public class InnerController extends BaseController {
         //rtkDevice.getType() = 0板卡自带账号信息，无需关联
         Integer rtkAccountId = null;
         if(rtkDevice.getRtkType() != 0){
-            RtkAccount rtkAccount = rtkAccountService.getOneNotUseAccount(rtkSnCode,rtkDevice.getCameraSnCode());
+            RtkAccount rtkAccount = rtkAccountService.getOneNotUseAccount(rtkSnCode,rtkDevice.getCameraSn());
             rtkAccountId = rtkAccount.getId();
             BeanUtils.copyProperties(rtkAccount,rtkInfo);
         }

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

@@ -63,8 +63,8 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
         if(StringUtils.isNotBlank(param.getRtkSnCode())){
             wrapper.like(RtkDevice::getRtkSnCode,param.getRtkSnCode());
         }
-        if(StringUtils.isNotBlank(param.getCameraSnCode())){
-            wrapper.like(RtkDevice::getCameraSnCode,param.getCameraSnCode());
+        if(StringUtils.isNotBlank(param.getCameraSn())){
+            wrapper.like(RtkDevice::getCameraSn,param.getCameraSn());
         }
         if(StringUtils.isNotBlank(param.getSgRtkSn())){
             wrapper.like(RtkDevice::getSgRtkSn,param.getSgRtkSn());
@@ -111,8 +111,8 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
             throw new BusinessException(ResultCode.SGRTK_SN_EXIST);
         }
         RtkDevice  rtkDevice3 = null;
-        if(StringUtils.isNotBlank(param.getCameraSnCode())){
-            rtkDevice3 = this.getByCameraSn(param.getCameraSnCode());
+        if(StringUtils.isNotBlank(param.getCameraSn())){
+            rtkDevice3 = this.getByCameraSn(param.getCameraSn());
         }
         if(rtkDevice3 != null && param.getId() == null){
             throw new BusinessException(ResultCode.CAMERA_SN_EXIST);
@@ -156,7 +156,7 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
     @Override
     public RtkDevice getByCameraSn(String cameraSnCode) {
         LambdaQueryWrapper<RtkDevice> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(RtkDevice::getCameraSnCode,cameraSnCode);
+        wrapper.eq(RtkDevice::getCameraSn,cameraSnCode);
         return this.getOne(wrapper);
     }
 
@@ -212,7 +212,7 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
         for (RtkDeviceInParam param : params) {
             RtkDevice rtkDevice = new RtkDevice();
             rtkDevice.setRtkSnCode(param.getRtkSn());
-            rtkDevice.setCameraSnCode(param.getCameraSn());
+            rtkDevice.setCameraSn(param.getCameraSn());
             rtkDevice.setSgRtkSn(param.getRtkSgSn());
             rtkDevice.setRtkType(param.getRtkType());
             rtkDevice.setCreateUserId(Long.valueOf( StpUtil.getLoginId().toString()));

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

@@ -59,8 +59,8 @@ public class RtkInfoServiceImpl extends ServiceImpl<IRtkInfoMapper, RtkInfo> imp
         if(StringUtils.isNotBlank(param.getOperator())){
             wrapper.like(RtkInfo::getOperator,param.getOperator());
         }
-        if(StringUtils.isNotBlank(param.getCameraSnCode())){
-            wrapper.like(RtkInfo::getCameraSnCode,param.getCameraSnCode());
+        if(StringUtils.isNotBlank(param.getCameraSn())){
+            wrapper.like(RtkInfo::getCameraSnCode,param.getCameraSn());
         }
         if(StringUtils.isNotBlank(param.getSgRtkSn())){
             wrapper.like(RtkInfo::getSgRtkSn,param.getSgRtkSn());

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

@@ -78,8 +78,8 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
         if(StringUtils.isNotBlank(param.getRtkSnCode())){
             wrapper.like(RtkUseLog::getRtkSnCode,param.getRtkSnCode());
         }
-        if(StringUtils.isNotBlank(param.getCameraSnCode())){
-            wrapper.like(RtkUseLog::getCameraSn,param.getCameraSnCode());
+        if(StringUtils.isNotBlank(param.getCameraSn())){
+            wrapper.like(RtkUseLog::getCameraSn,param.getCameraSn());
         }
         if(StringUtils.isNotBlank(param.getSgRtkSn())){
             wrapper.like(RtkUseLog::getSgRtkSn,param.getSgRtkSn());

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

@@ -10,7 +10,7 @@ public class RtkInfoParam extends RequestBase{
     private String rtkSnCode;
     private String userName;
     private String operator;
-    private String cameraSnCode;
+    private String cameraSn;
     private String sgRtkSn;
     private Integer useType;