Ver código fonte

相机管理用户查询

lyhzzz 1 ano atrás
pai
commit
ac0b78ac89

+ 3 - 2
src/main/java/com/fdkankan/fusion/controller/TmCameraController.java

@@ -50,9 +50,10 @@ public class TmCameraController {
                                             @RequestParam(value = "pageSize", required = false,defaultValue = "10") Long pageSize,
                                             @RequestParam(value = "snCode" , required = false) String snCode,
                                             @RequestParam(value = "deptId", required = false) String deptId,
-                                            @RequestParam(value = "type", required = false) Integer type
+                                            @RequestParam(value = "type", required = false) Integer type,
+                                            @RequestParam(value = "searchKey", required = false) String searchKey
     ) {
-       return ResultData.ok(tmCameraService.pageList(pageNum,pageSize,snCode,deptId,type));
+       return ResultData.ok(tmCameraService.pageList(pageNum,pageSize,snCode,deptId,type,searchKey));
     }
 
     /**

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/ITmCameraService.java

@@ -27,7 +27,7 @@ public interface ITmCameraService extends IService<TmCamera> {
 
     TmCamera getBySnCode(String snCode);
 
-    Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type);
+    Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type,String searchKey);
 
     void bind(BindCameraDto param);
 

+ 2 - 0
src/main/java/com/fdkankan/fusion/service/ITmUserService.java

@@ -45,4 +45,6 @@ public interface ITmUserService extends IService<TmUser> {
     Object getUserListSelect(String deptId);
 
     HashMap<String, TmUser> getByIds(Set<String> createorIds);
+
+    List<TmUser> getLikeNickName(String searchKey);
 }

+ 9 - 1
src/main/java/com/fdkankan/fusion/service/impl/TmCameraServiceImpl.java

@@ -163,8 +163,16 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
     }
 
     @Override
-    public Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type) {
+    public Object pageList(Long pageNum, Long pageSize, String snCode, String deptId, Integer type,String searchKey) {
         LambdaQueryWrapper<TmCamera> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(searchKey)){
+            List<TmUser> tmUsers = tmUserService.getLikeNickName(searchKey);
+            if(tmUsers.size() <=0){
+                return PageInfo.PageInfo(new Page<>(pageNum,pageSize));
+            }
+            List<String> userIds = tmUsers.stream().map(TmUser::getId).collect(Collectors.toList());
+            wrapper.in(TmCamera::getUserId,userIds);
+        }
         if (StringUtils.isNotBlank(snCode)) {
             wrapper.like(TmCamera::getCameraSn,snCode);
         }

+ 7 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -328,4 +328,11 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         }
         return map;
     }
+
+    @Override
+    public List<TmUser> getLikeNickName(String searchKey) {
+        LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(TmUser::getNickName,searchKey);
+        return this.list(wrapper);
+    }
 }