账号添加过期设置

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

@@ -34,6 +34,10 @@ public class RtkUseLog implements Serializable {
     @TableField("camera_sn")
     private String cameraSn;
 
+    @TableField("sg_rtk_sn")
+    private String sgRtkSn;
+
+
     @TableField("rtk_account_id")
     private Integer rtkAccountId;
 

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

@@ -158,6 +158,9 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
         if(StringUtils.isNotBlank(param.getUserName())){
             wrapper.like(RtkAccount::getUserName,param.getUserName());
         }
+        if(StringUtils.isNotBlank(param.getOperator())){
+            wrapper.like(RtkAccount::getOperator,param.getOperator());
+        }
         if(StringUtils.isNotBlank(param.getStartTime())&& StringUtils.isNotBlank(param.getEndTime()) ) {
             wrapper.between(RtkAccount::getCreateTime,param.getStartTime(),param.getEndTime());
         }

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

@@ -78,9 +78,18 @@ 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.getSgRtkSn())){
+            wrapper.like(RtkUseLog::getSgRtkSn,param.getSgRtkSn());
+        }
         if(StringUtils.isNotBlank(param.getUserName())){
             wrapper.like(RtkUseLog::getUserName,param.getUserName());
         }
+        if(param.getUseType() !=null){
+            wrapper.eq(RtkUseLog::getUseType,param.getUseType());
+        }
         if(StringUtils.isNotBlank(param.getStartTime())&& StringUtils.isNotBlank(param.getEndTime()) ) {
             wrapper.between(RtkUseLog::getCreateTime,param.getStartTime(),param.getEndTime());
         }

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

@@ -12,6 +12,7 @@ public class RtkInfoParam extends RequestBase{
     private String operator;
     private String cameraSnCode;
     private String sgRtkSn;
+    private Integer useType;
 
     private List<String> timeList;