打印1

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

@@ -14,7 +14,9 @@ import com.huimv.farm.damsubsidy.common.utils.SmsUtils;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.config.CharacterEncodingFilter;
 import com.huimv.farm.damsubsidy.entity.AccessToken;
+import com.huimv.farm.damsubsidy.entity.BaseUserBank;
 import com.huimv.farm.damsubsidy.entity.SysUser;
+import com.huimv.farm.damsubsidy.service.IBaseUserBankService;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,8 @@ public class SysUserController {
     private ISysUserService iSysUserService;
     @Autowired
     private RedisTemplate<String,String> redisTemplate;
+    @Autowired
+    private IBaseUserBankService bankService;
 
     @PostMapping("/sendCode")
     public void senCode(@RequestBody Map<String,String> paramsMap) throws Exception {
@@ -108,11 +112,15 @@ public class SysUserController {
         AccessToken accessToken = new AccessToken();
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();
+            QueryWrapper<BaseUserBank> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("user_id", user.getId());
+            List<BaseUserBank> banks = bankService.list(queryWrapper);
             if (user.getUserType() == 4 && user.getPermit() == null) {
                 accessToken.setPermit(1);
             } else {
                 accessToken.setPermit(0);//不需要
             }
+            accessToken.setBanks(banks);
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setType(user.getUserType());

admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -7,6 +7,7 @@ import com.huimv.farm.damsubsidy.common.utils.LongJsonSerializer;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 登录的token信息
@@ -29,5 +30,6 @@ public class AccessToken {
     private String phone;
     private SysUser user;
     private Integer permit;
+    private List<BaseUserBank> banks;
 
 }

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

@@ -50,13 +50,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private BaseVeterStationMapper baseVeterStationMapper;
     @Autowired
-    private RedisTemplate<String,String> redisTemplate;
+    private RedisTemplate<String, String> redisTemplate;
 
     @Autowired
     private AccountGroupMapper accountGroupMapper;
 
     @Override
-    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap,String remoteHost) {
+    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, String remoteHost) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
         String phone = paramsMap.get("phone");
         String code = paramsMap.get("code");
@@ -74,33 +74,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             System.out.println("登录成功");
 
-
-
-//        if (!phone.matches("1[3-9]\\d{9}")) {
-//            return new Result(10001, "手机号格式不正确",false);
-//        }
-        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", phone);
-        SysUser sysUser = userMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isEmpty(sysUser)) {
-            return new Result(10004, "用户暂未注册，请注册！", false);
-        } else {
-            if (sysUser.getAccoutType() == 1) {
-                this.updateById(sysUser.setLastIp(remoteHost));
-                return new Result(ResultCode.SUCCESS, sysUser);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("phone", phone);
+            SysUser sysUser = userMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(sysUser)) {
+                return new Result(10004, "用户暂未注册，请注册！", false);
             } else {
-                return new Result(10002, "未审核或者账号异常！", false);
+                if (sysUser.getAccoutType() == 1) {
+                    this.updateById(sysUser.setLastIp(remoteHost));
+                    return new Result(ResultCode.SUCCESS, sysUser);
+                } else {
+                    return new Result(10002, "未审核或者账号异常！", false);
+                }
             }
         }
     }
-    }
 
     @Override
     public Result loginOne() {
         String phone = "13112341236";
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);
-        return new Result(ResultCode.SUCCESS,userMapper.selectOne(queryWrapper));
+        return new Result(ResultCode.SUCCESS, userMapper.selectOne(queryWrapper));
     }
 
     @Override
@@ -111,13 +106,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser accountMultilevel = userMapper.selectOne(wrapper);
 
         if (ObjectUtil.isEmpty(accountMultilevel)) {
-            return new Result(10001,  "账号不存在或密码错误",false);
+            return new Result(10001, "账号不存在或密码错误", false);
         }
 
         Integer accoutType = accountMultilevel.getAccoutType();
 
         if (accoutType != 1) {
-            return new Result(10001, "账号未启用",false);
+            return new Result(10001, "账号未启用", false);
         }
 
         this.updateById(accountMultilevel.setLastIp(remoteHost));
@@ -133,27 +128,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String phone = sysUser.getPhone();
 
         if (StringUtils.isBlank(accountNum) || StringUtils.isBlank(password)) {
-            return new Result(10001,  "输入有误，账号密码为空",false);
+            return new Result(10001, "输入有误，账号密码为空", false);
         }
 
         if (StringUtils.isBlank(phone) || !phone.matches("1[3-9]\\d{9}")) {
-            return new Result(10001, "手机号格式不正确",false);
+            return new Result(10001, "手机号格式不正确", false);
         }
 
         int countNum = this.count(new QueryWrapper<SysUser>().eq("account_num", accountNum));
         if (countNum > 0) {
-            return new Result(10001,  "账号已存在",false);
+            return new Result(10001, "账号已存在", false);
         }
         Integer phone1 = this.count(new QueryWrapper<SysUser>().eq("phone", phone));
