测试

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

@@ -0,0 +1,25 @@
+package com.huimv.farm.damsubsidy.controller;
+
+
+import com.huimv.farm.damsubsidy.common.token.TokenSign;
+import com.huimv.farm.damsubsidy.common.utils.Result;
+import com.huimv.farm.damsubsidy.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/accountMultilevel")
+@CrossOrigin
+public class AccountMuitileve {
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @GetMapping("/remove")
+    public Result remove(@RequestParam("userIds")String userIds , HttpServletRequest request) {
+        Long userId = TokenSign.getMemberIdByJwtToken(request);
+        return iSysUserService.remove(userIds,userId);
+    }
+}

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

@@ -98,13 +98,13 @@ public class SysUserController {
         if ("1".equals(loginType)){
             String phone = map.get("phone");
             if (StringUtils.isEmpty(phone)){
-                return new Result(ResultCode.FAIL, "请输入手机号");
+                return new Result(10001, "请输入手机号",false);
             }
             Result result = iSysUserService.loginMultilevel(req, map);
             if ( result.getCode() == 10000) {
                SysUser sysUser = (SysUser) result.getData();
                 if (sysUser.getUserType() != 0 && sysUser.getUserType() != 4){
-                    return new Result(ResultCode.FAIL, "该用户未授权");
+                    return new Result(10001, "该用户未授权",false);
                 }
             }
             return  result;
@@ -133,7 +133,7 @@ public class SysUserController {
             }
             return  result;
         }
-        return new Result(ResultCode.FAIL, "登录方式有误");
+        return new Result(10001,  "登录方式有误",false);
     }
 
 
@@ -292,11 +292,12 @@ public class SysUserController {
         return iSysUserService.addXiang(sysUser,userId);
     }
 
-    @PostMapping("/remove")
-    public Result remove(@RequestBody SysUser sysUser , HttpServletRequest request) {
+    //删除
+  /*  @GetMapping("/remove")
+    public Result remove(@RequestParam("userIds")String userIds , HttpServletRequest request) {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
-        return iSysUserService.remove(sysUser,userId);
-    }
+        return iSysUserService.remove(userIds,userId);
+    }*/
     @GetMapping("/removeById")
     public Result removeById(@RequestParam("id") Integer  id) {
         iSysUserService.removeById(id);

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

@@ -52,7 +52,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     Result addXiang(SysUser sysUser, Long userId);
 
-    Result remove(SysUser sysUser, Long userId);
+    Result remove(String ids, Long userId);
 
     Result updateUser(SysUser sysUser, Long userId);
 

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

@@ -10,9 +10,11 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.PageUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
+import com.huimv.farm.damsubsidy.entity.AccountGroup;
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
 import com.huimv.farm.damsubsidy.entity.SysUser;
+import com.huimv.farm.damsubsidy.mapper.AccountGroupMapper;
 import com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper;
 import com.huimv.farm.damsubsidy.mapper.PovertyUserRegistMapper;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
@@ -47,6 +49,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private BaseVeterStationMapper baseVeterStationMapper;
 
+    @Autowired
+    private AccountGroupMapper accountGroupMapper;
+
     @Override
     public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
@@ -76,13 +81,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser accountMultilevel = userMapper.selectOne(wrapper);
 
         if (ObjectUtil.isEmpty(accountMultilevel)) {
-            return new Result(ResultCode.DATA_NULL, "账号不存在或密码错误");
+            return new Result(10001,  "账号不存在或密码错误",false);
         }
 
         Integer accoutType = accountMultilevel.getAccoutType();
 
         if (accoutType != 1) {
-            return new Result(ResultCode.DATA_NULL, "账号未启用");
+            return new Result(10001, "账号未启用",false);
         }
         return new Result(ResultCode.SUCCESS, accountMultilevel);
     }
@@ -96,16 +101,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String phone = sysUser.getPhone();
 
         if (StringUtils.isBlank(accountNum) || StringUtils.isBlank(password)) {
-            return new Result(ResultCode.FAIL, "输入有误，账号密码为空");
+            return new Result(10001,  "输入有误，账号密码为空",false);
         }
 
         if (StringUtils.isBlank(phone) || !phone.matches("1[3-9]\\d{9}")) {
-            return new Result(ResultCode.FAIL, "手机号格式不正确");
+            return new Result(10001, "手机号格式不正确",false);
         }
 
         int countNum = this.count(new QueryWrapper<SysUser>().eq("account_num", accountNum));
         if (countNum > 0) {
-            return new Result(ResultCode.FAIL, "账号已存在");
+            return new Result(10001,  "账号已存在",false);
         }
 
         Date date = new Date();
@@ -120,16 +125,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUser.setPids(byId.getPids() + "," + userId);
         this.save(sysUser);
 
-        return new Result(ResultCode.SUCCESS, "添加成功");
+        return new Result(10000,  "添加成功",true);
     }
 
     @Override
-    public Result remove(SysUser sysUser, Long userId) {
+    public Result remove(String ids, Long userId) {
         Date date = new Date();
-        sysUser.setIsDelete(1);
-        sysUser.setUpdateUser(userId + "");
-        sysUser.setUpdateTime(date);
-        updateById(sysUser);
+        for (String s : ids.split(",")) {
+            this.removeById(s);
+        }
         return new Result(ResultCode.SUCCESS, "删除成功");
     }
 
@@ -332,6 +336,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser user = userMapper.selectById(id);
         user.setAccoutType(Integer.parseInt(accoutType));
         userMapper.updateById(user);
+        AccountGroup accountGroup = new AccountGroup();
+        accountGroup.setAccountId(user.getId().intValue());
+        accountGroup.setGroupId(35);
+        accountGroupMapper.insert(accountGroup);
+
         return new Result(10000,"修改成功",true);
     }