➕ 增加岗位管理

blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/PostDTO.java

@@ -0,0 +1,33 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.system.entity.Post;
+
+/**
+ * 岗位表数据传输对象实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PostDTO extends Post {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Post.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 岗位表实体类
+ *
+ * @author Chill
+ */
+@Data
+@TableName("blade_post")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Post对象", description = "岗位表")
+public class Post extends TenantEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private Integer category;
+	/**
+	 * 岗位编号
+	 */
+	@ApiModelProperty(value = "岗位编号")
+	private String postCode;
+	/**
+	 * 岗位名称
+	 */
+	@ApiModelProperty(value = "岗位名称")
+	private String postName;
+	/**
+	 * 岗位排序
+	 */
+	@ApiModelProperty(value = "岗位排序")
+	private Integer sort;
+	/**
+	 * 岗位描述
+	 */
+	@ApiModelProperty(value = "岗位描述")
+	private String remark;
+
+
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/PostVO.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.system.entity.Post;
+
+/**
+ * 岗位表视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PostVO对象", description = "岗位表")
+public class PostVO extends Post {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户名
+	 */
+	private String tenantName;
+	/**
+	 * 岗位分类名
+	 */
+	private String categoryName;
+
+}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -35,6 +35,10 @@ public class User extends TenantEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 用户编号
+	 */
+	private String code;
 	/**
 	 * 账号
 	 */