-        if (phone1>0){
-            return new Result(10001,  "手机号已存在",false);
+        if (phone1 > 0) {
+            return new Result(10001, "手机号已存在", false);
         }
 
         Date date = new Date();
         sysUser.setCreateTime(date);
         sysUser.setUpdateTime(date);
         sysUser.setCreateUser(userId);
-        sysUser.setUpdateUser(userId+"");
+        sysUser.setUpdateUser(userId + "");
         sysUser.setUserType(4);
         sysUser.setIsRealName(0);
         sysUser.setAccoutType(1);
@@ -165,7 +160,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         accountGroup.setGroupId(36);
         accountGroupMapper.insert(accountGroup);
 
-        return new Result(10000,  "添加成功",true);
+        return new Result(10000, "添加成功", true);
     }
 
     @Override
@@ -197,7 +192,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public Result removeByIds( Map<String, String> paramsMap ) {
+    public Result removeByIds(Map<String, String> paramsMap) {
         String ids = paramsMap.get("ids");
         String[] split = ids.split(",");
         for (String s : split) {
@@ -210,7 +205,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Result login2(Map<String, String> paramsMap) {
         String phone = paramsMap.get("phone");
         if (!phone.matches("1[3-9]\\d{9}")) {
-            return new Result(10001, "手机号格式不正确",false);
+            return new Result(10001, "手机号格式不正确", false);
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone).eq("account_type", 1);
@@ -261,23 +256,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
-        if (Integer.parseInt(paramsMap.get("type")) == 2 ||Integer.parseInt(paramsMap.get("type")) == 3) {
+        if (Integer.parseInt(paramsMap.get("type")) == 2 || Integer.parseInt(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(10001, "",false);
+                return new Result(10001, "", false);
             }
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isNotEmpty(sysUser)) {
-                return new Result(10001, "",false);
+                return new Result(10001, "", false);
             }
             if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
-                return new Result(10001, "实名手机号与当前手机号不一致",false);
+                return new Result(10001, "实名手机号与当前手机号不一致", false);
             }
             userMapper.insert(user);
             return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
@@ -288,26 +283,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper1.eq("id_card", paramsMap.get("idCord"));
             SysUser user2 = userMapper.selectOne(queryWrapper1);
             if (ObjectUtil.isNotEmpty(user2)) {
-                return new Result(10001, "用户已存在",false);
+                return new Result(10001, "用户已存在", false);
             }
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isNotEmpty(sysUser)) {
-                return new Result(10001, "用户已存在",false);
+                return new Result(10001, "用户已存在", false);
             }
             if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
-                return new Result(10001, "实名手机号与当前手机号不一致",false);
+                return new Result(10001, "实名手机号与当前手机号不一致", false);
             }
             userMapper.insert(user);
-            return new Result(10004,"待审核",false);
+            return new Result(10004, "待审核", false);
         }
     }
 
     @Override
     public Result edit(HttpServletRequest httpServletRequest, SysUser user) {
         userMapper.updateById(user);
-        return new Result(10000, "修改成功！",true);
+        return new Result(10000, "修改成功！", true);
     }
 
     @Override
