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

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

@@ -1,14 +1,15 @@
 package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
 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.SysTenant;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.persistence.mapper.system.SysUserMapper;
+import com.bizmatics.service.SysTenantService;
 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;
@@ -29,10 +30,7 @@ public class UserConfigController extends BaseController {
     private ISysUserService userService;
 
     @Autowired
-    private SysUserMapper userMapper;
-
-    @Autowired
-    private TokenService tokenService;
+    private SysTenantService sysTenantService;
 
 
     /**
@@ -57,7 +55,8 @@ public class UserConfigController extends BaseController {
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setCreateTime(new Date());
         user.setUserType("01");
-        user.setStatus("0");
+        user.setFullName(user.getNickName());
+//        user.setStatus("0");
         user.setDelFlag("0");
         int row = userService.addUser(user);
         return toAjax(row);
@@ -81,6 +80,7 @@ public class UserConfigController extends BaseController {
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(new Date());
         return toAjax(userService.updateUserData(user));
@@ -110,7 +110,7 @@ public class UserConfigController extends BaseController {
 
 
     /**
-     * 租户管理-管理员配置-重置密码s
+     * 租户管理-管理员配置-重置密码
      *
      * @param newPassword 新密码
      * @param UserId      用户ID
@@ -128,4 +128,40 @@ public class UserConfigController extends BaseController {
         userService.resetUserPwdOne(UserId, SecurityUtils.encryptPassword(newPassword));
         return ApiResult.success();
     }
+
+
+    /**
+     * 租户管理-管理员配置-管理员信息查询
+     *
+     * @param tenantId 租户ID
+     * @param page     当前页
+     * @param size     每页条数
+     * @return
+     */
+    @GetMapping("getUserList")
+    public ApiResult<CommonPage<SysUser>> getUserList(@RequestParam Integer tenantId,
+                                                      @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
+                                                      @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
+        return ApiResult.success(userService.userList(tenantId, page, size));
+    }
+
+
+    /**
+     * 租户管理-管理员配置-列表查询
+     *
+     * @param tenantName    租户名称
+     * @param tenantManager 租户责任人名称
+     * @param page          当前页
+     * @param size          每页条数
+     * @return
+     */
+    @GetMapping("getTenantDataOne")
+    public ApiResult<CommonPage<SysTenant>> getTenantDataOne(@RequestParam(value = "tenantName", required = false) String tenantName,
+                                                             @RequestParam(value = "tenantManager", required = false) String tenantManager,
+                                                             @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
+                                                             @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
+        return ApiResult.success(sysTenantService.getTenantDataOne(tenantName, tenantManager, page, size));
+    }
+
+
 }

fiveep-model/src/main/java/com/bizmatics/model/system/SysUser.java

@@ -46,6 +46,9 @@ public class SysUser extends BaseEntity
     /** 用户性别 */
     private String sex;
 
+    /** 姓名 */
+    private String fullName;
+
     /** 用户头像 */
     private String avatar;
 
@@ -203,6 +206,17 @@ public class SysUser extends BaseEntity
         this.sex = sex;
     }
 
+    public String getFullName()
+    {
+        return fullName;
+    }
+
+    public void setFullName(String fullName)
+    {
+        this.fullName = fullName;
+    }
+
+
     public String getAvatar()
     {
         return avatar;

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantMapper.java

@@ -29,4 +29,9 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
                                   @Param("current") Integer current,
                                   @Param("size") Integer size);
 
+    List<SysTenant> getTenantDataOne(@Param("tenantName") String tenantName,
+                                     @Param("tenantManager") String tenantManager,
+                                     @Param("current") Integer current,
+                                     @Param("size") Integer size);
+
 }

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

@@ -34,6 +34,9 @@ public interface SysUserMapper
 
     public List<SysUser> getTenantId(Long userId);
 
