租户管理-管理员配置-新增、修改、删除、密码重置上传1

fiveep-controller/src/main/java/com/bizmatics/controller/web/UserConfigController.java

@@ -0,0 +1,131 @@
+package com.bizmatics.controller.web;
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.exception.BusinessErrorCode;
+import com.bizmatics.common.core.util.StringUtils;
+import com.bizmatics.controller.web.system.BaseController;
+import com.bizmatics.model.constants.UserConstants;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.persistence.mapper.system.SysUserMapper;
+import com.bizmatics.service.system.ISysUserService;
+import com.bizmatics.service.system.impl.TokenService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 租户管理-管理员配置
+ *
+ * @author yq
+ */
+@RestController
+@RequestMapping("/userconfig")
+public class UserConfigController extends BaseController {
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private TokenService tokenService;
+
+
+    /**
+     * 租户管理-管理员配置-新增
+     *
+     * @param user
+     * @return
+     */
+    @Transactional
+    @PostMapping("/addUserData")
+    public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotBlank(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotBlank(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setCreateTime(new Date());
+        user.setUserType("01");
+        user.setStatus("0");
+        user.setDelFlag("0");
+        int row = userService.addUser(user);
+        return toAjax(row);
+    }
+
+
+    /**
+     * 租户管理-管理员配置-修改
+     *
+     * @param user
+     * @return
+     */
+    @Transactional
+    @PostMapping("/updateserData")
+    public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        user.setUpdateTime(new Date());
+        return toAjax(userService.updateUserData(user));
+    }
+
+
+    /**
+     * 租户管理-管理员配置-删除
+     *
+     * @param userId 用户ID
+     * @return
+     */
+    @GetMapping("/delUsers")
+    public ApiResult<Void> delUsers(@RequestParam Long userId) {
+        SysUser user = new SysUser();
+        if (userId == 0 && userId == null) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "用户ID不能为空");
+        }
+        user.setUserId(userId);
+        userService.checkUserAllowed(user);
+        user.setUpdateBy(SecurityUtils.getUsername());
+        user.setUpdateTime(new Date());
+        user.setRemark("注销用户");
+        user.setDelFlag("2");
+        return toAjax(userService.updateUserData(user));
+    }
+
+
+    /**
+     * 租户管理-管理员配置-重置密码s
+     *
+     * @param newPassword 新密码
+     * @param UserId      用户ID
+     * @return
+     */
+    @PutMapping("/updatePwd")
+    public ApiResult updatePwd(String newPassword, Long UserId) {
+        SysUser sysUser = userService.selectUserById(UserId);
+        if (sysUser.getUserId() == 0 && sysUser.getUserId() == null) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "无此用户，请联系管理员");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, sysUser.getPassword())) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新密码不能与旧密码相同");
+        }
+        userService.resetUserPwdOne(UserId, SecurityUtils.encryptPassword(newPassword));
+        return ApiResult.success();
+    }
+}

fiveep-controller/src/main/java/com/bizmatics/controller/web/system/SysUserController.java

@@ -8,11 +8,8 @@ import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.page.TableDataInfo;
-import com.bizmatics.model.system.SysMenu;
 import com.bizmatics.model.system.SysRole;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.system.SysUserVo;
-import com.bizmatics.model.vo.RouterVo;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysPostService;
@@ -35,13 +32,12 @@ import java.util.stream.Collectors;
 
 /**
  * 用户信息
- * 
+ *
  * @author yq
  */
 @RestController
 @RequestMapping("/system/user")