@@ -323,7 +318,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String idCord = paramsMap.get("idCord");
         String phone = paramsMap.get("phone");
         if (!phone.matches("1[3-9]\\d{9}")) {
-            return new Result(10001, "手机号格式不正确",false);
+            return new Result(10001, "手机号格式不正确", false);
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_name", userName).eq("id_card", idCord);
@@ -348,50 +343,50 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        if (type==null||type=="") {
+        if (type == null || type == "") {
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type", 0,1,4);
+                queryWrapper.in("user_type", 0, 1, 4);
             } else {
                 queryWrapper.eq("user_type", role);
             }
-            queryWrapper.between(StringUtils.isNotBlank(date),"create_time", date+" 00:00:00",date+" 23:59:59");
-            queryWrapper.like(StringUtils.isNotBlank(word),"user_name", word)
-                            .or().like(StringUtils.isNotBlank(word),"phone", word)
-                            .or().like(StringUtils.isNotBlank(word),"id_card", word);
+            queryWrapper.between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59");
+            queryWrapper.like(StringUtils.isNotBlank(word), "user_name", word)
+                    .or().like(StringUtils.isNotBlank(word), "phone", word)
+                    .or().like(StringUtils.isNotBlank(word), "id_card", word);
             queryWrapper.orderByDesc("create_time");
-        } else if (Integer.parseInt(type)==1) { //待审核
+        } else if (Integer.parseInt(type) == 1) { //待审核
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type", 0,1,4);
+                queryWrapper.in("user_type", 0, 1, 4);
             } else {
                 queryWrapper.eq("user_type", type);
             }
             queryWrapper.eq("accout_type", 0)
-                    .between(StringUtils.isNotBlank(date),"create_time", date+" 00:00:00",date+" 23:59:59")
-                    .eq(StringUtils.isNotBlank(role),"user_type", role).
-                    like(StringUtils.isNotBlank(word),"user_name", word)
-                    .or().like(StringUtils.isNotBlank(word),"phone", word)
-                    .or().like(StringUtils.isNotBlank(word),"id_card", word);
+                    .between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
+                    .eq(StringUtils.isNotBlank(role), "user_type", role).
+                    like(StringUtils.isNotBlank(word), "user_name", word)
+                    .or().like(StringUtils.isNotBlank(word), "phone", word)
+                    .or().like(StringUtils.isNotBlank(word), "id_card", word);
         } else {
             if (role == null || role.equals("")) {
-                queryWrapper.in("user_type", 0,1,4);
+                queryWrapper.in("user_type", 0, 1, 4);
             } else {
                 queryWrapper.eq("user_type", type);
             }
             queryWrapper.ge("accout_type", 1)
-                    .between(StringUtils.isNotBlank(date),"create_time",date+" 00:00:00",date+" 23:59:59")
-                    .eq(StringUtils.isNotBlank(role),"user_type", role)
-                    .like(StringUtils.isNotBlank(word),"user_name", word)
-                    .or().like(StringUtils.isNotBlank(word),"phone", word)
-                    .or().like(StringUtils.isNotBlank(word),"id_card", word);
+                    .between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
+                    .eq(StringUtils.isNotBlank(role), "user_type", role)
+                    .like(StringUtils.isNotBlank(word), "user_name", word)
+                    .or().like(StringUtils.isNotBlank(word), "phone", word)
+                    .or().like(StringUtils.isNotBlank(word), "id_card", word);
         }
         Page<SysUser> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, userMapper.selectPage(page, queryWrapper));
     }
 
     @Override
-    public Result editState(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) {
+    public Result editState(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String id = paramsMap.get("id");
-        Integer accoutType =Integer.parseInt(paramsMap.get("accoutType"));
+        Integer accoutType = Integer.parseInt(paramsMap.get("accoutType"));
         System.out.println(accoutType);
         SysUser user = userMapper.selectById(id);
         user.setAccoutType(accoutType);
@@ -401,7 +396,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         accountGroup.setGroupId(36);
         accountGroupMapper.insert(accountGroup);
 
-        return new Result(10000,"修改成功",true);
+        return new Result(10000, "修改成功", true);
     }
 
     @Override
@@ -499,7 +494,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         wrapper.ne("id", userId);
         wrapper.eq("is_delete", 0);
         if (StringUtils.isNotBlank(searchStr)) {
-            wrapper.and(i ->i.like("user_name", searchStr).or().like("account_num",searchStr));
+            wrapper.and(i -> i.like("user_name", searchStr).or().like("account_num", searchStr));
         }
 
         IPage<SysUser> page = this.page(new Page<SysUser>(Long.valueOf(pageNum), Long.valueOf(pageSize)), wrapper);
@@ -535,17 +530,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Integer userType = sysUser.getUserType();
 
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isBlank(farmType),"farm_type",farmType);
-        if (userType == 0){
-            queryWrapper.eq("user_type",3)
-                        .like(!StringUtils.isBlank(code),"detailed_adress_code",code);
-        }else {
-            queryWrapper.eq("user_type",3)
-                        .like("detailed_adress_code",sysUser.getBriefAddressCode());
+        queryWrapper.eq(!StringUtils.isBlank(farmType), "farm_type", farmType);
+        if (userType == 0) {
+            queryWrapper.eq("user_type", 3)
+                    .like(!StringUtils.isBlank(code), "detailed_adress_code", code);
+        } else {
+            queryWrapper.eq("user_type", 3)
+                    .like("detailed_adress_code", sysUser.getBriefAddressCode());
         }
-        Page<SysUser> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        IPage<SysUser> sysUsers = this.page(page,queryWrapper);
-        return new Result(ResultCode.SUCCESS,sysUsers);
+        Page<SysUser> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<SysUser> sysUsers = this.page(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS, sysUsers);
     }
 
 }