+    public List<SysUser> getUserData(Integer tenantId,Integer current,Integer size);
+
+
     /**
      * 根据条件分页查询未分配用户角色列表
      * 

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantMapper.xml

@@ -62,4 +62,22 @@
         </if>
     </select>
 
+    <select id="getTenantDataOne" resultType="com.bizmatics.model.SysTenant">
+        SELECT
+        *
+        FROM
+        sys_tenant
+        <where>
+            <if test="tenantName != null and tenantName != ''">
+                and tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
+            </if>
+            <if test="tenantManager != null and tenantManager != ''">
+                and tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
+            </if>
+        </where>
+        <if test="current != null and size != null and size != 0">
+            limit #{current},#{size}
+        </if>
+    </select>
+
 </mapper>

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

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="email"        column="email"        />
 		<result property="phonenumber"  column="phonenumber"  />
 		<result property="sex"          column="sex"          />
+		<result property="fullName"     column="full_name"          />
 		<result property="avatar"       column="avatar"       />
 		<result property="password"     column="password"     />
 		<result property="status"       column="status"       />
@@ -93,6 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT * FROM sys_user
 		where user_id = #{userId}
 	</select>
+
+	<select id="getUserData" parameterType="com.bizmatics.model.system.SysUser"
+			resultType="com.bizmatics.model.system.SysUser">
+		SELECT * FROM sys_user
+		where tenant_id = #{tenantId} AND del_flag=0 and user_type='01'  order by user_id
+		<if test="current != null and size != null and size != 0">
+			limit #{current},#{size}
+		</if>
+	</select>
 	
 	<select id="selectAllocatedList" parameterType="com.bizmatics.model.system.SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
@@ -157,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="nickName != null and nickName != ''">nick_name,</if>
+			<if test="userType != null and userType != ''">user_type,</if>
  			<if test="email != null and email != ''">email,</if>
  			<if test="avatar != null and avatar != ''">avatar,</if>
  			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
@@ -172,6 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
+			<if test="userType != null and userType != ''">#{userType},</if>
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="avatar != null and avatar != ''">#{avatar},</if>
  			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
@@ -197,6 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
  			<if test="password != null and password != ''">password = #{password},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
+			<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>

fiveep-service/src/main/java/com/bizmatics/service/SysTenantService.java

@@ -26,4 +26,6 @@ public interface SysTenantService extends CrudService<SysTenant> {
 
     void updateTenantData(SysTenant sysTenant);
 
+    CommonPage<SysTenant> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size);
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantServiceImpl.java

@@ -1,18 +1,14 @@
 package com.bizmatics.service.impl;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.model.Device;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.vo.SiteDeviceCountVo;
 import com.bizmatics.model.vo.SysTenantOneVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import com.bizmatics.persistence.mapper.SysTenantMapper;
-import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.SysTenantService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -30,9 +26,6 @@ import java.util.UUID;
 @Service
 public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, SysTenant> implements SysTenantService {
 
-    @Autowired
-    private SysUserMapper userMapper;
-
     @Override
     public List<SysTenantVo> getUserData() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -43,41 +36,42 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
 
     /**
      * 租户管理-租户列表查询
+     *
      * @param sysTenantOneVo
      * @return
      */
     @Override
-    public CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo){
-        List<SysTenant> list1 = baseMapper.getTenantData(sysTenantOneVo.getTenantName() ,
-                                                         sysTenantOneVo.getTenantManager() ,
-                                                         sysTenantOneVo.getTenantType() ,
-                                                         sysTenantOneVo.getStatus() ,
-                                                         sysTenantOneVo.getStartTime() ,
-                                                         sysTenantOneVo.getEndTime() ,null ,null);
+    public CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo) {
+        List<SysTenant> list1 = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
+                sysTenantOneVo.getTenantManager(),
+                sysTenantOneVo.getTenantType(),
+                sysTenantOneVo.getStatus(),
+                sysTenantOneVo.getStartTime(),
+                sysTenantOneVo.getEndTime(), null, null);
         int total = 0;
         if (list1.size() > 0) {
             total = list1.size();
         }
         Integer current = null;