-public class SysUserController extends BaseController
-{
+public class SysUserController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
@@ -62,8 +58,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysUser user)
-    {
+    public ApiResult<TableDataInfo> list(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return ApiResult.success(getDataTable(list));
@@ -73,15 +68,13 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
-    public ApiResult<Map<String,Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
-        Map<String,Object> ajax = new HashMap<>();
+    @GetMapping(value = {"/", "/{userId}"})
+    public ApiResult<Map<String, Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        Map<String, Object> ajax = new HashMap<>();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (Objects.nonNull(userId))
-        {
+        if (Objects.nonNull(userId)) {
             ajax.put("data", userService.selectUserById(userId));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
@@ -95,20 +88,14 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Transactional
     @PostMapping
-    public ApiResult<Void> add(@Validated @RequestBody SysUser user)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
+    public ApiResult<Void> add(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotBlank(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+        } else if (StringUtils.isNotBlank(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotBlank(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotBlank(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
@@ -116,20 +103,20 @@ public class SysUserController extends BaseController
         //租户查询
 //        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getUser().getUserId());
-        if (tenantDaya.size()<0) {
+        if (tenantDaya.size() < 0) {
             throw new BusinessException("无此租户，请联系管理员");
         }
         user.setTenantId(tenantDaya.get(0).getTenantId());
         int row = userService.insertUser(user);
         int userId = user.getUserId().intValue();
-        try{
-            for (int i=0;i<user.getSiteId().length;i++){
+        try {
+            for (int i = 0; i < user.getSiteId().length; i++) {
                 int siteId = user.getSiteId()[i];
-                userService.insertUserSite(userId,siteId);
+                userService.insertUserSite(userId, siteId);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw  new BusinessException("用户点位关联表插入失败");
+            throw new BusinessException("用户点位关联表插入失败");
         }
         return toAjax(row);
     }
@@ -140,36 +127,26 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Transactional
     @PutMapping
-    public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
-    {
+    public ApiResult<Void> edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
-        //租户查询
-        List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getUser().getUserId());
-        if (tenantDaya.size()<0) {
-            throw new BusinessException("无此租户，请联系管理员");
-        }
-        user.setTenantId(tenantDaya.get(0).getTenantId());
-        try{
+        try {
             userService.deleteUserByIds(user.getUserId());
             int userId = user.getUserId().intValue();
-            for (int i=0;i<user.getSiteId().length;i++){
+            for (int i = 0; i < user.getSiteId().length; i++) {
                 int siteId = user.getSiteId()[i];
-                userService.insertUserSite(userId,siteId);
+                userService.insertUserSite(userId, siteId);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw  new BusinessException("用户点位关联表插入失败");
+            throw new BusinessException("用户点位关联表插入失败");
         }
         return toAjax(userService.updateUser(user));
     }
@@ -179,8 +156,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @DeleteMapping("/{userIds}")
-    public ApiResult<Void> remove(@PathVariable Long[] userIds)
-    {
+    public ApiResult<Void> remove(@PathVariable Long[] userIds) {
         return toAjax(userService.deleteUserByIds(userIds));
     }
 
@@ -189,8 +165,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @PutMapping("/resetPwd")
-    public ApiResult<Void> resetPwd(@RequestBody SysUser user)
-    {
+    public ApiResult<Void> resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -202,8 +177,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/changeStatus")
-    public ApiResult<Void> changeStatus(@RequestBody SysUser user)
-    {
+    public ApiResult<Void> changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));
@@ -214,9 +188,8 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public ApiResult<Map<String,Object>> authRole(@PathVariable("userId") Long userId)
-    {
-        Map<String,Object> ajax = new HashMap<>();
+    public ApiResult<Map<String, Object>> authRole(@PathVariable("userId") Long userId) {
+        Map<String, Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         List<UserSite> userSiteList = userService.selectUserSiteById(userId);
@@ -231,15 +204,13 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PutMapping("/authRole")
-    public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
         userService.insertUserAuth(userId, roleIds);
         return ApiResult.success();
     }
 
     @GetMapping("getUserData")
-    public ApiResult<SysUser> getUserData()
-    {
+    public ApiResult<SysUser> getUserData() {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         return ApiResult.success(userService.selectUserByUserName(loginUser.getUser().getUserName()));
     }
@@ -249,17 +220,13 @@ public class SysUserController extends BaseController
      * 个人中心-信息编辑
      */
     @PostMapping("/setUserData")
-    public ApiResult<Void> setUserData(@RequestBody SysUser user)
-    {
+    public ApiResult<Void> setUserData(@RequestBody SysUser user) {
 //        userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -270,21 +237,17 @@ public class SysUserController extends BaseController
      * 个人中心-重置密码
      */
     @PutMapping("/updatePwd")
-    public ApiResult updatePwd(String oldPassword, String newPassword)
-    {
+    public ApiResult updatePwd(String oldPassword, String newPassword) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
-        {
+        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改密码失败，旧密码错误");
         }
-        if (SecurityUtils.matchesPassword(newPassword, password))
-        {
+        if (SecurityUtils.matchesPassword(newPassword, password)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新密码不能与旧密码相同");
         }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
-        {
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
             tokenService.setLoginUser(loginUser);
@@ -292,4 +255,48 @@ public class SysUserController extends BaseController
         }
         return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改密码异常，请联系管理员");
     }
+
+
+    /**
+     * 租户管理-管理员配置-新增
+     */
+    @Transactional
+    @PostMapping("/addUserData")
+    public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotBlank(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotBlank(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        //租户查询
+        List<SysUser> tenantDaya = userMapper.getTenantId(SecurityUtils.getUser().getUserId());
+        if (tenantDaya.size() < 0) {
+            throw new BusinessException("无此租户，请联系管理员");
+        }
+        user.setTenantId(tenantDaya.get(0).getTenantId());
+        int row = userService.addUser(user);
+        return toAjax(row);
+    }
+
+
+    @Transactional
+    @PostMapping("/updateserData")
+    public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
+        userService.checkUserAllowed(user);
+        if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUserData(user));
+    }
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysUserMapper.java

@@ -92,6 +92,8 @@ public interface SysUserMapper
      */
     public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
 
+    public int resetUserPwdOne(@Param("userId") Long userId, @Param("password") String password);
+
     /**
      * 通过用户ID删除用户
      * 

fiveep-persistence/src/main/resources/mapper/mysql/system/SysUserMapper.xml

@@ -219,6 +219,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="resetUserPwd" parameterType="com.bizmatics.model.system.SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
+
+	<update id="resetUserPwdOne" parameterType="com.bizmatics.model.system.SysUser">
+		update sys_user set password = #{password} where user_id = #{userId}
+	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id = #{userId}

fiveep-service/src/main/java/com/bizmatics/service/system/ISysUserService.java

@@ -10,7 +10,6 @@ import java.util.List;
  *
  * @author yq
  */
-
 public interface ISysUserService {
     /**
      * 根据条件分页查询用户列表
@@ -128,14 +127,6 @@ public interface ISysUserService {
      */
     public int updateUser(SysUser user);
 
-
-    /**
-     * 个人中心-信息编辑
-     *
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUser1(SysUser user);
     /**
      * 用户授权角色
      *
@@ -213,4 +204,15 @@ public interface ISysUserService {
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+
+    public int resetUserPwdOne(Long userId, String password);
+
+    public int updateUser1(SysUser user);
+
+    public int updateUserData(SysUser user);
+
+    public int delUsers(Long userId);
+
+    public int addUser(SysUser user);
 }

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysUserServiceImpl.java

@@ -2,14 +2,12 @@ package com.bizmatics.service.system.impl;
 
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.StringUtils;
-import com.bizmatics.common.mvc.utils.ServletUtils;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.*;
 import com.bizmatics.persistence.mapper.UserSiteMapper;
 import com.bizmatics.persistence.mapper.system.*;
 import com.bizmatics.service.aop.DataScope;
-import com.bizmatics.service.config.security.LoginUser;
 import com.bizmatics.service.system.ISysConfigService;
 import com.bizmatics.service.system.ISysUserService;
 import com.bizmatics.service.util.SecurityUtils;
@@ -360,6 +358,11 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.resetUserPwd(userName, password);
     }
 
+    @Override
+    public int resetUserPwdOne(Long userId, String password) {
+        return userMapper.resetUserPwdOne(userId, password);
+    }
+
     /**
      * 新增用户角色信息
      *
@@ -525,4 +528,36 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return successMsg.toString();
     }
+
+
+    /**
+     * 租户管理-管理员配置-新增
+     *
+     * @param user
+     * @return
+     */
+    @Override
+    public int addUser(SysUser user) {
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+        return rows;
+    }
+
+
+    /**
+     * 租户管理-管理员配置-编辑
+     *
+     * @param user
+     * @return
+     */
+    @Override
+    public int updateUserData(SysUser user) {
+        return userMapper.updateUser(user);
+    }
+
+
+    @Override
+    public int delUsers(Long userId) {
+        return userMapper.deleteUserById(userId);
+    }
 }