@@ -79,6 +83,10 @@ public class User extends TenantEntity {
 	 * 部门id
 	 */
 	private String deptId;
+	/**
+	 * 岗位id
+	 */
+	private String postId;
 
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/controller/PostController.java

@@ -0,0 +1,138 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.entity.Post;
+import org.springblade.system.service.IPostService;
+import org.springblade.system.vo.PostVO;
+import org.springblade.system.wrapper.PostWrapper;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 岗位表 控制器
+ *
+ * @author Chill
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/post")
+@Api(value = "岗位表", tags = "岗位表接口")
+public class PostController extends BladeController {
+
+	private IPostService postService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入post")
+	public R<PostVO> detail(Post post) {
+		Post detail = postService.getOne(Condition.getQueryWrapper(post));
+		return R.data(PostWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 岗位表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入post")
+	public R<IPage<PostVO>> list(Post post, Query query) {
+		IPage<Post> pages = postService.page(Condition.getPage(query), Condition.getQueryWrapper(post));
+		return R.data(PostWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 岗位表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入post")
+	public R<IPage<PostVO>> page(PostVO post, Query query) {
+		IPage<PostVO> pages = postService.selectPostPage(Condition.getPage(query), post);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 岗位表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入post")
+	public R save(@Valid @RequestBody Post post) {
+		return R.status(postService.save(post));
+	}
+
+	/**
+	 * 修改 岗位表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入post")
+	public R update(@Valid @RequestBody Post post) {
+		return R.status(postService.updateById(post));
+	}
+
+	/**
+	 * 新增或修改 岗位表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入post")
+	public R submit(@Valid @RequestBody Post post) {
+		return R.status(postService.saveOrUpdate(post));
+	}
+
+
+	/**
+	 * 删除 岗位表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(postService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 下拉数据源
+	 */
+	@GetMapping("/select")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "下拉数据源", notes = "传入post")
+	public R<List<Post>> select(Post post) {
+		List<Post> list = postService.list(Condition.getQueryWrapper(post));
+		return R.data(list);
+	}
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/mapper/PostMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.system.entity.Post;
+import org.springblade.system.vo.PostVO;
+
+import java.util.List;
+
+/**
+ * 岗位表 Mapper 接口
+ *
+ * @author Chill
+ */
+public interface PostMapper extends BaseMapper<Post> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param post
+	 * @return
+	 */
+	List<PostVO> selectPostPage(IPage page, PostVO post);
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/mapper/PostMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.system.mapper.PostMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="postResultMap" type="org.springblade.system.entity.Post">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="category" property="category"/>
+        <result column="post_code" property="postCode"/>
+        <result column="post_name" property="postName"/>
+        <result column="sort" property="sort"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+
+    <select id="selectPostPage" resultMap="postResultMap">
+        select * from blade_post where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-system/src/main/java/org/springblade/system/service/IPostService.java

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.system.entity.Post;
+import org.springblade.system.vo.PostVO;
+
+/**
+ * 岗位表 服务类
+ *
+ * @author Chill
+ */
+public interface IPostService extends BaseService<Post> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param post
+	 * @return
+	 */
+	IPage<PostVO> selectPostPage(IPage<PostVO> page, PostVO post);
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PostServiceImpl.java

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.system.entity.Post;
+import org.springblade.system.mapper.PostMapper;
+import org.springblade.system.service.IPostService;
+import org.springblade.system.vo.PostVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 岗位表 服务实现类
+ *
+ * @author Chill
+ */
+@Service
+public class PostServiceImpl extends BaseServiceImpl<PostMapper, Post> implements IPostService {
+
+	@Override
+	public IPage<PostVO> selectPostPage(IPage<PostVO> page, PostVO post) {
+		return page.setRecords(baseMapper.selectPostPage(page, post));
+	}
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -55,6 +55,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	private final IRoleService roleService;
 	private final IMenuService menuService;
 	private final IDeptService deptService;
+	private final IPostService postService;
 	private final IRoleMenuService roleMenuService;
 	private final IUserClient userClient;
 
@@ -112,6 +113,14 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			dept.setSort(2);
 			dept.setIsDeleted(0);
 			deptService.save(dept);
+			// 新建租户对应的默认岗位
+			Post post = new Post();
+			post.setTenantId(tenantId);
+			post.setCategory(1);
+			post.setPostCode("ceo");
+			post.setPostName("首席执行官");
+			post.setSort(1);
+			postService.save(post);
 			// 新建租户对应的默认管理用户
 			User user = new User();
 			user.setTenantId(tenantId);
@@ -123,6 +132,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			user.setPassword(password);
 			user.setRoleId(String.valueOf(role.getId()));
 			user.setDeptId(String.valueOf(dept.getId()));
+			user.setPostId(String.valueOf(post.getId()));
 			user.setBirthday(new Date());
 			user.setSex(1);
 			user.setIsDeleted(0);
@@ -148,8 +158,10 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	private List<Menu> getMenus(List<String> codes, LinkedList<Menu> menus) {
 		codes.forEach(code -> {
 			Menu menu = menuService.getOne(Wrappers.<Menu>query().lambda().eq(Menu::getCode, code).eq(Menu::getIsDeleted, BladeConstant.DB_NOT_DELETED));
-			menus.add(menu);
-			recursion(menu.getId(), menus);
+			if (menu != null) {
+				menus.add(menu);
+				recursion(menu.getId(), menus);
+			}
 		});
 		return menus;
 	}

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/PostWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.cache.SysCache;
+import org.springblade.system.entity.Post;
+import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.PostVO;
+
+import java.util.Objects;
+
+/**
+ * 岗位表包装类,返回视图层所需的字段
+ *
+ * @author Chill
+ */
+public class PostWrapper extends BaseEntityWrapper<Post, PostVO> {
+
+	public static PostWrapper build() {
+		return new PostWrapper();
+	}
+
+	@Override
+	public PostVO entityVO(Post post) {
+		PostVO postVO = Objects.requireNonNull(BeanUtil.copy(post, PostVO.class));
+		Tenant tenant = SysCache.getTenant(post.getTenantId());
+		String categoryName = DictCache.getValue("post", post.getCategory());
+		postVO.setTenantName(tenant.getTenantName());
+		postVO.setCategoryName(categoryName);
+		return postVO;
+	}
+
+}

doc/nacos/blade.yaml

@@ -85,7 +85,7 @@ blade:
         path-patterns:
           - /saber/**
   tenant:
-    enhance: false
+    enhance: true
     column: tenant_id
     exclude-tables:
       - blade_user