相机协作

src/main/java/com/fdkankan/agent/mapper/IUserMapper.java

@@ -1,7 +1,10 @@
 package com.fdkankan.agent.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.agent.request.UserParam;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IUserMapper extends BaseMapper<User> {
 
+    Page<User> pageList(Page<Object> objectPage, UserParam param);
 }

src/main/java/com/fdkankan/agent/service/impl/UserServiceImpl.java

@@ -31,8 +31,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Autowired
     private IUserIncrementService userIncrementService;
     @Autowired
-    private ICameraService cameraService;
-    @Autowired
     private ICameraDetailService cameraDetailService;
     @Autowired
     private ISceneService sceneService;
@@ -84,16 +82,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public PageInfo pageList(UserParam param) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(param.getUserName())){
-            wrapper.like(User::getUserName,param.getUserName());
-        }
-        if(StringUtils.isNotBlank(param.getEmail())){
-            wrapper.like(User::getEmail,param.getEmail());
-        }
-        wrapper.isNotNull(User::getAgentKey);
-        wrapper.orderByDesc(User::getCreateTime);
-        Page<User> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Page<User> page =  this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
         List<User> records = page.getRecords();
         List<UserVo> userVo = getUserVo(records);
         Page<UserVo> pageVo = new Page<>(page.getCurrent(),page.getSize());

src/main/resources/mapper/agent/UserMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.agent.mapper.IUserMapper">
 
+    <select id="pageList" resultType="com.fdkankan.agent.entity.User">
+        select distinct s.* from t_user s
+            left join t_camera_detail d on s.id = d.user_id
+        where s.rec_status = 'A'
+        <if test="param.userName != null and param.userName !=''">
+            and s.user_name  like concat ('%',#{param.userName},'%')
+        </if>
+        <if test="param.email != null and param.email !=''">
+            and s.email  like concat ('%',#{param.email},'%')
+        </if>
+        and (agent_key is not null or d.agent_id is not null)
+        order by s.id desc
+
+    </select>
 </mapper>