开发运维管理系统-获取平台账号列表、新增、修改和删除接口

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -61,7 +61,7 @@ public class SysUserController extends BaseController
     }
 
     /**
-     * 获取平台账号列表
+     * 运维管理系统-获取平台账号列表
      */
 //    @Log(title = "用户列表", businessType = BusinessType.SELECT)
     @GetMapping("/platAccountlist")
@@ -72,6 +72,54 @@ public class SysUserController extends BaseController
         return ApiResult.success(getDataTable(list));
     }
 
+    /**
+     * 新增运维管理系统-平台账号
+     */
+    @Log(title = "新增运维管理系统-平台账号", businessType = BusinessType.INSERT)
+    @Transactional
+    @PostMapping("/platAccountAdd")
+    public ApiResult<Void> platAccountAdd(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),0)))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        if(UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique1(user.getPhonenumber(),0))){
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增手机号'" + user.getPhonenumber() + "'失败，手机号已存在");
+        }
+        if(UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique1(user.getEmail(),0))){
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增邮箱'" + user.getEmail() + "'失败，邮箱已存在");
+        }
+//        user.setUserType("00");
+//        user.setTenantId(SecurityUtils.getTenantId());
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        int row = userService.insertPlatAccount(user);
+        return toAjax(row);
+    }
+
+    /**
+     * 修改运维管理系统-平台账号
+     */
+    @Log(title = "修改运维管理系统-平台账号", businessType = BusinessType.UPDATE)
+    @Transactional
+    @PutMapping("/updatePlatAccount")
+    public ApiResult<Void> updatePlatAccount(@Validated @RequestBody SysUser user)
+    {
+        user.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updatePlatAccount(user));
+    }
+
+    /**
+     * 删除运维管理系统-平台账号
+     */
+    @Log(title = "删除运维管理系统-平台账号", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delPlatAccount/{userId}")
+    public ApiResult<Void> remove(@PathVariable Long userId)
+    {
+        return toAjax(userService.deletePlatAccountById(userId));
+    }
+
     /**
      * 获取用户列表
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -24,6 +24,8 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
      */
     public List<SysUser> selectUserList(SysUser sysUser);
 
+    List<SysUser> platAccountlist(SysUser sysUser);
+
     /**
      * 根据条件分页查询未已配用户角色列表
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -25,6 +25,7 @@ public interface ISysUserService extends CrudService<SysUser> {
 
 
     List<SysUser> platAccountlist(SysUser user);
+    int insertPlatAccount(SysUser user);
 
     /**
      * 根据条件分页查询用户列表
@@ -169,6 +170,15 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public int updateUser(SysUser user);
 
+
+    /**
+     * 修改运维管理系统-平台账号信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updatePlatAccount(SysUser user);
+
     /**
      * 用户授权角色
      *
@@ -227,6 +237,14 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public int deleteUserById(Long userId);
 
+    /**
+     * 删除运维管理系统-平台账号信息
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public int deletePlatAccountById(Long userId);
+
     /**
      * 批量删除用户信息
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -81,7 +81,21 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     @Override
     public List<SysUser> platAccountlist(SysUser user) {
 
-        return userMapper.selectUserList(user);
+        return userMapper.platAccountlist(user);
+    }
+
+    /**
+     * 新增运维管理系统-平台账号信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertPlatAccount(SysUser user) {
+        // 新增用户信息
+        int rows = userMapper.insertUser(user);
+        return rows;
     }
 
     /**
@@ -367,6 +381,18 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.updateUser(user);
     }
 
+    /**
+     * 修改保存运维管理系统-平台账号信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updatePlatAccount(SysUser user) {
+        return userMapper.updateUser(user);
+    }
+
     /**
      * 用户授权角色
      *
@@ -519,6 +545,18 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.deleteUserById(userId);
     }
 
+    /**
+     * 删除运维管理系统-平台账号信息
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deletePlatAccountById(Long userId) {
+        return userMapper.deleteUserById(userId);
+    }
+
     /**
      * 批量删除用户信息
      *

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -22,8 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="loginDate"    column="login_date"   />
 		<result property="createBy"     column="create_by"    />
 		<result property="createTime"   column="create_time"  />
-		<result property="updateBy"     column="update_by"    />
-		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
 		<result property="tenantId"       column="tenant_id"       />
 		<result property="address"       column="address"       />
@@ -61,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex,
+		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.phonenumber, u.sex, u.full_name, u.avatar, u.password,
 		u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
 		from sys_user_tenant ut
 		left join sys_user u on ut.user_id = u.user_id
@@ -98,6 +96,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		ORDER BY u.user_id DESC
 	</select>
+
+	<select id="platAccountlist" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.phonenumber, u.sex, u.full_name, u.avatar, u.password,
+		u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
+		from sys_user u
+		where u.del_flag = '0'
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="createBy != null and createBy != ''">
+			AND u.create_by = #{createBy}
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="tenantId != null and tenantId != '' and tenantId !=0">
+			AND u.tenant_id = #{tenantId}
+		</if>
+		<if test="userType != null and userType != ''">
+			AND u.user_type = #{userType}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{params.beginTime},'%Y-%m-%d %H:%i:%s')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(u.create_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{params.endTime},'%Y-%m-%d %H:%i:%s')
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		ORDER BY u.user_id DESC
+	</select>
 	
 	<select id="selectAllocatedList" parameterType="com.usky.system.domain.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