整理公共板块代码

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/SysUserPost.java

@@ -0,0 +1,33 @@
+
+package com.kxs.system.api.model;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户岗位表
+ * </p>
+ *
+ * @author fxz
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysUserPost extends Model<SysUserPost> {
+
+
+	/**
+	 * 用户ID
+	 */
+	@Schema(description = "用户id")
+	private Long userId;
+
+	/**
+	 * 岗位ID
+	 */
+	@Schema(description = "岗位id")
+	private Long postId;
+
+}

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/RoleVO.java

@@ -1,6 +1,8 @@
 package com.kxs.system.api.vo.admin;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -14,11 +16,13 @@ public class RoleVO {
 	/**
 	 * 角色id
 	 */
+	@NotNull(message = "角色id不能为空")
 	private Long roleId;
 
 	/**
 	 * 菜单列表
 	 */
+	@NotBlank(message = "菜单列表不能为空")
 	private String menuIds;
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysClientController.java

@@ -46,7 +46,7 @@ public class SysClientController {
 	 * @return SysOauthClientDetails
 	 */
 	@GetMapping("getById")
-	public R getByClientId(@RequestParam String clientId) {
+	public R getByClientId(@RequestParam("clientId") String clientId) {
 		SysOauthClientDetails details = clientDetailsService
 			.getOne(Wrappers.<SysOauthClientDetails>lambdaQuery().eq(SysOauthClientDetails::getClientId, clientId));
 		return R.ok(details);

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysDeptController.java

@@ -42,7 +42,7 @@ public class SysDeptController {
 	 * @return SysDept
 	 */
 	@GetMapping("getById")
-	public R getById(@RequestParam Long id) {
+	public R getById(@RequestParam("id") Long id) {
 		return R.ok(sysDeptService.getById(id));
 	}
 
@@ -106,7 +106,7 @@ public class SysDeptController {
 	 * @return 返回子级
 	 */
 	@GetMapping(value = "/getDescendantList")
-	public R getDescendantList(@RequestParam Long deptId) {
+	public R getDescendantList(@RequestParam("deptId") Long deptId) {
 		return R.ok(sysDeptService.listDescendant(deptId));
 	}
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysDictController.java

@@ -50,7 +50,7 @@ public class SysDictController {
 	 * @return 字典信息
 	 */
 	@GetMapping("/getById")
-	public R getById(@RequestParam Long id) {
+	public R getById(@RequestParam("id") Long id) {
 		return R.ok(sysDictService.getById(id));
 	}
 
@@ -84,7 +84,7 @@ public class SysDictController {
 	 */
 	@GetMapping("type")
 	@Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()")
-	public R<List<SysDictItem>> getDictByType(@RequestParam String type) {
+	public R<List<SysDictItem>> getDictByType(@RequestParam("type") String type) {
 		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getDictType, type)));
 	}
 
@@ -128,12 +128,11 @@ public class SysDictController {
 	}
 
 	/**
-	 * 分页查询
+	 * 查询
 	 * @param name 名称或者字典项
-	 * @return
 	 */
 	@GetMapping("/list")
-	public R getDictList(String name) {
+	public R getDictList(@RequestParam("name") String name) {
 		return R.ok(sysDictService.list(Wrappers.<SysDict>lambdaQuery()
 			.like(StrUtil.isNotBlank(name), SysDict::getDictType, name)
 			.or()
@@ -144,10 +143,9 @@ public class SysDictController {
 	 * 分页查询
 	 * @param page 分页对象
 	 * @param sysDictItem 字典项
-	 * @return
 	 */
 	@GetMapping("/pageItem")
-	public R getSysDictItemPage(Page page, SysDictItem sysDictItem) {
+	public R getSysDictItemPage(Page<SysDictItem> page, @ParameterObject SysDictItem sysDictItem) {
 		return R.ok(sysDictItemService.page(page, Wrappers.query(sysDictItem)));
 	}
 
@@ -167,7 +165,7 @@ public class SysDictController {
 	 * @return R
 	 */
 	@GetMapping("/detailsItem")
-	public R getDictItemDetails(SysDictItem query) {
+	public R getDictItemDetails(@ParameterObject SysDictItem query) {
 		return R.ok(sysDictItemService.getOne(Wrappers.query(query), false));
 	}
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysPostController.java

@@ -55,7 +55,7 @@ public class SysPostController {
 	@Operation(description = "分页查询", summary = "分页查询")
 	@GetMapping("/page")
 	@PreAuthorize("@pms.hasPermission('sys_post_view')")
-	public R getSysPostPage(@ParameterObject Page page, @ParameterObject SysPost sysPost) {
+	public R getSysPostPage(@ParameterObject Page<SysPost> page, @ParameterObject SysPost sysPost) {
 		return R.ok(sysPostService.page(page, Wrappers.<SysPost>lambdaQuery()
 			.like(StrUtil.isNotBlank(sysPost.getPostName()), SysPost::getPostName, sysPost.getPostName())));
 	}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysPublicParamController.java

@@ -56,7 +56,7 @@ public class SysPublicParamController {
 	 */
 	@Operation(description = "分页查询", summary = "分页查询")
 	@GetMapping("/page")
-	public R getSysPublicParamPage(@ParameterObject Page page, @ParameterObject SysPublicParam sysPublicParam) {
+	public R getSysPublicParamPage(@ParameterObject Page<SysPublicParam> page, @ParameterObject SysPublicParam sysPublicParam) {
 		LambdaUpdateWrapper<SysPublicParam> wrapper = Wrappers.<SysPublicParam>lambdaUpdate()
 			.like(StrUtil.isNotBlank(sysPublicParam.getPublicName()), SysPublicParam::getPublicName,
 					sysPublicParam.getPublicName())

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysRoleController.java

@@ -129,7 +129,7 @@ public class SysRoleController {
 	 * @return 分页对象
 	 */
 	@GetMapping("/page")
-	public R getRolePage(Page page, SysRole role) {
+	public R getRolePage(Page<SysRole> page, SysRole role) {
 		return R.ok(sysRoleService.page(page, Wrappers.<SysRole>lambdaQuery()
 			.like(CharSequenceUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())));
 	}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysUserController.java

@@ -10,6 +10,7 @@ import com.kxs.common.security.annotation.Inner;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.system.api.dto.admin.UserDTO;
 import com.kxs.system.api.model.SysUser;
+import com.kxs.system.api.vo.admin.UserVO;
 import com.kxs.system.biz.constant.enums.SysErrorTypeEnum;
 import com.kxs.system.biz.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -146,7 +147,7 @@ public class SysUserController {
 	 * @return 用户集合
 	 */
 	@GetMapping("/page")
-	public R getUserPage(@ParameterObject Page page, @ParameterObject UserDTO userDTO) {
+	public R getUserPage(@ParameterObject Page<UserVO> page, @ParameterObject UserDTO userDTO) {
 		return R.ok(userService.getUsersWithRolePage(page, userDTO));
 	}
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/SysUserPostMapper.java

@@ -0,0 +1,19 @@
+
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.SysUserPost;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户岗位 Mapper 接口
+ * </p>
+ *
+ * @author fxz
+ * @since 2022/3/19
+ */
+@Mapper
+public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
+
+}

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysUserServiceImpl.java

@@ -15,12 +15,10 @@ import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.system.api.dto.admin.UserDTO;
 import com.kxs.system.api.dto.admin.UserInfo;
-import com.kxs.system.api.model.SysMenu;
-import com.kxs.system.api.model.SysRole;
-import com.kxs.system.api.model.SysUser;
-import com.kxs.system.api.model.SysUserRole;
+import com.kxs.system.api.model.*;
 import com.kxs.system.api.vo.admin.UserVO;
 import com.kxs.system.biz.mapper.SysUserMapper;
+import com.kxs.system.biz.mapper.SysUserPostMapper;
 import com.kxs.system.biz.mapper.SysUserRoleMapper;
 import com.kxs.system.biz.service.SysMenuService;
 import com.kxs.system.biz.service.SysPublicParamService;
@@ -64,6 +62,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	private final SysPublicParamService sysPublicParamService;
 
+	private final SysUserPostMapper sysUserPostMapper;
+
 	/**
 	 * 保存用户信息
 	 * @param userDto DTO 对象
@@ -78,6 +78,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		sysUser.setCreateBy(userDto.getUsername());
 		sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
 		baseMapper.insert(sysUser);
+		// 保存用户岗位信息
+		Optional.ofNullable(userDto.getPost()).ifPresent(posts -> {
+			posts.stream().map(postId -> {
+				SysUserPost userPost = new SysUserPost();
+				userPost.setUserId(sysUser.getUserId());
+				userPost.setPostId(postId);
+				return userPost;
+			}).forEach(sysUserPostMapper::insert);
+		});
 		// 如果角色为空，赋默认角色
 		if (CollUtil.isEmpty(userDto.getRole())) {
 			// 获取默认角色编码
@@ -218,7 +227,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			userRole.setRoleId(roleId);
 			return userRole;
 		}).forEach(SysUserRole::insert);
-
+		
+		// 更新用户岗位表
+		sysUserPostMapper.delete(Wrappers.<SysUserPost>lambdaQuery().eq(SysUserPost::getUserId, userDto.getUserId()));
+		userDto.getPost().stream().map(postId -> {
+			SysUserPost userPost = new SysUserPost();
+			userPost.setUserId(sysUser.getUserId());
+			userPost.setPostId(postId);
+			return userPost;
+		}).forEach(SysUserPost::insert);
 		return Boolean.TRUE;
 	}
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeader.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -56,7 +53,9 @@ public class KxsLeader extends Model<KxsLeader> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsPartner.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -62,7 +59,9 @@ public class KxsPartner extends Model<KxsPartner> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUser.java

@@ -4,10 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -175,8 +172,10 @@ public class KxsUser extends Model<KxsUser> {
     
     /**
      * 删除标记，0未删除，1已删除
-     */     
+     */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
     
     

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAmount.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -55,10 +52,13 @@ public class KxsUserAmount extends Model<KxsUserAmount> implements Serializable
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 
+
     /**
      * 版本
      */

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserBank.java

@@ -4,10 +4,7 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -55,7 +52,9 @@ public class KxsUserBank extends Model<KxsUserBank> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserReal.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -56,7 +53,9 @@ public class KxsUserReal extends Model<KxsUserReal> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserWithdrawal.java

@@ -5,10 +5,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -56,10 +53,13 @@ public class KxsUserWithdrawal extends Model<KxsUserWithdrawal> implements Seria
     /**
      * 删除标记，0未删除，1已删除
      */
+    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
+    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 
+
     /**
      * 版本
      */