1

README.md

@@ -170,7 +170,8 @@
     http://120.25.146.52:3090/project/102/interface/api/10542
     添加移除相机功能
     http://120.25.146.52:3090/project/102/interface/api/10544
-                                
+4.经销商授权日志
+    http://120.25.146.52:3090/project/102/interface/api/10552                              
 ~~~~
 
 

doc/update.2.8.0.sql

@@ -9,7 +9,9 @@ ADD COLUMN `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai
 ADD COLUMN `ip_addr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL AFTER `password`,
 ADD COLUMN `mount_point` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL AFTER `ip_addr`,
 ADD COLUMN `port` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL AFTER `mount_point`,
-ADD COLUMN `operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '运营商' AFTER `port`;
+ADD COLUMN `operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL  COMMENT '运营商' AFTER `port`;
+
+
 
 ALTER TABLE `4dkankan_v4`.`t_rtk_account`
 DROP COLUMN `type`;

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

@@ -69,6 +69,12 @@ public class RtkDeviceServiceImpl extends ServiceImpl<IRtkDeviceMapper, RtkDevic
         if(StringUtils.isNotBlank(param.getSgRtkSn())){
             wrapper.like(RtkDevice::getSgRtkSn,param.getSgRtkSn());
         }
+        if(StringUtils.isNotBlank(param.getOperator())){
+            wrapper.like(RtkDevice::getOperator,param.getOperator());
+        }
+        if(StringUtils.isNotBlank(param.getUserName())){
+            wrapper.like(RtkDevice::getUserName,param.getUserName());
+        }
         if(StringUtils.isNotBlank(param.getStartTime())&& StringUtils.isNotBlank(param.getEndTime()) ) {
             wrapper.between(RtkDevice::getCreateTime,param.getStartTime(),param.getEndTime());
         }