生物防控人员

huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.receive.common.utils.*;
 import com.huimv.receive.entity.SysAccountMultilevel;
 import com.huimv.receive.entity.SysUser;
+import com.huimv.receive.entity.pojo.UserPagePojo;
 import com.huimv.receive.service.ISysAccountMultilevelService;
 import com.huimv.receive.service.ISysUserService;
 import com.huimv.receive.service.IUserService;
@@ -44,8 +45,8 @@ public class SysUserController {
 //    }
     //员工分页查询
     @PostMapping("/page")
-    public Result page(@RequestBody Map map) {
-        return sysUserService.pageAll(map);
+    public Result page(@RequestBody UserPagePojo userPagePojo) {
+        return sysUserService.pageAll(userPagePojo);
     }
     //员工查询
     @PostMapping("/list")
@@ -137,8 +138,8 @@ public class SysUserController {
 
     //账号查询
     @PostMapping("/pageAccount")
-    public Result pageAccount(@RequestBody Map<String,Object> map) {
-        return  sysUserService.pageAccount(map);
+    public Result pageAccount(@RequestBody UserPagePojo userPagePojo) {
+        return  sysUserService.pageAccount( userPagePojo);
     }
 
 

huimv-receive/src/main/java/com/huimv/receive/entity/pojo/UserPagePojo.java

@@ -0,0 +1,15 @@
+package com.huimv.receive.entity.pojo;
+
+import lombok.Data;
+
+@Data
+public class UserPagePojo {
+
+    private Integer pageNum;
+    private Integer pageSize;
+    private String searchStr;
+    private Integer job;
+    private String workLocation;
+    private Integer workLocationType;
+    private String farmId;
+}

huimv-receive/src/main/java/com/huimv/receive/service/ISysUserService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.receive.entity.pojo.UserPagePojo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
@@ -18,11 +19,11 @@ import java.util.Map;
  */
 public interface ISysUserService extends IService<SysUser> {
 
-    Result pageAll(Map map);
+    Result pageAll(UserPagePojo userPagePojo);
 
     Result listWorkLocation(Map map);
 
-    Result pageAccount(Map<String, Object> map);
+    Result pageAccount(UserPagePojo userPagePojo);
 
     Result addAccount(Map<String, Object> map);
 

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.huimv.receive.common.utils.Print;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
 import com.huimv.receive.entity.*;
+import com.huimv.receive.entity.pojo.UserPagePojo;
 import com.huimv.receive.entity.vo.UserAccountVo;
 import com.huimv.receive.entity.vo.UserAgeAndGender;
 import com.huimv.receive.entity.vo.UserJob;
@@ -54,14 +55,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
     @Override
-    public Result pageAll(Map map) {
-        int pageNum = (Integer)map.get("pageNum");
-        int pageSize = (Integer)map.get("pageSize");
-        String searchStr = (String)map.get("searchStr");
-        String job = (String)map.get("job");
-        String workLocation = (String)map.get("workLocation");
-        String workLocationType =(String) map.get("workLocationType");
-        String farmId = (String) map.get("farmId");
+    public Result pageAll(UserPagePojo userPagePojo) {
+        int pageNum = userPagePojo.getPageNum();
+        int pageSize = userPagePojo.getPageSize();
+        int job = userPagePojo.getJob();
+        int workLocationType = userPagePojo.getWorkLocationType();
+        String workLocation = userPagePojo.getWorkLocation();
+        String farmId = userPagePojo.getFarmId();
+        String searchStr = userPagePojo.getSearchStr();
+
         if (checkFarm(farmId))
            return new Result(10001,"牧场信息为空",false);
 
@@ -91,14 +93,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public Result pageAccount(Map<String, Object> map) {
-        int pageNum = (Integer)map.get("pageNum");
-        int pageSize = (Integer)map.get("pageSize");
-        String searchStr = (String)map.get("searchStr");
-        String job = (String)map.get("job");
-        String workLocation = (String)map.get("workLocation");
-        String workLocationType = (String)map.get("workLocationType");
-        String farmId = (String) map.get("farmId");
+    public Result pageAccount(UserPagePojo userPagePojo) {
+        int pageNum = userPagePojo.getPageNum();
+        int pageSize = userPagePojo.getPageSize();
+        int job = userPagePojo.getJob();
+        int workLocationType = userPagePojo.getWorkLocationType();
+        String workLocation = userPagePojo.getWorkLocation();
+        String farmId = userPagePojo.getFarmId();
+        String searchStr = userPagePojo.getSearchStr();
+
+
         if (checkFarm(farmId))
             return new Result(10001,"牧场信息为空",false);
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();