-        if (sysTenantOneVo.getPage()!=null&&sysTenantOneVo.getSize()>0){
+        if (sysTenantOneVo.getPage() != null && sysTenantOneVo.getSize() > 0) {
             current = (sysTenantOneVo.getPage() - 1) * sysTenantOneVo.getSize();
         }
-        List<SysTenant> list = baseMapper.getTenantData(sysTenantOneVo.getTenantName() ,
-                                                        sysTenantOneVo.getTenantManager() ,
-                                                        sysTenantOneVo.getTenantType() ,
-                                                        sysTenantOneVo.getStatus() ,
-                                                        sysTenantOneVo.getStartTime() ,
-                                                        sysTenantOneVo.getEndTime() ,
-                                                        current ,
-                                                        sysTenantOneVo.getSize());
+        List<SysTenant> list = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
+                sysTenantOneVo.getTenantManager(),
+                sysTenantOneVo.getTenantType(),
+                sysTenantOneVo.getStatus(),
+                sysTenantOneVo.getStartTime(),
+                sysTenantOneVo.getEndTime(),
+                current,
+                sysTenantOneVo.getSize());
         return new CommonPage<>(list, total, sysTenantOneVo.getSize(), sysTenantOneVo.getPage());
     }
 
     @Override
-    public void addTenantData(SysTenant sysTenant){
+    public void addTenantData(SysTenant sysTenant) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         String uuid = UUID.randomUUID().toString();
-        uuid=uuid.replace("-", "");
+        uuid = uuid.replace("-", "");
         sysTenant.setTenantCode(uuid);
         sysTenant.setStatus("0");
         sysTenant.setCreateBy(user.getUserName());
@@ -87,10 +81,26 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
 
 
     @Override
-    public void updateTenantData(SysTenant sysTenant){
+    public void updateTenantData(SysTenant sysTenant) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         sysTenant.setUpdateBy(user.getUserName());
         sysTenant.setUpdateTime(LocalDateTime.now());
         this.updateById(sysTenant);
     }
+
+
+    @Override
+    public CommonPage<SysTenant> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size) {
+        List<SysTenant> list1 = baseMapper.getTenantDataOne(tenantName, tenantManager, null, null);
+        int total = 0;
+        if (list1.size() > 0) {
+            total = list1.size();
+        }
+        Integer current = null;
+        if (page != null && size > 0) {
+            current = (page - 1) * size;
+        }
+        List<SysTenant> list = baseMapper.getTenantDataOne(tenantName, tenantManager, current, size);
+        return new CommonPage<>(list, total, size, page);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.bizmatics.service.system;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.system.SysUser;
 
@@ -215,4 +216,6 @@ public interface ISysUserService {
     public int delUsers(Long userId);
 
     public int addUser(SysUser user);
+
+    public CommonPage<SysUser> userList(Integer tenantId, Integer page, Integer size);
 }

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

@@ -1,7 +1,9 @@
 package com.bizmatics.service.system.impl;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.StringUtils;
+import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.UserSite;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.*;
@@ -560,4 +562,22 @@ public class SysUserServiceImpl implements ISysUserService {
     public int delUsers(Long userId) {
         return userMapper.deleteUserById(userId);
     }
+
+
+
+
+    @Override
+    public CommonPage <SysUser> userList(Integer tenantId,Integer page,Integer size) {
+        List<SysUser> list1 = userMapper.getUserData(tenantId,null,null);
+        int total = 0;
+        if (list1.size() > 0) {
+            total = list1.size();
+        }
+        Integer current = null;
+        if (page!=null&&size>0){
+            current = (page - 1) * size;
+        }
+        List<SysUser> list = userMapper.getUserData(tenantId, current, size);
+        return new CommonPage<>(list, total, size, page);
+    }
 }