接口哦111

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -204,23 +204,23 @@ public class SysUserController {
 
     @PostMapping(value = "/edit")
     public Result edit(HttpServletRequest req, @RequestBody SysUser user) {
-        return new Result(ResultCode.SUCCESS, iSysUserService.edit(req, user));
+        return iSysUserService.edit(req, user);
     }
 
     @PostMapping(value = "/list")
     public Result list(HttpServletRequest req, @RequestBody Map<String, String> map) {
-        return new Result(ResultCode.SUCCESS, iSysUserService.list(req, map));
+        return iSysUserService.list(req, map);
     }
     @PostMapping(value = "/findPhone")
     public Result findPhone(HttpServletRequest req, @RequestBody Map<String, String> map) {
-        return new Result(ResultCode.SUCCESS, iSysUserService.findPhone(req, map));
+        return iSysUserService.findPhone(req, map);
     }
 
 
     //pc端
     @PostMapping(value = "/listPc")
     public Result listPc(HttpServletRequest req, @RequestBody Map<String, String> map) {
-        return new Result(ResultCode.SUCCESS, iSysUserService.listPc(req, map));
+        return iSysUserService.listPc(req, map);
     }
 
     @PostMapping(value = "/listPc2")
@@ -228,8 +228,8 @@ public class SysUserController {
         return new Result(ResultCode.SUCCESS, iSysUserService.listPc2(req, map));
     }
     @PostMapping(value = "/editState")
-    public Result editState(HttpServletRequest req, @RequestBody SysUser user) {
-        return new Result(ResultCode.SUCCESS, iSysUserService.editState(req, user));
+    public Result editState(HttpServletRequest req, @RequestBody Map<String,String> paramsMap) {
+        return new Result(ResultCode.SUCCESS, iSysUserService.editState(req, paramsMap));
     }
 
     //测试-token

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -31,7 +31,7 @@ public interface ISysUserService extends IService<SysUser> {
     //pc端
     Result listPc(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result editState(HttpServletRequest httpServletRequest,SysUser user);
+    Result editState(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
     Result listPc2(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -38,8 +38,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysUserMapper userMapper;
     @Autowired
     private PovertyUserRegistMapper povertyUserRegistMapper;
+
     @Override
-    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
+    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
         String phone = paramsMap.get("phone");
         if (!phone.matches("1[3-9]\\d{9}")) {
@@ -54,23 +55,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return new Result(ResultCode.SUCCESS, sysUser);
         }
     }
+
     @Override
     public Result loginMultilevelClient(String accountName, String password) {
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-        wrapper.eq("account_num",accountName).eq("password",password);
+        wrapper.eq("account_num", accountName).eq("password", password);
         SysUser accountMultilevel = userMapper.selectOne(wrapper);
 
-        if (ObjectUtil.isEmpty(accountMultilevel)){
+        if (ObjectUtil.isEmpty(accountMultilevel)) {
             return new Result(ResultCode.DATA_NULL, "账号不存在或密码错误");
         }
 
         Integer accoutType = accountMultilevel.getAccoutType();
 
-        if ( accoutType!= 1 ){
+        if (accoutType != 1) {
             return new Result(ResultCode.DATA_NULL, "账号未启用");
         }
-        return new Result(ResultCode.SUCCESS,accountMultilevel);
+        return new Result(ResultCode.SUCCESS, accountMultilevel);
     }
 
     @Override
@@ -81,8 +83,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String password = sysUser.getPassword();
         String phone = sysUser.getPhone();
 
-        if (StringUtils.isBlank(accountNum) || StringUtils.isBlank(password)){
-            return new Result(ResultCode.FAIL,"输入有误，账号密码为空");
+        if (StringUtils.isBlank(accountNum) || StringUtils.isBlank(password)) {
+            return new Result(ResultCode.FAIL, "输入有误，账号密码为空");
         }
 
         if (StringUtils.isBlank(phone) || !phone.matches("1[3-9]\\d{9}")) {
@@ -90,29 +92,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         int countNum = this.count(new QueryWrapper<SysUser>().eq("account_num", accountNum));
-        if (countNum>0){
-            return new Result(ResultCode.FAIL,"账号已存在");
+        if (countNum > 0) {
+            return new Result(ResultCode.FAIL, "账号已存在");
         }
 
         Date date = new Date();
         sysUser.setCreateTime(date);
         sysUser.setUpdateTime(date);
-        sysUser.setCreateUser(userId+"");
-        sysUser.setUpdateUser(userId+"");
+        sysUser.setCreateUser(userId + "");
+        sysUser.setUpdateUser(userId + "");
         sysUser.setUserType(4);
         sysUser.setIsRealName(0);
         sysUser.setPid(Math.toIntExact(userId));
-        sysUser.setPids(byId.getPids()+","+userId);
+        sysUser.setPids(byId.getPids() + "," + userId);
         this.save(sysUser);
 
-        return new Result(ResultCode.SUCCESS,"添加成功");
+        return new Result(ResultCode.SUCCESS, "添加成功");
     }
 
     @Override
     public Result remove(SysUser sysUser, Long userId) {
         Date date = new Date();
         sysUser.setIsDelete(1);
-        sysUser.setUpdateUser(userId+"");
+        sysUser.setUpdateUser(userId + "");
         sysUser.setUpdateTime(date);
         updateById(sysUser);
         return new Result(ResultCode.SUCCESS, "删除成功");
@@ -121,7 +123,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Transactional
     @Override
-    public Result add(HttpServletRequest httpServletRequest,Map<String,String> paramsMap) {
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
 
         SysUser user = new SysUser();
         user.setUserType(Integer.parseInt(paramsMap.get("type")));
@@ -147,37 +149,54 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 user.setFarmType(0);
             }
         }
-        user.setAccoutType(0);
-        user.setIsRealName(1);
-
-        QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("id_card", paramsMap.get("idCord"));
-        SysUser user2 = userMapper.selectOne(queryWrapper1);
-        if (ObjectUtil.isNotEmpty(user2)) {
-            return new Result(ResultCode.FAIL, "");
-        }
-        QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("phone", paramsMap.get("phone"));
-        SysUser sysUser = userMapper.selectOne(queryWrapper2);
-        if (ObjectUtil.isNotEmpty(sysUser)) {
-            return new Result(ResultCode.FAIL, "");
+        if (paramsMap.get("type") == "2" || paramsMap.get("type") == "3") {
+            user.setAccoutType(1);
+            user.setIsRealName(1);
+            QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("id_card", paramsMap.get("idCord"));
+            SysUser user2 = userMapper.selectOne(queryWrapper1);
+            if (ObjectUtil.isNotEmpty(user2)) {
+                return new Result(ResultCode.FAIL, "");
+            }
+            QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("phone", paramsMap.get("phone"));
+            SysUser sysUser = userMapper.selectOne(queryWrapper2);
+            if (ObjectUtil.isNotEmpty(sysUser)) {
+                return new Result(ResultCode.FAIL, "");
+            }
+            userMapper.insert(sysUser);
+            return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
+        } else {
+            user.setAccoutType(0);
+            user.setIsRealName(1);
+            QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("id_card", paramsMap.get("idCord"));
+            SysUser user2 = userMapper.selectOne(queryWrapper1);
+            if (ObjectUtil.isNotEmpty(user2)) {
+                return new Result(ResultCode.FAIL, "");
+            }
+            QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("phone", paramsMap.get("phone"));
+            SysUser sysUser = userMapper.selectOne(queryWrapper2);
+            if (ObjectUtil.isNotEmpty(sysUser)) {
+                return new Result(ResultCode.FAIL, "");
+            }
+            userMapper.insert(sysUser);
+            return new Result(ResultCode.UNAUTHENTICATED,"待审核");
         }
-        userMapper.insert(sysUser);
-
-        return new Result(ResultCode.SUCCESS,userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone",paramsMap.get("phone"))));
     }
 
     @Override
-    public Result edit(HttpServletRequest httpServletRequest,SysUser user) {
+    public Result edit(HttpServletRequest httpServletRequest, SysUser user) {
         userMapper.updateById(user);
-        return new Result(ResultCode.SUCCESS,"修改成功！");
+        return new Result(ResultCode.SUCCESS, "修改成功！");
     }
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", paramsMap.get("phone"));
-        return new Result(ResultCode.SUCCESS,userMapper.selectOne(queryWrapper));
+        return new Result(ResultCode.SUCCESS, userMapper.selectOne(queryWrapper));
     }
 
     @Override
@@ -200,7 +219,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String word = paramsMap.get("word");
         String role = paramsMap.get("role");
         String pageSize = paramsMap.get("pageSize");
-        String pageNum = paramsMap.get("pageSize");
+        String pageNum = paramsMap.get("pageNum");
+        String type = paramsMap.get("type");
 
         if (pageSize == null || pageSize == "") {
             pageSize = "10";
@@ -211,21 +231,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (date != "") {
             date = date + " 00:00:00";
         }
-
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("accout_type", 0).ge("create_time", date)
-                .eq("user_type", role).like("user_name", word).or().like("phone", word)
-                .or().like("id_card", word);
-
+        if (type == "") {
+            queryWrapper.ge("create_time", date)
+                    .eq("user_type", 0).or().eq("user_type",1).or().eq("user_type",4)
+                    .like("user_name", word).or().like("phone", word)
+                    .or().like("id_card", word);
+        } else if (type == "1") {
+            queryWrapper.eq("accout_type", 0).ge("create_time", date)
+                    .eq("user_type", role).like("user_name", word).or().like("phone", word)
+                    .or().like("id_card", word);
+        } else {
+            queryWrapper.ge("accout_type", 0).ge("create_time", date)
+                    .eq("user_type", role).like("user_name", word).or().like("phone", word)
+                    .or().like("id_card", word);
+        }
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        Page<SysUser> sysUserPage = userMapper.selectPage(page, queryWrapper);
-        return new Result(ResultCode.SUCCESS,sysUserPage);
+        return new Result(ResultCode.SUCCESS, userMapper.selectPage(page, queryWrapper));
     }
 
     @Override
-    public Result editState(HttpServletRequest httpServletRequest, SysUser user) {
+    public Result editState(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
+        String id = paramsMap.get("id");
+        String accoutType = paramsMap.get("accoutType");
+        SysUser user = userMapper.selectById(id);
+        user.setAccoutType(Integer.parseInt(accoutType));
         userMapper.updateById(user);
-        return new Result(ResultCode.SUCCESS);
+        return new Result(ResultCode.SUCCESS,"修改成功");
     }
 
     @Override
@@ -234,7 +266,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String word = paramsMap.get("word");
         String role = paramsMap.get("role");
         String pageSize = paramsMap.get("pageSize");
-        String pageNum = paramsMap.get("pageSize");
+        String pageNum = paramsMap.get("pageNum");
 
         if (pageSize == null || pageSize == "") {
             pageSize = "10";
@@ -246,33 +278,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             date = date + " 00:00:00";
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("accout_type", 1).or().eq("accout_typr",4).ge("create_time", date)
+        queryWrapper.eq("accout_type", 1).or().eq("accout_type", 4).ge("create_time", date)
                 .eq("user_type", role).like("user_name", word).or().like("phone", word)
                 .or().like("id_card", word);
-
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         Page<SysUser> sysUserPage = userMapper.selectPage(page, queryWrapper);
-        return new Result(ResultCode.SUCCESS,sysUserPage);
+        return new Result(ResultCode.SUCCESS, sysUserPage);
     }
 
-  
-    
+
     //
     @Override
     public Result findUserAccount(String searchStr, int pageNum, int pageSize, Long userId) {
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-        wrapper.like("pids",userId).or().eq("id",userId);
+        wrapper.like("pids", userId).or().eq("id", userId);
         IPage<SysUser> page = this.page(new Page<>(pageNum, pageSize), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
     public Result add(SysUser sysUser, Integer userId) {
 
         int account = this.count(new QueryWrapper<SysUser>().eq("account_num", sysUser.getAccountNum()));
-        if (account > 0 ){
-            return new Result(10001,"该账号已经存在，请重新创建",false);
+        if (account > 0) {
+            return new Result(10001, "该账号已经存在，请重新创建", false);
 
         }
 
@@ -280,30 +310,30 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         sysUser.setPid(userId);
-        sysUser.setPids(byId.getPids()+","+userId);
+        sysUser.setPids(byId.getPids() + "," + userId);
         userMapper.insert(sysUser);
-        return  new Result( 10000,"添加成功",true);
+        return new Result(10000, "添加成功", true);
     }
 
     @Override
     public Result setAccountStatus(List<Integer> ids, Integer status) {
         try {
             for (Integer id : ids) {
-                SysUser account= new SysUser();
+                SysUser account = new SysUser();
                 account.setId(Long.valueOf(id));
                 account.setAccoutType(status);
                 this.updateById(account);
             }
-        }catch (Exception e){
-            return new Result(10001,"插入失败",false);
+        } catch (Exception e) {
+            return new Result(10001, "插入失败", false);
         }
         String message = "";
-        if(status == 1){
+        if (status == 1) {
             message = "你选择的账号已经启用。";
-        }else{
+        } else {
             message = "你选择的账号已经暂停启用。";
         }
-        return new Result(10000,message,true);
+        return new Result(10000, message, true);
     }
 
     @Override
@@ -321,15 +351,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Result listSubordinate(String searchStr, String pageNum, String pageSize, Long userId) {
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-        wrapper.like("pids",userId);
-        wrapper.ne("id",userId);
-        wrapper.eq("is_delete",0);
-        if (StringUtils.isNotBlank(searchStr)){
-            wrapper.like("user_name",searchStr);
+        wrapper.like("pids", userId);
+        wrapper.ne("id", userId);
+        wrapper.eq("is_delete", 0);
+        if (StringUtils.isNotBlank(searchStr)) {
+            wrapper.like("user_name", searchStr);
         }
 
         IPage<SysUser> page = this.page(new Page<SysUser>(Long.parseLong(pageNum), Long.parseLong(pageSize)), wrapper);
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
@@ -337,17 +367,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = userMapper.selectById(userId);
         Integer lastFarmId = sysUser.getLastVeter();
         String farmIds = sysUser.getVeterIds();
-        if (farmIds == null){
-            return new Result(10001,"该账号没有绑定兽医站",true);
+        if (farmIds == null) {
+            return new Result(10001, "该账号没有绑定兽医站", true);
         }
-        if (lastFarmId == null){
+        if (lastFarmId == null) {
             String[] split = farmIds.split(",");
             String s = split[0];
             sysUser.setLastVeter(Integer.valueOf(s));
             userMapper.updateById(sysUser);
-            return new Result(ResultCode.SUCCESS,s);
+            return new Result(ResultCode.SUCCESS, s);
         }
-        return new Result(ResultCode.SUCCESS,lastFarmId);
+        return new Result(ResultCode.SUCCESS, lastFarmId);
     }