1、接口添加Swagger注解

2、实体类添加Swagger中文描述

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -14,6 +14,9 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.utils.AntiVirus;
 import com.ruoyi.postCheck.service.IPostCheckedService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.IOUtils;
 import org.apache.ibatis.annotations.Param;
@@ -37,6 +40,7 @@ import com.ruoyi.framework.config.ServerConfig;
  *
  * @author ruoyi
  */
+@Api(tags = "8.1.1-系统工具类")
 @RestController
 @RequestMapping("/common")
 @Anonymous
@@ -62,6 +66,11 @@ public class CommonController {
      * @param fileName 文件名称
      * @param delete   是否删除
      */
+    @ApiOperation("下载文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileName", value = "文件相对地址", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "delete", value = "是否完成后删除", dataType = "String", dataTypeClass = String.class),
+    })
     @GetMapping("/download")
     public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
         try {
@@ -85,6 +94,7 @@ public class CommonController {
     /**
      * 通用上传请求（单个）
      */
+    @ApiOperation("上传文件")
     @PostMapping("/upload")
 //    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, @RequestParam("unid") String unid, @RequestParam("returnImage") String returnImage) throws Exception {
     public AjaxResult uploadFile(MultipartFile file) throws Exception {
@@ -183,7 +193,11 @@ public class CommonController {
         }
     }
 
+
     @ApiOperation("获取地址中文件的Base64")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "path", value = "文件相对地址", dataType = "String", dataTypeClass = String.class),
+    })
     @GetMapping("/getBase64")
     @Anonymous
     public AjaxResult getBase64(String path, HttpServletResponse response) throws IOException {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,23 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.postCheck.controller.PostPlanController;
-import com.ruoyi.postCheck.domain.PostPlan;
-import com.ruoyi.postCheck.service.IPostPlanService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -26,16 +8,24 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 部门信息
  *
  * @author ruoyi
  */
+@Api(tags = "6.2.1-部门管理")
 @RestController
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
@@ -44,13 +34,16 @@ public class SysDeptController extends BaseController
 //    @Autowired
 //    private PostPlanController postPlanController;
 
-    /**
-     * 获取部门列表
-     */
+
+    @ApiOperation("获取部门列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "deptName", value = "部门名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态0正常1停用", dataType = "String", dataTypeClass = String.class),
+    })
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
-    {
+    public AjaxResult list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
 
 //        List<PostPlan> postPlanList = postPlanService.list();
@@ -65,8 +58,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
         return success(depts);
@@ -75,10 +67,12 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
+    @ApiOperation("部门详情")
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
-    {
+    public AjaxResult getInfo(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
         return success(deptService.selectDeptById(deptId));
     }
@@ -89,36 +83,33 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
-    {
-        if (!deptService.checkDeptNameUnique(dept))
-        {
+    public AjaxResult add(@Validated @RequestBody SysDept dept) {
+        if (!deptService.checkDeptNameUnique(dept)) {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(getUsername());
         return toAjax(deptService.insertDept(dept));
     }
 
-    /**
-     * 修改部门
-     */
+    @ApiOperation("修改部门")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "status", value = "部门状态0正常1停用", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "type", value = "部门类型", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "deptCode", value = "部门代码", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "orderNum", value = "显示顺序", dataType = "Integer", dataTypeClass = Integer.class),
+    })
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
-        if (!deptService.checkDeptNameUnique(dept))
-        {
+        if (!deptService.checkDeptNameUnique(dept)) {
             return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(deptId))
-        {
+        } else if (dept.getParentId().equals(deptId)) {
             return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
-        {
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
             return error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(getUsername());
@@ -131,14 +122,11 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
-    {
-        if (deptService.hasChildByDeptId(deptId))
-        {
+    public AjaxResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
             return warn("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return warn("部门存在用户,不允许删除");
         }
         deptService.checkDeptDataScope(deptId);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,21 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.framework.interceptor.cas.CASUser;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -24,12 +8,25 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
 
 /**
  * 菜单信息
  *
  * @author ruoyi
  */
+
+@Api(tags = "6.6.1-菜单管理")
 @RestController
 @RequestMapping("/system/menu")
 @Slf4j
@@ -41,8 +38,9 @@ public class SysMenuController extends BaseController {
 //    @Autowired
 //    private ServerConfig serverConfig;
     /**
-     * 获取菜单列表
+     *
      */
+    @ApiOperation("获取菜单列表")
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu) {
@@ -61,24 +59,23 @@ public class SysMenuController extends BaseController {
     /**
      * 根据菜单编号获取详细信息
      */
+    @ApiOperation("获取菜单详情")
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId) {
         return success(menuService.selectMenuById(menuId));
     }
 
-    /**
-     * 获取菜单下拉树列表
-     */
+
+    @ApiOperation("获取菜单下拉树列表")
     @GetMapping("/treeselect")
     public AjaxResult treeselect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return success(menuService.buildMenuTreeSelect(menus));
     }
 
-    /**
-     * 加载对应角色菜单列表树
-     */
+
+    @ApiOperation("加载对应角色菜单列表树")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
@@ -88,9 +85,8 @@ public class SysMenuController extends BaseController {
         return ajax;
     }
 
-    /**
-     * 新增菜单
-     */
+
+    @ApiOperation("新增菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -107,6 +103,7 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
+    @ApiOperation("修改菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -125,10 +122,13 @@ public class SysMenuController extends BaseController {
     /**
      * 删除菜单
      */
+    @ApiOperation("删除菜单")
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+    public AjaxResult remove(
+            @ApiParam(name = "menuId", value = "菜单ID", required = true)
+            @PathVariable("menuId") Long menuId) {
         if (menuService.hasChildByMenuId(menuId)) {
             return warn("存在子菜单,不允许删除");
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -1,48 +1,35 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.postCheck.domain.PostChecked;
-import com.ruoyi.postCheck.domain.PostPlan;
-import com.ruoyi.postCheck.domain.PostPlanInfo;
-import com.ruoyi.postCheck.service.IPostPlanInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.postCheck.domain.PostPlanInfo;
+import com.ruoyi.postCheck.service.IPostPlanInfoService;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * 岗位信息操作处理
  *
  * @author ruoyi
  */
-@Api(tags = "900.2.1-岗位接口")
+@Api(tags = "6.3.1-岗位管理")
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {
@@ -52,9 +39,8 @@ public class SysPostController extends BaseController {
     @Autowired
     private IPostPlanInfoService postPlanInfoService;
 
-    /**
-     * 获取岗位列表
-     */
+
+    @ApiOperation("获取岗位列表")
     @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysPost post) {
@@ -80,15 +66,27 @@ public class SysPostController extends BaseController {
     /**
      * 根据岗位编号获取详细信息
      */
+    @ApiOperation("岗位详情")
     @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "postId", value = "岗位ID", required = true)
+            @PathVariable Long postId) {
         return success(postService.selectPostById(postId));
     }
 
     /**
      * 新增岗位
      */
+    @ApiOperation("新增岗位")
+    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "postId", value = "岗位ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "postCode", value = "岗位编码", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "postName", value = "岗位名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "postSort", value = "排序", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "status", value = "岗位状态0正常1停用", dataType = "String", dataTypeClass = String.class),
+    })
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -103,9 +101,16 @@ public class SysPostController extends BaseController {
         return toAjax(postService.insertPost(post));
     }
 
-    /**
-     * 修改岗位
-     */
+
+    @ApiOperation("修改岗位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "postId", value = "岗位ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "postCode", value = "岗位编码", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "postName", value = "岗位名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "postSort", value = "排序", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "status", value = "岗位状态0正常1停用", dataType = "String", dataTypeClass = String.class),
+    })
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -120,13 +125,14 @@ public class SysPostController extends BaseController {
         return toAjax(postService.updatePost(post));
     }
 
-    /**
-     * 删除岗位
-     */
+
+    @ApiOperation("删除岗位")
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds) {
+    public AjaxResult remove(
+            @ApiParam(name = "postIds", value = "岗位ID数组", required = true)
+            @PathVariable Long[] postIds) {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
@@ -142,7 +148,12 @@ public class SysPostController extends BaseController {
 
     @ApiOperation("根据部门查询岗位列表，并设置检查时间和检查人员")
     @GetMapping({"/postCheck/optionselect/{deptId}", "/postCheck/optionselect/{deptId}/{planId}"})
-    public AjaxResult postCheckOptionselect(@PathVariable("deptId") Long deptId, @PathVariable(value = "planId", required = false) Long planId) {
+    public AjaxResult postCheckOptionselect(
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable("deptId") Long deptId,
+
+            @ApiParam(name = "planId", value = "计划ID", required = false)
+            @PathVariable(value = "planId", required = false) Long planId) {
         List<SysPost> posts = postService.selectPostByDeptId(deptId);
         if (planId != null) {
             //根据计划ID查询岗位的检查时间和检查人

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,19 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,19 +10,26 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 角色信息
  *
  * @author ruoyi
  */
+@Api(tags = "6.4.1-角色管理")
 @RestController
 @RequestMapping("/system/role")
 public class SysRoleController extends BaseController {
@@ -55,6 +48,7 @@ public class SysRoleController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
+    @ApiOperation("角色列表查询")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role) {
@@ -79,9 +73,12 @@ public class SysRoleController extends BaseController {
     /**
      * 根据角色编号获取详细信息
      */
+    @ApiOperation("角色详情查询")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "roleId", value = "角色ID", required = true)
+            @PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
         return success(roleService.selectRoleById(roleId));
     }
@@ -89,6 +86,7 @@ public class SysRoleController extends BaseController {
     /**
      * 新增角色
      */
+    @ApiOperation("新增角色")
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -106,6 +104,7 @@ public class SysRoleController extends BaseController {
     /**
      * 修改保存角色
      */
+    @ApiOperation("修改角色")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -147,6 +146,7 @@ public class SysRoleController extends BaseController {
     /**
      * 状态修改
      */
+    @ApiOperation("角色状态修改")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
@@ -160,6 +160,7 @@ public class SysRoleController extends BaseController {
     /**
      * 删除角色
      */
+    @ApiOperation("删除角色")
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
@@ -170,6 +171,7 @@ public class SysRoleController extends BaseController {
     /**
      * 获取角色选择框列表
      */
+    @ApiOperation("获取角色选择框列表")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
     public AjaxResult optionselect() {
@@ -179,6 +181,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询已分配用户角色列表
      */
+    @ApiOperation("查询已分配用户角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo allocatedList(SysUser user) {
@@ -190,6 +193,7 @@ public class SysRoleController extends BaseController {
     /**
      * 查询未分配用户角色列表
      */
+    @ApiOperation("查询未分配用户角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo unallocatedList(SysUser user) {
@@ -202,6 +206,7 @@ public class SysRoleController extends BaseController {
     /**
      * 取消授权用户
      */
+    @ApiOperation("取消授权用户")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
@@ -212,6 +217,11 @@ public class SysRoleController extends BaseController {
     /**
      * 批量取消授权用户
      */
+    @ApiOperation("批量取消授权用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roleId", value = "角色ID数组", dataType = "Long[]", dataTypeClass = Long[].class),
+            @ApiImplicitParam(name = "userIds", value = "用户ID数组", dataType = "Long[]", dataTypeClass = Long[].class),
+    })
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
@@ -222,6 +232,11 @@ public class SysRoleController extends BaseController {
     /**
      * 批量选择用户授权
      */
+    @ApiOperation("批量选择用户授权")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "roleId", value = "角色ID数组", dataType = "Long[]", dataTypeClass = Long[].class),
+            @ApiImplicitParam(name = "userIds", value = "用户ID数组", dataType = "Long[]", dataTypeClass = Long[].class),
+    })
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
@@ -230,8 +245,11 @@ public class SysRoleController extends BaseController {
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
 
+
     /**
      * 获取对应角色部门树列表
+     * @param roleId
+     * @return
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,33 +1,9 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.core.domain.TreeSelect;
-import com.ruoyi.temp.model.DataBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -35,18 +11,27 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
  *
  * @author ruoyi
  */
-@Api(tags = "900.1.1-部门、用户接口")
+@Api(tags = "6.1.1-用户管理")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {
@@ -62,9 +47,8 @@ public class SysUserController extends BaseController {
     @Autowired
     private ISysPostService postService;
 
-    /**
-     * 获取用户列表
-     */
+
+    @ApiOperation("获取用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
@@ -92,6 +76,7 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
     }
 
+/*
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
@@ -100,6 +85,7 @@ public class SysUserController extends BaseController {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
     }
+    */
 /*
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@@ -123,9 +109,12 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
+    @ApiOperation("查询用户详情")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{userId}"})
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "userId", value = "用户ID", required = false)
+            @PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
@@ -180,6 +169,14 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("用户修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "nickName", value = "用户姓名", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "email", value = "用户邮箱", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "账号状态", dataType = "String", dataTypeClass = String.class),
+    })
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
@@ -227,6 +224,12 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
+    @ApiOperation("用户状态修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "status", value = "账号状态", dataType = "String", dataTypeClass = String.class),
+
+    })
     public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
@@ -254,6 +257,11 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
+    @ApiOperation("用户授权角色")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "roleIds", value = "角色数组ID", dataType = "Long[]", dataTypeClass = Long[].class),
+    })
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
@@ -267,32 +275,6 @@ public class SysUserController extends BaseController {
     @ApiOperation("获取部门树列表")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept) {
-
-        //测试合并单元格
-      /*  if(false){
-//           ExcelUtil init 方法中，设置合并单元格
-//            sheet.addMergedRegion(new CellRangeAddress(8, 10, 0, 2));//标题合并单元格操作，17为总列数   已测试通过可以合并
-
-//            List<DataBean> list = ListUtils.newArrayList();
-            List<DataBean> list = new ArrayList<>();
-            for (int i = 0; i < 10; i++) {
-                DataBean data = new DataBean();
-                data.setName("字符串" + i);
-                data.setContent(new Date() + "");
-                data.setContent2(new Date() + "");
-                data.setContent3(new Date() + "");
-                list.add(data);
-            }
-
-
-            ExcelUtil<DataBean> util = new ExcelUtil<>(DataBean.class);
-            String sheetName = "岗检计划";
-            String title = "岗位责任制检查表";
-            AjaxResult ajaxResult = util.exportExcel(list, sheetName, title);
-            System.out.println();
-            System.out.println("ajaxResult = " + ajaxResult);
-            System.out.println();
-        }*/
         dept.setStatus("0");
         List<TreeSelect> treeSelects = deptService.selectDeptTreeListPostCheck(dept);
 

ruoyi-admin/src/main/resources/application-druid-test.yml

@@ -34,7 +34,7 @@ spring:
             master:
 #                url: jdbc:kingbase8://localhost:54321/postcheck
 #                url: jdbc:kingbase8://10.152.164.68:54321/postcheck
-                url: jdbc:kingbase8://10.152.72.5:9300/postcheck
+                url: jdbc:kingbase8://10.152.72.7:9300/postcheck
                 username: postcheckuser
                 password: Hzsh.eitc@6626.pcu
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -107,6 +107,8 @@ pagehelper:
   params: count=countSql
 
 # Swagger配置
+#  API 访问路径：http://localhost:8180/swagger-ui/index.html
+#  注意：开启Swagger需要关闭CAS客户端注册器 CasConfigure.java上面的注解
 swagger:
   # 是否开启swagger
 #  enabled: false

ruoyi-admin/src/test/java/com/post/Test02.java

@@ -25,7 +25,5 @@ public class Test02 {
 
          l = Long.parseLong("400001");
         System.out.println("l = " + l);
-
-
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -1,32 +1,35 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 部门表 sys_dept
  *
  * @author ruoyi
  */
+@ApiModel(value = "部门管理实体类")
 public class SysDept extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * 部门ID
      */
+    @ApiModelProperty("部门ID")
     private Long deptId;
 
     /**
      * 父部门ID
      */
+    @ApiModelProperty("父部门ID")
     private Long parentId;
 
     /**
@@ -37,11 +40,13 @@ public class SysDept extends BaseEntity {
     /**
      * 部门名称
      */
+    @ApiModelProperty("部门名称")
     private String deptName;
 
     /**
      * 显示顺序
      */
+    @ApiModelProperty("显示顺序")
     private Integer orderNum;
 
     /**
@@ -62,11 +67,13 @@ public class SysDept extends BaseEntity {
     /**
      * 部门状态:0正常,1停用
      */
+    @ApiModelProperty("状态0正常1停用")
     private String status;
 
     /**
      * 删除标志（0代表存在 2代表删除）
      */
+    @ApiModelProperty("删除0存在2删除")
     private Integer delFlag;
 
     /**
@@ -77,6 +84,7 @@ public class SysDept extends BaseEntity {
     /**
      * 部门编码
      */
+    @ApiModelProperty("部门编码")
     private String deptCode;
     /**
      * 岗检系统部门代码：岗检问题编号时需要使用他
@@ -86,6 +94,7 @@ public class SysDept extends BaseEntity {
     /**
      * 1 职能部门 2 生产部门 3 其他
      */
+    @ApiModelProperty("类型-职能2生产3其他")
     private Integer type;
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -4,6 +4,9 @@ import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -15,23 +18,24 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
+@ApiModel(value = "角色管理实体类")
 public class SysRole extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 角色ID */
+    @ApiModelProperty("角色ID")
     @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
     private Long roleId;
 
-    /** 角色名称 */
+    @ApiModelProperty("角色名称")
     @Excel(name = "角色名称")
     private String roleName;
 
-    /** 角色权限 */
+    @ApiModelProperty("角色权限KEY")
     @Excel(name = "角色权限")
     private String roleKey;
 
-    /** 角色排序 */
+    @ApiModelProperty("角色排序")
     @Excel(name = "角色排序")
     private Integer roleSort;
 
@@ -46,10 +50,12 @@ public class SysRole extends BaseEntity
     private boolean deptCheckStrictly;
 
     /** 角色状态（0正常 1停用） */
+    @ApiModelProperty("状态0正常1停用")
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
+    @ApiModelProperty("删除标识0存在2删除")
     private Integer delFlag;
 
     /** 用户是否存在此角色标识 默认不存在 */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -4,6 +4,8 @@ import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -19,42 +21,49 @@ import com.ruoyi.common.xss.Xss;
  *
  * @author ruoyi
  */
+@ApiModel(value = "用户管理实体类")
 public class SysUser extends BaseEntity {
 
     private static final long serialVersionUID = 1440402324862402070L;
     /**
      * 用户ID
      */
+    @ApiModelProperty("用户ID")
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
     /**
      * 部门ID
      */
+    @ApiModelProperty("部门ID")
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
     /**
      * 用户账号
      */
+    @ApiModelProperty("域账号ID")
     @Excel(name = "域账号ID")
     private String userName;
 
     /**
      * 用户昵称
      */
+    @ApiModelProperty("用户姓名")
     @Excel(name = "姓名")
     private String nickName;
 
     /**
      * 用户邮箱
      */
+    @ApiModelProperty("用户邮箱")
     @Excel(name = "用户邮箱")
     private String email;
 
     /**
      * 手机号码
      */
+    @ApiModelProperty("用户手机号")
     @Excel(name = "手机号码")
     private String phonenumber;
 
@@ -67,6 +76,7 @@ public class SysUser extends BaseEntity {
     /**
      * 用户头像
      */
+    @ApiModelProperty("用户头像URL")
     private String avatar;
 
     /**
@@ -77,24 +87,26 @@ public class SysUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
+    @ApiModelProperty("用户状态0正常1停用")
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /**
      * 删除标志（0代表存在 2代表删除）
      */
+    @ApiModelProperty("删除标识0存在2删除")
     private Integer delFlag;
 
     /**
      * 最后登录IP
      */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
+//    @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
     /**
      * 最后登录时间
      */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+//    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /**

ruoyi-framework/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
 
         <!-- SpringBoot Web容器 -->
-         <dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>

ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/cas/CasConfigure.java

@@ -9,8 +9,8 @@ import net.unicon.cas.client.configuration.EnableCasClient;
 /**
  * TODO $CAS统一认证：拦截器类CAS
  */
-@EnableCasClient
-@Configuration
+//@EnableCasClient
+//@Configuration
 public class CasConfigure extends CasClientConfigurerAdapter {
     @Override
     public void configureAuthenticationFilter(FilterRegistrationBean authenticationFilter) {
@@ -21,7 +21,7 @@ public class CasConfigure extends CasClientConfigurerAdapter {
 //              "|/captchaImage/*|/system/*|/common/*|/monitor/*|/register/*|/login/*|/getInfo/*|/getRouters/*|/test/user/*|/tool/gen/*|/postcheck/login|/redirectpostcheck");
         authenticationFilter.addInitParameter("ignorePattern", "/Content/*|/context/*|/actuator/*|/assets/*|/instances/*" +
                 "|/postCheck/*|/captchaImage/*|/system/*|/common/*|/monitor/*|/register/*|/login/*|/logout/*|/getInfo/*|/getRouters/*|/test/user/*|/tool/gen/*|/postcheck/login|/redirectpostcheck|/redirectpostcheckout"+
-                "|/avatar/*");
+                "|/avatar/*|/swagger-ui/*");
         authenticationFilter.getInitParameters().put("authenticationRedirectStrategyClass", "com.patterncat.CustomAuthRedirectStrategy");
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostAssessmentRatingOtherController.java

@@ -1,43 +1,26 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.constant.PostListEnum;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.PostAssessmentRatingOtherEnum;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.DeptCode;
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.postCheck.domain.tools.PostListApproveTypeUser;
+import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
+import com.ruoyi.postCheck.service.IPostAssessmentRatingOtherService;
 import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysUserService;
-import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.postCheck.domain.PostAssessmentRatingOther;
-import com.ruoyi.postCheck.service.IPostAssessmentRatingOtherService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 打分表(职能互评生产日常)Controller
@@ -87,7 +70,14 @@ public class PostAssessmentRatingOtherController extends BaseController {
         startPage("desc", "t1.create_time");
 
         //仅可以查看自己部门的打分任务
-        postAssessmentRatingOther.setDeptId(getDeptId());
+        if (postAssessmentRatingOther.getType() == PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
+            postAssessmentRatingOther.setDeptId(getDeptId());
+        }
+        //生产部门是三大部门给生产部门评分
+        else if (postAssessmentRatingOther.getType() == PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
+            postAssessmentRatingOther.setDeptId(null);
+        }
+
 //        postAssessmentRatingOther.setDeptId(30l);//职能
 //        postAssessmentRatingOther.setDeptId(19l);//生产
 
@@ -114,7 +104,9 @@ public class PostAssessmentRatingOtherController extends BaseController {
     @ApiOperation("获取打分表(职能互评生产日常)详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postAssessmentRatingOther:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "打分表id", required = true)
+            @PathVariable("id") Long id) {
         return success(postAssessmentRatingOtherService.selectPostAssessmentRatingOtherById(id));
     }
 
@@ -231,11 +223,18 @@ public class PostAssessmentRatingOtherController extends BaseController {
         List<Long> userHaveAuthorityList = userList.stream().map(t -> t.getUserId()).collect(Collectors.toList());
 
         if (!userHaveAuthorityList.contains(getUserId())) {
-            return error("无权限，请切换内控法务部经理账号操作！");
+            return error("无权限，请切换内控法务部人员账号操作！");
         }
 
         postAssessmentRatingOther.setDeptId(getDeptId());
-        return toAjax(postAssessmentRatingOtherService.batchAddRatingOther(postAssessmentRatingOther));
+        Integer type = postAssessmentRatingOther.getType();
+        if (type == PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
+            return toAjax(postAssessmentRatingOtherService.batchAddRatingOther(postAssessmentRatingOther));
+        } else if (type == PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
+            return toAjax(postAssessmentRatingOtherService.addRatingOtherSC(postAssessmentRatingOther));
+        } else {
+            return AjaxResult.error("类型错误，请检查！");
+        }
     }
 
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedController.java

@@ -17,10 +17,7 @@ import com.ruoyi.postCheck.domain.PostChecked;
 import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.service.IPostCheckedService;
 import com.ruoyi.postCheck.util.excel.create.PostCheckedCreateExcel;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
@@ -37,7 +34,7 @@ import java.util.List;
  * @author csg
  * @date 2024-01-05
  */
-@Api(tags = "2.5.1-岗检表管理接口")
+@Api(tags = "2.4.1-岗检表管理接口")
 @RestController
 @RequestMapping("/postCheck/postChecked")
 public class PostCheckedController extends BaseController {
@@ -51,7 +48,7 @@ public class PostCheckedController extends BaseController {
     /**
      * 查询岗检表管理列表
      */
-    @ApiOperation("1、查询岗检表管理列表")
+    @ApiOperation("查询岗检表管理列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
@@ -104,22 +101,24 @@ public class PostCheckedController extends BaseController {
     /**
      * 获取岗检表管理详细信息
      */
-    @ApiOperation("2、获取岗检表管理详细信息")
+    @ApiOperation("获取岗检表管理详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "检查表id", required = true)
+            @PathVariable("id") Long id) {
         return success(postCheckedService.selectPostCheckedById(id));
     }
 
 
-    @ApiOperation("3、新增岗检表管理")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
-    })
+    @ApiOperation("新增岗检表管理")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
+//    })
     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:add')")
     @Log(title = "岗检表管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -136,15 +135,15 @@ public class PostCheckedController extends BaseController {
     /**
      * 修改岗检表管理
      */
-    @ApiOperation("4、修改岗检表管理")
-    @ApiImplicitParams({
+    @ApiOperation("修改岗检表管理")
+    /*@ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
-    })
+    })*/
     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:edit')")
     @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -155,26 +154,28 @@ public class PostCheckedController extends BaseController {
     /**
      * 删除岗检表管理
      */
-    @ApiOperation("5、删除岗检表管理")
-    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+    @ApiOperation("删除岗检表管理")
+//    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:remove')")
     @Log(title = "岗检表管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检表ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postCheckedService.deletePostCheckedByIds(ids));
     }
 
-    @ApiOperation("6、岗检表提交审核")
+    @ApiOperation("岗检表提交")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String", dataTypeClass = String.class),
     })
-    @Log(title = "岗检表提交审核", businessType = BusinessType.UPDATE)
+    @Log(title = "岗检表提交", businessType = BusinessType.UPDATE)
     @GetMapping("/submitApprove")
     public AjaxResult submitApprove(Long id) {
         return toAjax(postCheckedService.submitApprove(id));
     }
 
-    @ApiOperation("7、岗检表审核")
+    @ApiOperation("岗检表审核")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "status", value = "状态：3-通过；4-驳回；", dataType = "Integer", dataTypeClass = Integer.class),
@@ -222,9 +223,11 @@ public class PostCheckedController extends BaseController {
     /**
      * 获取岗检表管理详细信息
      */
-    @ApiOperation("岗检表预览")
+    @ApiOperation("岗检表预览详情")
     @GetMapping(value = "/preview/{id}")
-    public AjaxResult preview(@PathVariable("id") Long id) {
+    public AjaxResult preview(
+            @ApiParam(name = "id", value = "岗检表id", required = true)
+            @PathVariable("id") Long id) {
         PostChecked postChecked = postCheckedService.selectPostCheckedById(id);
         PostCheckedCreateExcel postCheckedCreateExcel = new PostCheckedCreateExcel();
         String fileName = postCheckedCreateExcel.createExcel(postChecked, postChecked.getChildren());
@@ -236,7 +239,15 @@ public class PostCheckedController extends BaseController {
     }
 
 
-    @ApiOperation("岗检表-批量下载：返回的压缩包地址，前端再去调用下载文件接口保存文件即可")
+    /**
+     * 岗检表-批量下载 返回的压缩包地址，前端再去调用下载文件接口保存文件即可
+     * @param ids
+     * @return
+     */
+    @ApiOperation("岗检表批量下载")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "岗检表ids", dataType = "String", dataTypeClass = String.class),
+    })
     @GetMapping(value = "/batchExport")
     public AjaxResult batchExport(String ids) {
         String downloadPath = ruoYiConfig.getDownloadPath();

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedHistoryController.java

@@ -1,37 +1,23 @@
 package com.ruoyi.postCheck.controller;
 
-import com.ruoyi.common.constant.PostCheckedReportEnum;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.postCheck.domain.PostCheckedProblem;
-import com.ruoyi.postCheck.domain.PostCheckedReport;
-import com.ruoyi.postCheck.domain.history.CheckStatisticsView;
-import com.ruoyi.postCheck.domain.problemStatistics.CheckedProblemDeptDetaailView;
 import com.ruoyi.postCheck.model.DeptDetaailViewModel;
 import com.ruoyi.postCheck.service.IPostCheckedReportService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 /**
  * 岗检报告管理Controller
  *
  * @author csg
  * @date 2023-12-28
  */
-@Api(tags = "6.1.1-岗检历史")
+//@Api(tags = "99.1.1-岗检历史")
 @RestController
 @RequestMapping("/postCheck/history")
 public class PostCheckedHistoryController extends BaseController {
@@ -63,9 +49,8 @@ public class PostCheckedHistoryController extends BaseController {
     }
 */
 
-    @ApiOperation("2、查看-第一个表格：1-检查部门；2-岗检岗位；3-完整性问题；4-有效性问题；5-适宜性问题；6-问题总数；7-已整改问题；")
+//    @ApiOperation("2、查看-第一个表格：1-检查部门；2-岗检岗位；3-完整性问题；4-有效性问题；5-适宜性问题；6-问题总数；7-已整改问题；")
     @GetMapping("/checkStatistics")
-//    @ApiImplicitParam(name = "id", value = "岗检报告的主键ID", dataType = "Long", dataTypeClass = Long.class)
     public AjaxResult checkStatistics(Long id) {
 
 //        第一步：、1-检查部门；2-岗检岗位；
@@ -77,7 +62,7 @@ public class PostCheckedHistoryController extends BaseController {
         return success(postCheckedReportService.checkStatistics());
     }
 
-    @ApiOperation("3、查看-第二个表格：岗检问题")
+//    @ApiOperation("3、查看-第二个表格：岗检问题")
     @GetMapping("/deptDetaailView")
 //    @ApiImplicitParam(name = "id", value = "岗检报告的主键ID", dataType = "Long", dataTypeClass = Long.class)
 //    public AjaxResult deptDetaailView(DeptDetaailViewModel model) { //notParam不是参数-是返回信息-方便接口联调

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedHomePageController.java

@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
  * @author csg
  * @date 2023-12-23
  */
-@Api(tags = "1-首页")
+@Api(tags = "7.1.1-首页统计查询")
 @RestController
 @RequestMapping("/postCheck/homePage")
 public class PostCheckedHomePageController extends BaseController {
@@ -55,20 +55,20 @@ public class PostCheckedHomePageController extends BaseController {
      * 3、岗检数量-已查：post_plan t1 inner join post_plan_info t2 两张表连接，t2.status(岗检状态：1-未检；2-已检；)
      * 4、岗检数量-未查：post_plan t1 inner join post_plan_info t2 两张表连接，t2.status(岗检状态：1-未检；2-已检；)
      */
-    @ApiOperation("1-总览")
-    @ApiImplicitParams({
+    @ApiOperation("1-总览：统计岗位责任制清单、岗检问题、岗检计划")
+  /*  @ApiImplicitParams({
             @ApiImplicitParam(name = "listCount", value = "责任制清单数量", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemCount", value = "检查出的问题数量", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "checkedPostCount", value = "岗检数量-已查", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "uncheckedPostCount", value = "岗检数量-未查", dataType = "Integer", dataTypeClass = Integer.class),
-    })
+    })*/
     @GetMapping("/totalView")
     public AjaxResult totalView() {
         return success(postCheckedProblemService.totalView());
     }
 
 
-//    @ApiOperation("2-检查出的问题")
+
     @ApiOperation("2-岗检问题属性分布")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "problemTotal", value = "总数量", dataType = "Integer", dataTypeClass = Integer.class),
@@ -84,7 +84,11 @@ public class PostCheckedHomePageController extends BaseController {
     }
 
 
-    @ApiOperation("3-人员数量V2->岗位：data.postShouldCheckedCount；人员：data.userShouldCheckedCount")
+    /**
+     * 3-人员数量V2->岗位：data.postShouldCheckedCount；人员：data.userShouldCheckedCount
+     * @return
+     */
+    @ApiOperation("3-应检岗位数量、应检岗位人数")
     @GetMapping("/userTotal")
     public AjaxResult userTotal() {
         //查询待检查的岗位
@@ -111,7 +115,11 @@ public class PostCheckedHomePageController extends BaseController {
     }
 
 
-    @ApiOperation("4-中间饼图-20240305岗检计划完成率：主要体现“率”百分比（岗检计划中的 已检岗位数量 和 应检岗位数量）")
+    /**
+     * 中间饼图-20240305岗检计划完成率：主要体现“率”百分比（岗检计划中的 已检岗位数量 和 应检岗位数量）
+     * @return
+     */
+    @ApiOperation("4-岗检完成率统计")
     @GetMapping("/planCompletionRate")
     public AjaxResult planCompletionRate() {
 
@@ -206,8 +214,8 @@ public class PostCheckedHomePageController extends BaseController {
     }
 
 
-    @ApiOperation("8-评比排名-废弃")
-    @GetMapping("/assessmentRating")
+//    @ApiOperation("8-评比排名-废弃")
+//    @GetMapping("/assessmentRating")
     public AjaxResult assessmentRating() {
 //        岗位问题表结合岗检规则实时计算岗检扣分情况
 //        select * from "public"."post_checked_problem";

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedItemsController.java

@@ -1,37 +1,30 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.service.IPostCheckedItemsService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
+ * 废弃2024年6月4日09:00:55
+ * 废弃2024年6月4日09:00:55
+ * 废弃2024年6月4日09:00:55
  * 岗检表管理明细Controller
  *
  * @author csg
  * @date 2024-01-05
  */
-@Api(tags = "2.5.2-岗检表管理明细接口（废弃不调）")
+//@Api(tags = "2.5.2-岗检表管理明细接口（废弃不调）")
 @RestController
 @RequestMapping("/postCheck/postCheckedItems")
 public class PostCheckedItemsController extends BaseController
@@ -42,7 +35,7 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 查询岗检表管理明细列表
      */
-    @ApiOperation("查询岗检表管理明细列表")
+    /*@ApiOperation("查询岗检表管理明细列表")
     @ApiImplicitParams({
                     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
                     @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
@@ -56,7 +49,7 @@ public class PostCheckedItemsController extends BaseController
                 @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
                 @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
                 @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
-    })
+    })*/
 //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:list')")
     @GetMapping("/list")
     public TableDataInfo list(PostCheckedItems postCheckedItems)
@@ -69,7 +62,7 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 导出岗检表管理明细列表
      */
-    @ApiOperation("导出岗检表管理明细列表")
+//    @ApiOperation("导出岗检表管理明细列表")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:export')")
     @Log(title = "岗检表管理明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -83,7 +76,7 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 获取岗检表管理明细详细信息
      */
-    @ApiOperation("获取岗检表管理明细详细信息")
+//    @ApiOperation("获取岗检表管理明细详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -94,6 +87,7 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 新增岗检表管理明细
      */
+    /*
     @ApiOperation("新增岗检表管理明细")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
@@ -106,6 +100,7 @@ public class PostCheckedItemsController extends BaseController
         @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
         @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:add')")
     @Log(title = "岗检表管理明细", businessType = BusinessType.INSERT)
     @PostMapping
@@ -117,6 +112,7 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 修改岗检表管理明细
      */
+    /*
     @ApiOperation("修改岗检表管理明细")
     @ApiImplicitParams({
                     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
@@ -129,6 +125,7 @@ public class PostCheckedItemsController extends BaseController
                     @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
                     @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:edit')")
     @Log(title = "岗检表管理明细", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -140,8 +137,10 @@ public class PostCheckedItemsController extends BaseController
     /**
      * 删除岗检表管理明细
      */
+    /*
     @ApiOperation("删除岗检表管理明细")
     @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:remove')")
     @Log(title = "岗检表管理明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProblemRecordController.java

@@ -1,30 +1,19 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.postCheck.domain.PostCheckedProblemRecord;
 import com.ruoyi.postCheck.service.IPostCheckedProblemRecordService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * 岗检问题操作记录表Controller
@@ -32,11 +21,10 @@ import io.swagger.annotations.ApiImplicitParam;
  * @author csg
  * @date 2023-12-23
  */
-@Api(tags = "3.3.2-岗检问题操作记录表接口")
+@Api(tags = "3.3.3-岗检问题操作记录表接口")
 @RestController
 @RequestMapping("/postCheck/postCheckedProblemRecord")
-public class PostCheckedProblemRecordController extends BaseController
-{
+public class PostCheckedProblemRecordController extends BaseController {
     @Autowired
     private IPostCheckedProblemRecordService postCheckedProblemRecordService;
 
@@ -46,7 +34,7 @@ public class PostCheckedProblemRecordController extends BaseController
     @ApiOperation("查询岗检问题操作记录表列表")
     @ApiImplicitParams({
 //                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
-                    @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
 //                    @ApiImplicitParam(name = "userBy", value = "操作者姓名", dataType = "String", dataTypeClass = String.class),
 //                    @ApiImplicitParam(name = "content", value = "操作内容", dataType = "String", dataTypeClass = String.class),
 //                    @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "String", dataTypeClass = String.class),
@@ -56,8 +44,7 @@ public class PostCheckedProblemRecordController extends BaseController
     })
 //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PostCheckedProblemRecord postCheckedProblemRecord)
-    {
+    public TableDataInfo list(PostCheckedProblemRecord postCheckedProblemRecord) {
 //        startPage();
         startPage("desc", "t1.create_time");
         List<PostCheckedProblemRecord> list = postCheckedProblemRecordService.selectPostCheckedProblemRecordList(postCheckedProblemRecord);
@@ -66,77 +53,73 @@ public class PostCheckedProblemRecordController extends BaseController
 
     /**
      * 导出岗检问题操作记录表列表
-    @ApiOperation("导出岗检问题操作记录表列表")
-//    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:export')")
-    @Log(title = "岗检问题操作记录表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostCheckedProblemRecord postCheckedProblemRecord)
-    {
-        List<PostCheckedProblemRecord> list = postCheckedProblemRecordService.selectPostCheckedProblemRecordList(postCheckedProblemRecord);
-        ExcelUtil<PostCheckedProblemRecord> util = new ExcelUtil<PostCheckedProblemRecord>(PostCheckedProblemRecord.class);
-        util.exportExcel(response, list, "岗检问题操作记录表数据");
-    }
+     @ApiOperation("导出岗检问题操作记录表列表")
+     //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:export')")
+     @Log(title = "岗检问题操作记录表", businessType = BusinessType.EXPORT)
+     @PostMapping("/export") public void export(HttpServletResponse response, PostCheckedProblemRecord postCheckedProblemRecord)
+     {
+     List<PostCheckedProblemRecord> list = postCheckedProblemRecordService.selectPostCheckedProblemRecordList(postCheckedProblemRecord);
+     ExcelUtil<PostCheckedProblemRecord> util = new ExcelUtil<PostCheckedProblemRecord>(PostCheckedProblemRecord.class);
+     util.exportExcel(response, list, "岗检问题操作记录表数据");
+     }
      */
 
     /**
      * 获取岗检问题操作记录表详细信息
-    @ApiOperation("获取岗检问题操作记录表详细信息")
-//    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(postCheckedProblemRecordService.selectPostCheckedProblemRecordById(id));
-    }
+     @ApiOperation("获取岗检问题操作记录表详细信息")
+     //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:query')")
+     @GetMapping(value = "/{id}")
+     public AjaxResult getInfo(@PathVariable("id") Long id)
+     {
+     return success(postCheckedProblemRecordService.selectPostCheckedProblemRecordById(id));
+     }
      */
 
     /**
      * 新增岗检问题操作记录表
-    @ApiOperation("新增岗检问题操作记录表")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "userBy", value = "操作者姓名", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "content", value = "操作内容", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "String", dataTypeClass = String.class),
-    })
-//    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:add')")
-    @Log(title = "岗检问题操作记录表", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PostCheckedProblemRecord postCheckedProblemRecord)
-    {
-        return toAjax(postCheckedProblemRecordService.insertPostCheckedProblemRecord(postCheckedProblemRecord));
-    }
+     @ApiOperation("新增岗检问题操作记录表")
+     @ApiImplicitParams({
+     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "userBy", value = "操作者姓名", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "content", value = "操作内容", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "String", dataTypeClass = String.class),
+     })
+     //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:add')")
+     @Log(title = "岗检问题操作记录表", businessType = BusinessType.INSERT)
+     @PostMapping public AjaxResult add(@RequestBody PostCheckedProblemRecord postCheckedProblemRecord)
+     {
+     return toAjax(postCheckedProblemRecordService.insertPostCheckedProblemRecord(postCheckedProblemRecord));
+     }
      */
 
     /**
      * 修改岗检问题操作记录表
-    @ApiOperation("修改岗检问题操作记录表")
-    @ApiImplicitParams({
-                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
-                    @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
-                    @ApiImplicitParam(name = "userBy", value = "操作者姓名", dataType = "String", dataTypeClass = String.class),
-                    @ApiImplicitParam(name = "content", value = "操作内容", dataType = "String", dataTypeClass = String.class),
-                    @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "String", dataTypeClass = String.class),
-    })
-//    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:edit')")
-    @Log(title = "岗检问题操作记录表", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PostCheckedProblemRecord postCheckedProblemRecord)
-    {
-        return toAjax(postCheckedProblemRecordService.updatePostCheckedProblemRecord(postCheckedProblemRecord));
-    }
+     @ApiOperation("修改岗检问题操作记录表")
+     @ApiImplicitParams({
+     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "problemId", value = "问题ID（多）", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "userBy", value = "操作者姓名", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "content", value = "操作内容", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "String", dataTypeClass = String.class),
+     })
+     //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:edit')")
+     @Log(title = "岗检问题操作记录表", businessType = BusinessType.UPDATE)
+     @PutMapping public AjaxResult edit(@RequestBody PostCheckedProblemRecord postCheckedProblemRecord)
+     {
+     return toAjax(postCheckedProblemRecordService.updatePostCheckedProblemRecord(postCheckedProblemRecord));
+     }
      */
 
     /**
      * 删除岗检问题操作记录表
-    @ApiOperation("删除岗检问题操作记录表")
-    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
-//    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:remove')")
-    @Log(title = "岗检问题操作记录表", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(postCheckedProblemRecordService.deletePostCheckedProblemRecordByIds(ids));
-    }
+     @ApiOperation("删除岗检问题操作记录表")
+     @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+     //    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedProblemRecord:remove')")
+     @Log(title = "岗检问题操作记录表", businessType = BusinessType.DELETE)
+     @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids)
+     {
+     return toAjax(postCheckedProblemRecordService.deletePostCheckedProblemRecordByIds(ids));
+     }
      */
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProductionProblemStatisticsController.java

@@ -9,6 +9,7 @@ import com.ruoyi.postCheck.model.DeptDetaailViewModel;
 import com.ruoyi.postCheck.service.IPostCheckedProblemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -157,7 +158,12 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 
     @ApiOperation("6-历年岗检问题数量")
     @GetMapping("/historyProblemNumberView/{year}/{deptId}")
-    public AjaxResult historyProblemNumberView(@PathVariable("year") String year,@PathVariable("deptId") String deptId){ //notParam不是参数-是返回信息-方便接口联调
+    public AjaxResult historyProblemNumberView(
+            @ApiParam(name = "year", value = "年份", required = true)
+            @PathVariable("year") String year,
+
+            @ApiParam(name = "deptId", value = "部门ID", required = true)
+            @PathVariable("deptId") String deptId){ //notParam不是参数-是返回信息-方便接口联调
 //         查询问题表
 //        select * from "public"."post_checked_problem";
 //        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostHighlightsController.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,10 +23,6 @@ import com.ruoyi.postCheck.domain.PostHighlights;
 import com.ruoyi.postCheck.service.IPostHighlightsService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
 
 /**
  * 岗检亮点Controller
@@ -33,7 +30,7 @@ import io.swagger.annotations.ApiImplicitParam;
  * @author csg
  * @date 2023-12-26
  */
-@Api(tags = "6.2.1-岗检亮点接口")
+@Api(tags = "3.4.1-岗检亮点")
 @RestController
 @RequestMapping("/postCheck/postHighlights")
 public class PostHighlightsController extends BaseController {
@@ -49,7 +46,7 @@ public class PostHighlightsController extends BaseController {
             @ApiImplicitParam(name = "highlightsType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；5-其他；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "highlights", value = "管理亮点", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "createUserId", value = "创建人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
@@ -67,6 +64,7 @@ public class PostHighlightsController extends BaseController {
     /**
      * 导出岗检亮点列表
      */
+    /*
     @ApiOperation("导出岗检亮点列表")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postHighlights:export')")
     @Log(title = "岗检亮点", businessType = BusinessType.EXPORT)
@@ -76,14 +74,16 @@ public class PostHighlightsController extends BaseController {
         ExcelUtil<PostHighlights> util = new ExcelUtil<PostHighlights>(PostHighlights.class);
         util.exportExcel(response, list, "岗检亮点数据");
     }
-
+*/
     /**
      * 获取岗检亮点详细信息
      */
     @ApiOperation("获取岗检亮点详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postHighlights:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检亮点id", required = true)
+            @PathVariable("id") Long id) {
         return success(postHighlightsService.selectPostHighlightsById(id));
     }
 
@@ -92,12 +92,12 @@ public class PostHighlightsController extends BaseController {
      */
     @ApiOperation("新增岗检亮点")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键id", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "id", value = "主键id", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "highlightsType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；5-其他；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "highlights", value = "管理亮点", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "createUserId", value = "创建人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
+//            @ApiImplicitParam(name = "createUserId", value = "创建人ID", dataType = "Long", dataTypeClass = Long.class),
     })
     @PreAuthorize("@ss.hasPermi('postCheck:postHighlights:add')")
     @Log(title = "岗检亮点", businessType = BusinessType.INSERT)
@@ -115,8 +115,8 @@ public class PostHighlightsController extends BaseController {
             @ApiImplicitParam(name = "highlightsType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；5-其他；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "highlights", value = "管理亮点", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "createUserId", value = "创建人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
+//            @ApiImplicitParam(name = "createUserId", value = "创建人ID", dataType = "Long", dataTypeClass = Long.class),
     })
     @PreAuthorize("@ss.hasPermi('postCheck:postHighlights:edit')")
     @Log(title = "岗检亮点", businessType = BusinessType.UPDATE)
@@ -129,11 +129,13 @@ public class PostHighlightsController extends BaseController {
      * 删除岗检亮点
      */
     @ApiOperation("删除岗检亮点")
-    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+//    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
     @PreAuthorize("@ss.hasPermi('postCheck:postHighlights:remove')")
     @Log(title = "岗检亮点", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检亮点ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postHighlightsService.deletePostHighlightsByIds(ids));
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostListController.java

@@ -16,10 +16,7 @@ import com.ruoyi.postCheck.domain.tools.PostCheckListType;
 import com.ruoyi.postCheck.domain.tools.PostListApproveTypeUser;
 import com.ruoyi.postCheck.service.IPostListService;
 import com.ruoyi.system.service.ISysPostService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -76,7 +73,9 @@ public class PostListController extends BaseController {
     @ApiOperation("获取岗位责任制清单详细信息")
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckList:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "清单id", required = true)
+            @PathVariable("id") Long id) {
         return success(postListService.selectPostListById(id));
     }
 
@@ -100,11 +99,12 @@ public class PostListController extends BaseController {
      * 新增岗位责任制清单
      */
     @ApiOperation("新增岗位责任制清单")
+    /*
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "status", value = "状态：1-待审核；2-审核中；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusByUserId", value = "审核人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusByUserName", value = "审核人姓名", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "status", value = "状态：1-待审核；2-审核中；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusByUserId", value = "审核人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusByUserName", value = "审核人姓名", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "unitId", value = "所在单位", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "postId", value = "岗位ID", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "positionLevel", value = "岗位级别", dataType = "String", dataTypeClass = String.class),
@@ -117,11 +117,12 @@ public class PostListController extends BaseController {
             @ApiImplicitParam(name = "creationDate", value = "编制日期", dataType = "Date", dataTypeClass = Date.class),
             @ApiImplicitParam(name = "revisionDate", value = "修订日期", dataType = "Date", dataTypeClass = Date.class),
             @ApiImplicitParam(name = "jobSummary", value = "工作摘要", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "remark", value = "备注（前端把所在部门的选中数JSON放到这里了，后端不要再所以设置值）", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
-            /** 岗位责任制清单明细信息 */
+            @ApiImplicitParam(name = "remark", value = "所在部门祖级id", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+            *//** 岗位责任制清单明细信息 *//*
             @ApiImplicitParam(name = "children", value = "岗位责任制清单明细", dataType = "PostListInfo", dataTypeClass = PostListInfo.class),
-    })
+    })*/
+
     @PreAuthorize("@ss.hasPermi('postCheck:postCheckList:add')")
     @Log(title = "岗位责任制清单", businessType = BusinessType.INSERT)
     @PostMapping
@@ -231,7 +232,7 @@ public class PostListController extends BaseController {
     }
 
 
-    @ApiOperation("1、岗位责任制清单提交审核")
+    @ApiOperation("1、岗位责任制清单提交")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String", dataTypeClass = String.class),
     })
@@ -244,8 +245,8 @@ public class PostListController extends BaseController {
 
     @ApiOperation("2、岗位责任制清单审核")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "审核的类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "type", value = "审核的类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "status", value = "状态：3-通过；4-驳回；", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "reason", value = "未通过理由（驳回时必选）", dataType = "String", dataTypeClass = String.class),
     })
@@ -256,9 +257,9 @@ public class PostListController extends BaseController {
     }
 
 
-    @ApiOperation("1、检查项目下拉框（不需要参数）")
+    @ApiOperation("1、岗位责任制清单检查项目下拉框")
     @GetMapping("/typeList")
-    public AjaxResult typeList(PostCheckListType postCheckListType) {
+    public AjaxResult typeList() {
       /*
         List<Map<Integer, String>> list = new ArrayList<>();
         Map<Integer, String> map = new HashMap<>();
@@ -301,7 +302,7 @@ public class PostListController extends BaseController {
      *
      * @return
      */
-    @ApiOperation("2、检查内容：参数是检查项目下拉框")
+    @ApiOperation("2、岗位责任制清单检查内容：参数是检查项目下拉框")
     @GetMapping("/contentListByType")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deptId", value = "参数->部门ID", dataType = "Long", dataTypeClass = Long.class),

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanCheckUserController.java

@@ -2,6 +2,8 @@ package com.ruoyi.postCheck.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,10 +22,6 @@ import com.ruoyi.postCheck.domain.PostPlanCheckUser;
 import com.ruoyi.postCheck.service.IPostPlanCheckUserService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
 
 /**
  * 岗检计划明细检查人表Controller
@@ -31,22 +29,23 @@ import io.swagger.annotations.ApiImplicitParam;
  * @author csg
  * @date 2023-12-19
  */
-@Api(tags = "2.3.3-岗检计划明细检查人表接口（废弃）")
+@Api(tags = "2.3.3-岗检计划检查人员接口")
 @RestController
 @RequestMapping("/postCheck/planInfoUser")
-public class PostPlanCheckUserController extends BaseController
-{
+public class PostPlanCheckUserController extends BaseController {
     @Autowired
     private IPostPlanCheckUserService postPlanInfoUserService;
 
     /**
      * 查询岗检计划明细检查人表列表
      */
-    @ApiOperation("查询岗检计划明细检查人表列表")
+    @ApiOperation("岗检计划检查人员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "postPlanId", value = "岗检计划ID", dataType = "Long", dataTypeClass = Long.class),
+    })
 //    @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PostPlanCheckUser postPlanCheckUser)
-    {
+    public TableDataInfo list(PostPlanCheckUser postPlanCheckUser) {
         startPage();
         List<PostPlanCheckUser> list = postPlanInfoUserService.selectPostPlanInfoUserList(postPlanCheckUser);
         return getDataTable(list);
@@ -55,69 +54,70 @@ public class PostPlanCheckUserController extends BaseController
     /**
      * 导出岗检计划明细检查人表列表
      */
-    @ApiOperation("导出岗检计划明细检查人表列表")
+//    @ApiOperation("导出岗检计划明细检查人表列表")
 //    @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:export')")
-    @Log(title = "岗检计划明细检查人表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostPlanCheckUser postPlanCheckUser)
-    {
-        List<PostPlanCheckUser> list = postPlanInfoUserService.selectPostPlanInfoUserList(postPlanCheckUser);
-        ExcelUtil<PostPlanCheckUser> util = new ExcelUtil<PostPlanCheckUser>(PostPlanCheckUser.class);
-        util.exportExcel(response, list, "岗检计划明细检查人表数据");
-    }
+//    @Log(title = "岗检计划明细检查人表", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, PostPlanCheckUser postPlanCheckUser) {
+//        List<PostPlanCheckUser> list = postPlanInfoUserService.selectPostPlanInfoUserList(postPlanCheckUser);
+//        ExcelUtil<PostPlanCheckUser> util = new ExcelUtil<PostPlanCheckUser>(PostPlanCheckUser.class);
+//        util.exportExcel(response, list, "岗检计划明细检查人表数据");
+//    }
 
     /**
      * 获取岗检计划明细检查人表详细信息
      */
-    @ApiOperation("获取岗检计划明细检查人表详细信息")
+    @ApiOperation("岗检计划检查人员详情")
 //    @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检计划检查人员表id", required = true)
+            @PathVariable("id") Long id) {
         return success(postPlanInfoUserService.selectPostPlanInfoUserById(id));
     }
 
     /**
      * 新增岗检计划明细检查人表
      */
-    @ApiOperation("新增岗检计划明细检查人表")
+    @ApiOperation("新增岗检计划检查人员")
+    /*
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "postPlanInfoId", value = "计划明细ID", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "checkedUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
-        @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "type", value = "检查人员ID：1-组长；2-组员；", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "postPlanInfoId", value = "计划明细ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "type", value = "检查人员ID：1-组长；2-组员；", dataType = "Integer", dataTypeClass = Integer.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:add')")
     @Log(title = "岗检计划明细检查人表", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PostPlanCheckUser postPlanCheckUser)
-    {
+    public AjaxResult add(@RequestBody PostPlanCheckUser postPlanCheckUser) {
         return toAjax(postPlanInfoUserService.insertPostPlanInfoUser(postPlanCheckUser));
     }
 
     /**
      * 修改岗检计划明细检查人表
      */
-    @ApiOperation("修改岗检计划明细检查人表")
+    @ApiOperation("修改岗检计划检查人员")
     @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:edit')")
     @Log(title = "岗检计划明细检查人表", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PostPlanCheckUser postPlanCheckUser)
-    {
+    public AjaxResult edit(@RequestBody PostPlanCheckUser postPlanCheckUser) {
         return toAjax(postPlanInfoUserService.updatePostPlanInfoUser(postPlanCheckUser));
     }
 
     /**
      * 删除岗检计划明细检查人表
      */
-    @ApiOperation("删除岗检计划明细检查人表")
+    @ApiOperation("删除岗检计划检查人员")
     @PreAuthorize("@ss.hasPermi('postCheck:planInfoUser:remove')")
     @Log(title = "岗检计划明细检查人表", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检计划检查人员ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postPlanInfoUserService.deletePostPlanInfoUserByIds(ids));
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanController.java

@@ -65,26 +65,26 @@ public class PostPlanController extends BaseController {
      */
     @ApiOperation("查询岗检计划列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "name", value = "name", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "content", value = "content", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "startTime", value = "start_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "endTime", value = "end_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "status", value = "status", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkWorkgroupId", value = "check_workgroup_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkGroupId", value = "check_group_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "id", value = "计划id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "name", value = "计划名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "content", value = "计划内容", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "工作组", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class),
@@ -94,8 +94,6 @@ public class PostPlanController extends BaseController {
             @ApiImplicitParam(name = "checkedUserNames", value = "检查人员中文名称逗号拼接", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedDeptNames", value = "被检查部门名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedPostNames", value = "被检查岗位名称（多个拼接）", dataType = "String", dataTypeClass = String.class),
-
-
     })
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:list')")
     @GetMapping("/list")
@@ -113,28 +111,28 @@ public class PostPlanController extends BaseController {
     }
 
 
-    @ApiOperation("查询岗检计划列表，行单位是被检查部门")
+    @ApiOperation("查询岗检计划列表（行单位是被检查部门）")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "name", value = "name", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "content", value = "content", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "startTime", value = "start_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "endTime", value = "end_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "status", value = "status", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkWorkgroupId", value = "check_workgroup_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkGroupId", value = "check_group_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "id", value = "计划id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "name", value = "计划名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "content", value = "计划内容", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "工作组", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class),
@@ -144,8 +142,6 @@ public class PostPlanController extends BaseController {
             @ApiImplicitParam(name = "checkedUserNames", value = "检查人员中文名称逗号拼接", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedDeptNames", value = "被检查部门名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedPostNames", value = "被检查岗位名称（多个拼接）", dataType = "String", dataTypeClass = String.class),
-
-
     })
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:list')")
     @GetMapping("/listV2")
@@ -180,9 +176,11 @@ public class PostPlanController extends BaseController {
     /**
      * 获取岗检表管理详细信息
      */
-    @ApiOperation("岗检表预览")
+    @ApiOperation("岗检表预览详情")
     @GetMapping(value = "/preview/{id}")
-    public AjaxResult preview(@PathVariable("id") Long id) {
+    public AjaxResult preview(
+            @ApiParam(name = "id", value = "id", required = true)
+            @PathVariable("id") Long id) {
 
         List<PostPlanExcelBean> list = new ArrayList<>();
 
@@ -239,10 +237,12 @@ public class PostPlanController extends BaseController {
     /**
      * 获取岗检计划详细信息
      */
-    @ApiOperation("获取岗检计划详细信息")
+    @ApiOperation("查询岗检计划详细信息")
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检计划id", required = true)
+            @PathVariable("id") Long id) {
         return success(postPlanService.selectPostPlanById(id));
     }
 
@@ -253,31 +253,33 @@ public class PostPlanController extends BaseController {
      * type：1-组长、2-组员
      */
     @ApiOperation("新增岗检计划")
+   /*
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "name", value = "name", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "content", value = "content", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "startTime", value = "start_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "endTime", value = "end_time", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "status", value = "status", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkWorkgroupId", value = "check_workgroup_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkGroupId", value = "check_group_id", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "name", value = "岗检计划名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "content", value = "岗检计划内容", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "startTime", value = "岗检计划开始时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "endTime", value = "岗检计划结束时间", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "createUserId", value = "create_user_id", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "工作组", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfa", value = "1-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateIcfa", value = "1-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonIcfa", value = "1-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusHr", value = "2-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "dateHr", value = "2-人力资源审批-通过日期", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "reasonHr", value = "2-人力资源审批-未通过理由", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusTime", value = "审核时间", dataType = "String", dataTypeClass = String.class),
+//            @ApiImplicitParam(name = "statusUserId", value = "审核时人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
 
             @ApiImplicitParam(name = "checkUserChildren", value = "检查人员数组", dataType = "List", dataTypeClass = PostPlanCheckUser.class),
             @ApiImplicitParam(name = "children", value = "检查小组数组", dataType = "List", dataTypeClass = PostPlanInfo.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:add')")
     @Log(title = "岗检计划", businessType = BusinessType.INSERT)
     @PostMapping
@@ -289,6 +291,7 @@ public class PostPlanController extends BaseController {
      * 修改岗检计划
      */
     @ApiOperation("修改岗检计划")
+    /*
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "name", value = "name", dataType = "String", dataTypeClass = String.class),
@@ -311,6 +314,7 @@ public class PostPlanController extends BaseController {
             @ApiImplicitParam(name = "statusIcfaUserId", value = "1-内控法务部审批人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "statusHrUserId", value = "2-人力资源审批人ID", dataType = "Long", dataTypeClass = Long.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:edit')")
     @Log(title = "岗检计划", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -322,11 +326,13 @@ public class PostPlanController extends BaseController {
      * 删除岗检计划
      */
     @ApiOperation("删除岗检计划")
-    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+//    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:remove')")
     @Log(title = "岗检计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检计划ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postPlanService.deletePostPlanByIds(ids));
     }
 
@@ -395,7 +401,7 @@ public class PostPlanController extends BaseController {
 
     @ApiOperation("岗检计划发布")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "id", value = "岗检计划ID", dataType = "Long", dataTypeClass = Long.class),
     })
     @Log(title = "岗检计划发布", businessType = BusinessType.UPDATE)
     @PutMapping("/publish")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanInfoController.java

@@ -3,6 +3,8 @@ package com.ruoyi.postCheck.controller;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,22 +23,17 @@ import com.ruoyi.postCheck.domain.PostPlanInfo;
 import com.ruoyi.postCheck.service.IPostPlanInfoService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
 
 /**
- * 岗检计划明细表Controller
+ * 岗检计划明细
  *
  * @author csg
  * @date 2023-12-19
  */
-@Api(tags = "2.3.2-岗检计划明细表接口（暂时不调，走2.3.1接口后端搞定）")
+@Api(tags = "2.3.2-岗检计划明细表接口")
 @RestController
 @RequestMapping("/postCheck/postPlanInfo")
-public class PostPlanInfoController extends BaseController
-{
+public class PostPlanInfoController extends BaseController {
     @Autowired
     private IPostPlanInfoService postPlanInfoService;
 
@@ -44,10 +41,12 @@ public class PostPlanInfoController extends BaseController
      * 查询岗检计划明细表列表
      */
     @ApiOperation("查询岗检计划明细表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "postPlanId", value = "岗检计划ID", dataType = "Long", dataTypeClass = Long.class),
+    })
 //    @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PostPlanInfo postPlanInfo)
-    {
+    public TableDataInfo list(PostPlanInfo postPlanInfo) {
         startPage();
         List<PostPlanInfo> list = postPlanInfoService.selectPostPlanInfoList(postPlanInfo);
         return getDataTable(list);
@@ -56,32 +55,32 @@ public class PostPlanInfoController extends BaseController
     /**
      * 导出岗检计划明细表列表
      */
-    @ApiOperation("导出岗检计划明细表列表")
+//    @ApiOperation("导出岗检计划明细表列表")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:export')")
-    @Log(title = "岗检计划明细表", businessType = BusinessType.EXPORT)
+    /*@Log(title = "岗检计划明细表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PostPlanInfo postPlanInfo)
-    {
+    public void export(HttpServletResponse response, PostPlanInfo postPlanInfo) {
         List<PostPlanInfo> list = postPlanInfoService.selectPostPlanInfoList(postPlanInfo);
         ExcelUtil<PostPlanInfo> util = new ExcelUtil<PostPlanInfo>(PostPlanInfo.class);
         util.exportExcel(response, list, "岗检计划明细表数据");
-    }
+    }*/
 
     /**
      * 获取岗检计划明细表详细信息
      */
-    @ApiOperation("获取岗检计划明细表详细信息")
+//    @ApiOperation("获取岗检计划明细表详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检计划id", required = true)
+            @PathVariable("id") Long id) {
         return success(postPlanInfoService.selectPostPlanInfoById(id));
     }
 
     /**
      * 新增岗检计划明细表
      */
-    @ApiOperation("新增岗检计划明细表")
+    /*
     @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
         @ApiImplicitParam(name = "postPlanId", value = "计划ID", dataType = "Long", dataTypeClass = Long.class),
@@ -90,36 +89,32 @@ public class PostPlanInfoController extends BaseController
         @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
         @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
         @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
-    })
+    })*/
+    @ApiOperation("新增岗检计划明细表")
     @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:add')")
-    @Log(title = "岗检计划明细表", businessType = BusinessType.INSERT)
+    @Log(title = "新增岗检计划明细表", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PostPlanInfo postPlanInfo)
-    {
+    public AjaxResult add(@RequestBody PostPlanInfo postPlanInfo) {
         return toAjax(postPlanInfoService.insertPostPlanInfo(postPlanInfo));
     }
 
-    /**
-     * 修改岗检计划明细表
-     */
+
     @ApiOperation("修改岗检计划明细表")
     @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:edit')")
     @Log(title = "岗检计划明细表", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PostPlanInfo postPlanInfo)
-    {
+    public AjaxResult edit(@RequestBody PostPlanInfo postPlanInfo) {
         return toAjax(postPlanInfoService.updatePostPlanInfo(postPlanInfo));
     }
 
-    /**
-     * 删除岗检计划明细表
-     */
+
     @ApiOperation("删除岗检计划明细表")
     @PreAuthorize("@ss.hasPermi('postCheck:postPlanInfo:remove')")
     @Log(title = "岗检计划明细表", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检计划明细ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postPlanInfoService.deletePostPlanInfoByIds(ids));
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanJoinCheckedController.java

@@ -3,7 +3,9 @@ package com.ruoyi.postCheck.controller;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.constant.PostPlanEnum;
+import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,10 +19,6 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.join.PostPlanJoinChecked;
 import com.ruoyi.postCheck.service.IPostPlanJoinCheckedService;
 import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
 
 /**
  * 岗检记录上传列表Controller
@@ -28,7 +26,7 @@ import io.swagger.annotations.ApiImplicitParam;
  * @author csg
  * @date 2023-12-22
  */
-@Api(tags = "3.1.1-岗检记录上传列表接口")
+@Api(tags = "3.1.1-岗检记录上传")
 @RestController
 @RequestMapping("/postCheck/postPlanJoinChecked")
 public class PostPlanJoinCheckedController extends BaseController {
@@ -38,8 +36,11 @@ public class PostPlanJoinCheckedController extends BaseController {
 
     @ApiOperation("查询岗检记录上传列表列表")
     @ApiImplicitParams({
-//                    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
-//                    @ApiImplicitParam(name = "name", value = "name", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedDeptName", value = "被检查部门名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "岗检状态：1-未检；2-已检；", dataType = "Integer", dataTypeClass = Integer.class),
+
             @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
@@ -72,7 +73,7 @@ public class PostPlanJoinCheckedController extends BaseController {
     })
     @Log(title = "岗检完成确认", businessType = BusinessType.UPDATE)
     @PutMapping("/checked")
-    public AjaxResult checked(Long planInfoId,  String checkedUserName,Date checkedTime, String checkedImg) {
+    public AjaxResult checked(Long planInfoId, String checkedUserName, Date checkedTime, String checkedImg) {
         return toAjax(postPlanJoinCheckedService.checked(planInfoId, checkedUserName, checkedTime, checkedImg));
     }
 
@@ -80,9 +81,7 @@ public class PostPlanJoinCheckedController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planInfoId", value = "岗检计划明细ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkedImg", value = "检查表照片(图片上传后的相对路径)", dataType = "String", dataTypeClass = String.class),
-
     })
-
     @Log(title = "岗检完成确认后重新上传检查表照片", businessType = BusinessType.UPDATE)
     @PutMapping("imgReUpload")
     public AjaxResult imgReUpload(Long planInfoId, String checkedImg) {

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanJoinProblemController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 
-@Api(tags = "3.2.1-岗检问题录入列表接口")
+@Api(tags = "3.2.1-岗检问题录入")
 @RestController
 @RequestMapping("/postCheck/postPlanJoinProblem")
 public class PostPlanJoinProblemController extends BaseController {
@@ -25,7 +25,7 @@ public class PostPlanJoinProblemController extends BaseController {
     /**
      * 查询岗检问题录入列表列表
      */
-    @ApiOperation("查询岗检问题录入列表列表")
+    @ApiOperation("查询岗检问题录入列表")
     @ApiImplicitParams({
 //                    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
 //                    @ApiImplicitParam(name = "name", value = "name", dataType = "Long", dataTypeClass = Long.class),
@@ -42,7 +42,7 @@ public class PostPlanJoinProblemController extends BaseController {
             @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkedDeptName", value = "被检查部门名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkedPostNames", value = "被检查岗位名称(多个逗号拼接)", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "checkedPostName", value = "被检查岗位名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "status", value = "岗检状态", dataType = "Integer", dataTypeClass = Integer.class),
 
             @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostProgrammeController.java

@@ -17,10 +17,7 @@ import com.ruoyi.postCheck.domain.PostProgramme;
 import com.ruoyi.postCheck.service.IPostProgrammeService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -101,7 +98,9 @@ public class PostProgrammeController extends BaseController {
     @ApiOperation("获取岗检方案详细信息")
     @PreAuthorize("@ss.hasPermi('postCheck:programme:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检方案id", required = true)
+            @PathVariable("id") Long id) {
         return success(postProgrammeService.selectPostProgrammeById(id));
     }
 
@@ -109,7 +108,7 @@ public class PostProgrammeController extends BaseController {
      * 新增岗检方案
      */
     @ApiOperation("新增岗检方案")
-    @ApiImplicitParams({
+/*    @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "name", value = "名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "submitDate", value = "提交日期", dataType = "String", dataTypeClass = String.class),
@@ -121,7 +120,7 @@ public class PostProgrammeController extends BaseController {
             @ApiImplicitParam(name = "reasonIcfa", value = "2-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
 
             @ApiImplicitParam(name = "diskPath", value = "岗检方案文件地址", dataType = "String", dataTypeClass = String.class),
-    })
+    })*/
     @PreAuthorize("@ss.hasPermi('postCheck:programme:add')")
     @Log(title = "岗检方案", businessType = BusinessType.INSERT)
     @PostMapping
@@ -133,7 +132,7 @@ public class PostProgrammeController extends BaseController {
      * 修改岗检方案
      */
     @ApiOperation("修改岗检方案")
-    @ApiImplicitParams({
+/*    @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "name", value = "名称", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "submitDate", value = "提交日期", dataType = "String", dataTypeClass = String.class),
@@ -144,7 +143,7 @@ public class PostProgrammeController extends BaseController {
             @ApiImplicitParam(name = "dateIcfa", value = "2-内控法务部审批-通过日期", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "reasonIcfa", value = "2-内控法务部审批-未通过理由", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "diskPath", value = "岗检方案文件地址", dataType = "String", dataTypeClass = String.class),
-    })
+    })*/
 
     @PreAuthorize("@ss.hasPermi('postCheck:programme:edit')")
     @Log(title = "岗检方案", businessType = BusinessType.UPDATE)
@@ -161,7 +160,9 @@ public class PostProgrammeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:programme:remove')")
     @Log(title = "岗检方案", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检方案ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postProgrammeService.deletePostProgrammeByIds(ids));
     }
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostProgrammeTemplateController.java

@@ -1,38 +1,18 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.constant.PostProgrammeEnum;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.DeptCode;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.postCheck.domain.PostProgramme;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.PostProgrammeTemplate;
 import com.ruoyi.postCheck.service.IPostProgrammeTemplateService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 岗检方案模板Controller
@@ -43,8 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
 @Api(tags = "2.1.2-岗检方案模板接口")
 @RestController
 @RequestMapping("/postCheck/programmeTemplate")
-public class PostProgrammeTemplateController extends BaseController
-{
+public class PostProgrammeTemplateController extends BaseController {
     @Autowired
     private IPostProgrammeTemplateService postProgrammeTemplateService;
 
@@ -54,8 +33,7 @@ public class PostProgrammeTemplateController extends BaseController
     @ApiOperation("查询岗检方案模板列表")
 //    @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PostProgrammeTemplate postProgrammeTemplate)
-    {
+    public TableDataInfo list(PostProgrammeTemplate postProgrammeTemplate) {
         startPage();
         List<PostProgrammeTemplate> list = postProgrammeTemplateService.selectPostProgrammeTemplateList(postProgrammeTemplate);
         return getDataTable(list);
@@ -63,16 +41,15 @@ public class PostProgrammeTemplateController extends BaseController
 
     /**
      * 导出岗检方案模板列表
-    @ApiOperation("导出岗检方案模板列表")
-    @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:export')")
-    @Log(title = "岗检方案模板", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostProgrammeTemplate postProgrammeTemplate)
-    {
-        List<PostProgrammeTemplate> list = postProgrammeTemplateService.selectPostProgrammeTemplateList(postProgrammeTemplate);
-        ExcelUtil<PostProgrammeTemplate> util = new ExcelUtil<PostProgrammeTemplate>(PostProgrammeTemplate.class);
-        util.exportExcel(response, list, "岗检方案模板数据");
-    }
+     @ApiOperation("导出岗检方案模板列表")
+     @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:export')")
+     @Log(title = "岗检方案模板", businessType = BusinessType.EXPORT)
+     @PostMapping("/export") public void export(HttpServletResponse response, PostProgrammeTemplate postProgrammeTemplate)
+     {
+     List<PostProgrammeTemplate> list = postProgrammeTemplateService.selectPostProgrammeTemplateList(postProgrammeTemplate);
+     ExcelUtil<PostProgrammeTemplate> util = new ExcelUtil<PostProgrammeTemplate>(PostProgrammeTemplate.class);
+     util.exportExcel(response, list, "岗检方案模板数据");
+     }
      */
 
     /**
@@ -81,8 +58,9 @@ public class PostProgrammeTemplateController extends BaseController
     @ApiOperation("获取岗检方案模板详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检方案模版id", required = true)
+            @PathVariable("id") Long id) {
         return success(postProgrammeTemplateService.selectPostProgrammeTemplateById(id));
     }
 
@@ -90,20 +68,19 @@ public class PostProgrammeTemplateController extends BaseController
      * 新增岗检方案模板
      */
     @ApiOperation("新增岗检方案模板")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
-        @ApiImplicitParam(name = "planName", value = "方案名称", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "templateName", value = "模板名称", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "diskPath", value = "模板磁盘路径", dataType = "String", dataTypeClass = String.class),
-        @ApiImplicitParam(name = "status", value = "状态（1-启动；2-作废）", dataType = "Integer", dataTypeClass = Integer.class),
-        @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
-        @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
-    })
+/*    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "planName", value = "方案名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "templateName", value = "模板名称", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "diskPath", value = "模板磁盘路径", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "状态（1-启动；2-作废）", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+    })*/
     @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:add')")
     @Log(title = "岗检方案模板", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PostProgrammeTemplate postProgrammeTemplate)
-    {
+    public AjaxResult add(@RequestBody PostProgrammeTemplate postProgrammeTemplate) {
         return toAjax(postProgrammeTemplateService.insertPostProgrammeTemplate(postProgrammeTemplate));
     }
 
@@ -114,8 +91,7 @@ public class PostProgrammeTemplateController extends BaseController
     @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:edit')")
     @Log(title = "岗检方案模板", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PostProgrammeTemplate postProgrammeTemplate)
-    {
+    public AjaxResult edit(@RequestBody PostProgrammeTemplate postProgrammeTemplate) {
         return toAjax(postProgrammeTemplateService.updatePostProgrammeTemplate(postProgrammeTemplate));
     }
 
@@ -125,15 +101,15 @@ public class PostProgrammeTemplateController extends BaseController
     @ApiOperation("删除岗检方案模板")
     @PreAuthorize("@ss.hasPermi('postCheck:programmeTemplate:remove')")
     @Log(title = "岗检方案模板", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检方案模板ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postProgrammeTemplateService.deletePostProgrammeTemplateByIds(ids));
     }
 
 
-
-    @ApiOperation("审核：岗检方案模板启用/禁用")
+    @ApiOperation("岗检方案模板启用/禁用")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "status", value = "状态（1-启动；2-作废）", dataType = "Long", dataTypeClass = Long.class)

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostTeamController.java

@@ -1,37 +1,28 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.*;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.postCheck.domain.PostTeam;
 import com.ruoyi.postCheck.service.IPostTeamService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
- * 岗检小组Controller
- * TODO $岗检小组业务说明
+ *
  * 1、【岗检工作组】下的【岗检小组】是自定义的名称与部门无关；
  * 2、第一个【岗检小组】被设置为【牵头小组】；
  * 3、【岗检小组】小组中的人员是从全公司下抽调的，第一个被抽调的人设置为【组长】。
@@ -118,7 +109,9 @@ public class PostTeamController extends BaseController {
     @ApiOperation("获取岗检小组详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:team:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检小组id", required = true)
+            @PathVariable("id") Long id) {
         return success(postTeamService.selectPostTeamById(id));
     }
 
@@ -126,6 +119,7 @@ public class PostTeamController extends BaseController {
      * 新增岗检小组
      */
     @ApiOperation("新增岗检小组")
+    /*
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "name", value = "名称", dataType = "String", dataTypeClass = String.class),
@@ -137,6 +131,7 @@ public class PostTeamController extends BaseController {
             @ApiImplicitParam(name = "teamType", value = "type=3时，工作小组权限（1-牵头；2-成员）", dataType = "Integer", dataTypeClass = Integer.class),
 //            @ApiImplicitParam(name = "children", value = "子对象", dataType = "PostTeam.java", dataTypeClass = PostTeam.class),
     })
+    */
     @PreAuthorize("@ss.hasPermi('postCheck:team:add')")
     @Log(title = "岗检小组", businessType = BusinessType.INSERT)
     @PostMapping
@@ -162,7 +157,9 @@ public class PostTeamController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:team:remove')")
     @Log(title = "岗检小组", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检小组ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postTeamService.deletePostTeamByIds(ids));
     }
 
@@ -206,7 +203,7 @@ public class PostTeamController extends BaseController {
      * Tools-查询岗检工作组列表-查询工作小组列表
      * 调用模块：岗检计划新增
      */
-    @ApiOperation("Tools-查询工作小组列表")
+    @ApiOperation("Tools-查询工作小组列表(四级)")
     @GetMapping("/teamListByGroupId/{parentId}")
     public AjaxResult list(@PathVariable("parentId") Long parentId) {
         PostTeam postTeam = new PostTeam();

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostTeamDeptController.java

@@ -7,10 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.PostTeamDept;
 import com.ruoyi.postCheck.service.IPostTeamDeptService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -69,6 +66,7 @@ public class PostTeamDeptController extends BaseController {
      * 新增岗检工作组关联部门
      */
     @ApiOperation("新增岗检工作组关联部门")
+    /*
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "postTeamId", value = "岗检工作组ID", dataType = "Long", dataTypeClass = Long.class),
@@ -77,6 +75,7 @@ public class PostTeamDeptController extends BaseController {
 //            @ApiImplicitParam(name = "delFlag", value = "del_flag", dataType = "Integer", dataTypeClass = Integer.class),
 //            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
     })
+    */
 //    @PreAuthorize("@ss.hasPermi('postCheck:teamDept:add')")
     @Log(title = "岗检工作组关联部门", businessType = BusinessType.INSERT)
     @PostMapping
@@ -102,7 +101,9 @@ public class PostTeamDeptController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('postCheck:teamDept:remove')")
     @Log(title = "岗检工作组关联部门", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(
+            @ApiParam(name = "ids", value = "岗检工作组关联部门表ids", required = true)
+            @PathVariable Long[] ids) {
         return toAjax(postTeamDeptService.deletePostTeamDeptByIds(ids));
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostTeamUserController.java

@@ -1,31 +1,17 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.postCheck.domain.PostTeamUser;
 import com.ruoyi.postCheck.service.IPostTeamUserService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 岗检小组关联成员Controller
@@ -71,7 +57,9 @@ public class PostTeamUserController extends BaseController {
     @ApiOperation("获取岗检小组关联成员详细信息")
 //    @PreAuthorize("@ss.hasPermi('postCheck:teamUser:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(
+            @ApiParam(name = "id", value = "岗检小组关联成员中间表id", required = true)
+            @PathVariable("id") Long id) {
         return success(postTeamUserService.selectPostTeamUserById(id));
     }
 
@@ -120,7 +108,9 @@ public class PostTeamUserController extends BaseController {
 
     @ApiOperation("Tools-根据岗检小组ID查询成员列表（组长的type=1）")
     @GetMapping("/getTeamUserByTeamId/{postTeamId}")
-    public AjaxResult list(@PathVariable("postTeamId") Long postTeamId) {
+    public AjaxResult list(
+            @ApiParam(name = "postTeamId", value = "岗检小组ID", required = true)
+            @PathVariable("postTeamId") Long postTeamId) {
         PostTeamUser postTeamUser = new PostTeamUser();
         postTeamUser.setPostTeamId(postTeamId);
         List<PostTeamUser> list = postTeamUserService.selectPostTeamUserList(postTeamUser);

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostAssessmentRatingOtherService.java

@@ -68,6 +68,13 @@ public interface IPostAssessmentRatingOtherService extends IService<PostAssessme
      */
     int batchAddRatingOther(PostAssessmentRatingOther postAssessmentRatingOther);
 
+    /**
+     * V2：管理员创建生产部门的日常评分，只创建一条，后续三大部门对所有的生产部门（13个）进行评分
+     * @param postAssessmentRatingOther
+     * @return
+     */
+    int addRatingOtherSC(PostAssessmentRatingOther postAssessmentRatingOther);
+
     int batchAddRatingOtherUpdate(PostAssessmentRatingOther postAssessmentRatingOther);
 
     int productionDepartmentSub(List<PostAssessmentRatingOther> postAssessmentRatingOther);

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostAssessmentRatingOtherServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.PostAssessmentRatingOtherEnum;
 import com.ruoyi.common.constant.PostAssessmentRulesEnum;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.SysDeptEnum;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
@@ -299,17 +300,6 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
      */
     @Override
     public List<PostAssessmentRatingOther> selectPostAssessmentRatingOtherList(PostAssessmentRatingOther postAssessmentRatingOther) {
-//        String beginTime = null;
-//        String endTime = null;
-//        Map<String, Object> params = postAssessmentRatingOther.getParams();
-//        try {
-//            beginTime = (String) params.get("beginTime");
-//            endTime = (String) params.get("endTime");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return new ArrayList<>();
-//        }
-
 
         //该部门的打分任务表
         List<PostAssessmentRatingOther> dataList = postAssessmentRatingOtherMapper.selectPostAssessmentRatingOtherList(postAssessmentRatingOther);
@@ -397,7 +387,8 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
     }
 
     /**
-     * 管理员创建互评计划：(职能部门互评、生产部门日常)
+     * 管理员创建
+     * V2：职能部门互评
      * 互评批次：管理员启动互评任务，初始化13个部门互相打分的记录
      *
      * @param postAssessmentRatingOther
@@ -425,7 +416,7 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
             return 0;
         }
 
-        if (type != PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue() && type != PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
+        if (type != PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
             return 0;
         }
 
@@ -444,24 +435,42 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
 
 
         //初始化13个职能部门评分
-        List<PostAssessmentRules> rulesList = null;
+        List<PostAssessmentRules> rulesList = rulesList = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
+                .eq(PostAssessmentRules::getType, PostAssessmentRulesEnum.TYPE_ZN.getValue())
+                .orderByDesc(PostAssessmentRules::getCreateTime)
+        );
+        /*
         // 类型：1-职能互评；
         if (type == PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
             rulesList = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
                     .eq(PostAssessmentRules::getType, PostAssessmentRulesEnum.TYPE_ZN.getValue())
+                    .orderByDesc(PostAssessmentRules::getCreateTime)
             );
         }
         //类型：2-生产日常；
         else if (type == PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
             rulesList = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
                     .eq(PostAssessmentRules::getType, PostAssessmentRulesEnum.TYPE_SC.getValue())
+                    .orderByDesc(PostAssessmentRules::getCreateTime)
             );
 
         }
+        */
         if (CollectionUtils.isEmpty(rulesList)) {
             throw new BaseException(deptTypeView + "未添加考核评比规则，请检查！");
         }
 
+        //利用Set集合进行去重，按创建时间取最近的
+        Set<Integer> dutyTypeSet = new HashSet<>();
+        Iterator<PostAssessmentRules> rulesIterator = rulesList.iterator();
+        while (rulesIterator.hasNext()) {
+            PostAssessmentRules rules = rulesIterator.next();
+            Integer dutyType = rules.getDutyType();
+            if (!dutyTypeSet.add(dutyType)) {
+                rulesIterator.remove();
+            }
+        }
+
 
         //1、查询职能/生产部门列表
         SysDept deptParam = new SysDept();
@@ -471,9 +480,10 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
         if (CollectionUtils.isEmpty(deptList)) {
             throw new BaseException(deptTypeView + "系统管理->部门管理中未设置部门类型，请检查！");
         }
-//        List<Long> deptIdList = postAssessmentRatingOtherMapper.getDeptIdList(postAssessmentRatingOther.getDeptId(), type);
+
 
         String batchId = IdWorker.getIdStr().substring(4);//批次ID
+
         //循环13个部门插入待打分的任务：例如：A部门为其他12个部门打分的主表 + 打分明细表(不含自己的其他12个部门)、B部门为其他12个部门打分的主表 + 打分明细表(不含自己的其他12个部门)、……
         for (SysDept dept : deptList) {
             Long deptId = dept.getDeptId();
@@ -508,6 +518,7 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
                     info.setByDeptId(otherDept.getDeptId());//被评分部门ID（其他12个部门的）
                     info.setDutyType(postAssessmentRule.getDutyType());//规则类型
                     info.setScoreWeight(postAssessmentRule.getFullScore());//满分/权重
+                    info.setRule(postAssessmentRule.getRule());//考核规则/评分标准
 //                    info.setByDeptScore();//打分分数
                     info.setCreateDefault();
                     int insertInfo = postAssessmentRatingOtherInfoMapper.insert(info);
@@ -521,6 +532,128 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
         return 1;
     }
 
+    /**
+     * V2：管理员创建生产部门的日常评分，只创建一条，后续三大部门对所有的生产部门（13个）进行评分
+     *
+     * @param postAssessmentRatingOther
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int addRatingOtherSC(PostAssessmentRatingOther postAssessmentRatingOther) {
+
+        Integer type = postAssessmentRatingOther.getType();//类型：1-职能互评；2-生产日常；
+        Date startTime = postAssessmentRatingOther.getStartTime();//评分开始时间（管理员创建的）
+        Integer deptType = null;
+        String deptTypeView = "";
+        if (type == PostAssessmentRatingOtherEnum.TYPE_ZN_HP.getValue()) {
+            deptTypeView = "职能部门互评";
+            deptType = SysDeptEnum.TYPE_ZN.getValue();
+        } else if (type == PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
+            deptTypeView = "生产部门日常评分";
+            deptType = SysDeptEnum.TYPE_SC.getValue();
+        } else {
+            deptTypeView = "【type = " + type + "】";
+            deptType = SysDeptEnum.TYPE_OTHER.getValue();
+        }
+        if (type == null || startTime == null) {
+            return 0;
+        }
+
+        if (type != PostAssessmentRatingOtherEnum.TYPE_SC_RC.getValue()) {
+            return 0;
+        }
+
+        //检查评分记录是否已经存在，1个年度只允许一次
+        String year = DateUtils.parseDateToStr(DateUtils.YYYY, startTime);
+        Map<String, Object> params = new HashMap<>();
+        params.put("beginTime", year + "-01-01");
+        params.put("endTime", year + "-12-31");
+        PostAssessmentRatingOther postAssessmentRatingOtherParam = new PostAssessmentRatingOther();
+        postAssessmentRatingOtherParam.setType(type);
+        postAssessmentRatingOtherParam.setParams(params);
+        List<PostAssessmentRatingOther> postAssessmentRatingOtherList = postAssessmentRatingOtherMapper.selectPostAssessmentRatingOtherList(postAssessmentRatingOtherParam);
+        if (!CollectionUtils.isEmpty(postAssessmentRatingOtherList)) {
+            throw new BaseException(year + "年度已创建过" + deptTypeView + "不可以重复创建，请检查！");
+        }
+
+
+        //初始化13个生产部门评分，只有1条
+        List<PostAssessmentRules> rulesList = postAssessmentRulesMapper.selectList(Wrappers.<PostAssessmentRules>lambdaQuery()
+                .eq(PostAssessmentRules::getType, PostAssessmentRulesEnum.TYPE_SC.getValue())
+                .orderByDesc(PostAssessmentRules::getCreateTime)
+        );
+
+
+        if (CollectionUtils.isEmpty(rulesList)) {
+            throw new BaseException(deptTypeView + "未添加考核评比规则，请检查！");
+        }
+
+        //利用Set集合进行去重，按创建时间取最近的
+        Set<Integer> dutyTypeSet = new HashSet<>();
+        Iterator<PostAssessmentRules> rulesIterator = rulesList.iterator();
+        while (rulesIterator.hasNext()) {
+            PostAssessmentRules rules = rulesIterator.next();
+            Integer dutyType = rules.getDutyType();
+            if (!dutyTypeSet.add(dutyType)) {
+                rulesIterator.remove();
+            }
+        }
+
+
+        //1、查询生产部门
+        SysDept deptParam = new SysDept();
+        deptParam.setStatus(SysDeptEnum.STATUS_VALID.getValue().toString());//部门状态（0正常 1停用）
+        deptParam.setType(deptType);//1 职能部门 2 生产部门 3 其他
+        List<SysDept> deptList = sysDeptService.selectDeptListByCondition(deptParam);
+        if (CollectionUtils.isEmpty(deptList)) {
+            throw new BaseException(deptTypeView + "系统管理->部门管理中未设置部门类型，请检查！");
+        }
+
+
+        String batchId = IdWorker.getIdStr().substring(4);//批次ID
+        Long deptId = SecurityUtils.getDeptId();
+        SysDept sysDept = sysDeptService.selectDeptById(deptId);
+        String deptName = sysDept.getDeptName();
+        //A部门打分任务主表
+        PostAssessmentRatingOther postAssessmentRatingOtherOther = new PostAssessmentRatingOther();
+        postAssessmentRatingOtherOther.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+        postAssessmentRatingOtherOther.setType(type);
+        postAssessmentRatingOtherOther.setBatchId(batchId);
+        postAssessmentRatingOtherOther.setStartTime(startTime);
+        postAssessmentRatingOtherOther.setStatus(PostAssessmentRatingOtherEnum.STATUS_ING.getValue());////状态：1-进行中；2-已完成
+        postAssessmentRatingOtherOther.setDeptId(deptId);//打分部门ID
+        postAssessmentRatingOtherOther.setDeptName(deptName);//打分部门名称
+        postAssessmentRatingOtherOther.setCreateDefault();
+        postAssessmentRatingOtherOther.setCreateUserId(SecurityUtils.getLoginUser().getUserId());
+        int insert = postAssessmentRatingOtherMapper.insert(postAssessmentRatingOtherOther);
+        if (insert == 0) {
+            throw new BaseException(deptTypeView + "失败，请稍后重试！");
+        }
+
+        //分别为13个部门按规则插入打分明细
+        for (SysDept otherDept : deptList) {
+            //2.1、B、C、D、E、F……（另外的12个部门）部门按考核评比规则插入打分明细
+            for (PostAssessmentRules postAssessmentRule : rulesList) {
+                PostAssessmentRatingOtherInfo info = new PostAssessmentRatingOtherInfo();
+                info.setRatingOtherId(postAssessmentRatingOtherOther.getId());//A打分任务表ID
+                info.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                info.setByDeptName(otherDept.getDeptName());//被评分部门名称（其他12个部门的）
+                info.setByDeptId(otherDept.getDeptId());//被评分部门ID（其他12个部门的）
+                info.setDutyType(postAssessmentRule.getDutyType());//规则类型
+                info.setScoreWeight(postAssessmentRule.getFullScore());//满分/权重
+//                    info.setByDeptScore();//打分分数
+                info.setCreateDefault();
+                int insertInfo = postAssessmentRatingOtherInfoMapper.insert(info);
+                if (insertInfo == 0) {
+                    throw new BaseException(deptTypeView + "失败，请稍后重试！");
+                }
+            }
+        }
+
+        return 1;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int batchAddRatingOtherUpdate(PostAssessmentRatingOther postAssessmentRatingOther) {
@@ -536,8 +669,6 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
 //                .eq(PostAssessmentRatingOther::getId, postAssessmentRatingOther.getId()));
 
 
-
-
         //标记状态=已打分
         postAssessmentRatingOtherMapper.update(null,
                 Wrappers.<PostAssessmentRatingOther>lambdaUpdate().
@@ -548,7 +679,6 @@ public class PostAssessmentRatingOtherServiceImpl extends ServiceImpl<PostAssess
         );
 
 
-
         //打分明细：数据库中
         List<PostAssessmentRatingOtherInfo> info = postAssessmentRatingOtherInfoMapper.selectList(Wrappers.<PostAssessmentRatingOtherInfo>lambdaQuery()
                 .eq(PostAssessmentRatingOtherInfo::getRatingOtherId, postAssessmentRatingOther.getId())

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostAssessmentRulesServiceImpl.java

@@ -3,10 +3,14 @@ package com.ruoyi.postCheck.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.constant.PostAssessmentRulesEnum;
 import com.ruoyi.common.constant.PostCheckedReportEnum;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.postCheck.domain.PostCheckedReport;
@@ -18,6 +22,7 @@ import com.ruoyi.postCheck.domain.PostAssessmentRules;
 import com.ruoyi.postCheck.service.IPostAssessmentRulesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 考核规则Service业务层处理
@@ -26,8 +31,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
  * @date 2023-12-28
  */
 @Service
-public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRulesMapper, PostAssessmentRules> implements IPostAssessmentRulesService
-{
+public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRulesMapper, PostAssessmentRules> implements IPostAssessmentRulesService {
     @Autowired
     private PostAssessmentRulesMapper postAssessmentRulesMapper;
 
@@ -38,8 +42,7 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 考核规则
      */
     @Override
-    public PostAssessmentRules selectPostAssessmentRulesById(Long id)
-    {
+    public PostAssessmentRules selectPostAssessmentRulesById(Long id) {
         return postAssessmentRulesMapper.selectPostAssessmentRulesById(id);
     }
 
@@ -50,8 +53,7 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 考核规则
      */
     @Override
-    public List<PostAssessmentRules> selectPostAssessmentRulesList(PostAssessmentRules postAssessmentRules)
-    {
+    public List<PostAssessmentRules> selectPostAssessmentRulesList(PostAssessmentRules postAssessmentRules) {
         return postAssessmentRulesMapper.selectPostAssessmentRulesList(postAssessmentRules);
     }
 
@@ -62,15 +64,42 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 结果
      */
     @Override
-    public int insertPostAssessmentRules(PostAssessmentRules postAssessmentRules)
-    {
-        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-        if (postAssessmentRules.getId() == null)
-            postAssessmentRules.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
-        // postAssessmentRules.setCreateTime(DateUtils.getNowDate());
-        postAssessmentRules.setCreateDefault();
+    public int insertPostAssessmentRules(PostAssessmentRules postAssessmentRules) {
+
+        Integer type = postAssessmentRules.getType();
+        Integer dutyType = postAssessmentRules.getDutyType();
+
+        if (type == null || dutyType == null) {
+            throw new BaseException("参数为空，请检查！");
+        }
+
+        String msgView = null;
+        if (type == PostAssessmentRulesEnum.TYPE_POST.getValue()) {
+            msgView = "评分分类";
+        } else if (type == PostAssessmentRulesEnum.TYPE_ZN.getValue()) {
+            msgView = "项目";
+        } else if (type == PostAssessmentRulesEnum.TYPE_SC.getValue()) {
+            msgView = "专业";
+
+        } else {
+            throw new BaseException("类型错误，请检查！");
+        }
+
+
+        LambdaQueryWrapper<PostAssessmentRules> queryWrapper = Wrappers.lambdaQuery(PostAssessmentRules.class);
+        queryWrapper.eq(PostAssessmentRules::getType, type);
+        queryWrapper.eq(PostAssessmentRules::getDutyType, dutyType);
+        List<PostAssessmentRules> postAssessmentRulesList = postAssessmentRulesMapper.selectList(queryWrapper);
+        if (!CollectionUtils.isEmpty(postAssessmentRulesList)) {
+            throw new BaseException("该【" + msgView + "】已存在，请通过修改方式进行调整！");
+        }
+
+
+        postAssessmentRules.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         postAssessmentRules.setStatus(PostAssessmentRulesEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
         postAssessmentRules.setCreateUserId(SecurityUtils.getUserId());
+
+        postAssessmentRules.setCreateDefault();
         return postAssessmentRulesMapper.insertPostAssessmentRules(postAssessmentRules);
     }
 
@@ -81,8 +110,7 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 结果
      */
     @Override
-    public int updatePostAssessmentRules(PostAssessmentRules postAssessmentRules)
-    {
+    public int updatePostAssessmentRules(PostAssessmentRules postAssessmentRules) {
         // postAssessmentRules.setUpdateTime(DateUtils.getNowDate());
         postAssessmentRules.setUpdateDefault();
         return postAssessmentRulesMapper.updatePostAssessmentRules(postAssessmentRules);
@@ -95,8 +123,7 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 结果
      */
     @Override
-    public int deletePostAssessmentRulesByIds(Long[] ids)
-    {
+    public int deletePostAssessmentRulesByIds(Long[] ids) {
         return postAssessmentRulesMapper.deletePostAssessmentRulesByIds(ids);
     }
 
@@ -107,8 +134,7 @@ public class PostAssessmentRulesServiceImpl extends ServiceImpl<PostAssessmentRu
      * @return 结果
      */
     @Override
-    public int deletePostAssessmentRulesById(Long id)
-    {
+    public int deletePostAssessmentRulesById(Long id) {
         return postAssessmentRulesMapper.deletePostAssessmentRulesById(id);
     }
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -1,18 +1,5 @@
 package com.ruoyi.quartz.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -21,31 +8,39 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.quartz.domain.SysJob;
 import com.ruoyi.quartz.service.ISysJobService;
 import com.ruoyi.quartz.util.CronUtils;
 import com.ruoyi.quartz.util.ScheduleUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 调度任务信息操作处理
- * 
+ *
  * @author ruoyi
  */
+@Api(tags = "6.5.1-定时任务")
 @RestController
 @RequestMapping("/monitor/job")
-public class SysJobController extends BaseController
-{
+public class SysJobController extends BaseController {
     @Autowired
     private ISysJobService jobService;
 
     /**
      * 查询定时任务列表
      */
+    @ApiOperation("查询定时任务列表")
     @PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysJob sysJob)
-    {
+    public TableDataInfo list(SysJob sysJob) {
         startPage();
         List<SysJob> list = jobService.selectJobList(sysJob);
         return getDataTable(list);
@@ -54,7 +49,7 @@ public class SysJobController extends BaseController
     /**
      * 导出定时任务列表
      */
-    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+   /* @PreAuthorize("@ss.hasPermi('monitor:job:export')")
     @Log(title = "定时任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysJob sysJob)
@@ -62,48 +57,39 @@ public class SysJobController extends BaseController
         List<SysJob> list = jobService.selectJobList(sysJob);
         ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
         util.exportExcel(response, list, "定时任务");
-    }
+    }*/
 
     /**
      * 获取定时任务详细信息
      */
+    @ApiOperation("定时任务详情")
     @PreAuthorize("@ss.hasPermi('monitor:job:query')")
     @GetMapping(value = "/{jobId}")
-    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
-    {
+    public AjaxResult getInfo(
+            @ApiParam(name = "jobId", value = "id", required = true)
+            @PathVariable("jobId") Long jobId) {
         return success(jobService.selectJobById(jobId));
     }
 
     /**
      * 新增定时任务
      */
+    @ApiOperation("新增定时任务")
     @PreAuthorize("@ss.hasPermi('monitor:job:add')")
     @Log(title = "定时任务", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
-    {
-        if (!CronUtils.isValid(job.getCronExpression()))
-        {
+    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
+        if (!CronUtils.isValid(job.getCronExpression())) {
             return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
-        }
-        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
-        {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
-        }
-        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
-        {
+        } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
             return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
         }
         job.setCreateBy(getUsername());
@@ -113,72 +99,57 @@ public class SysJobController extends BaseController
     /**
      * 修改定时任务
      */
+    @ApiOperation("修改定时任务")
     @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
-    {
-        if (!CronUtils.isValid(job.getCronExpression()))
-        {
+    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
+        if (!CronUtils.isValid(job.getCronExpression())) {
             return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
-        }
-        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
-        {
+        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
-        }
-        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
-        {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
-        }
-        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
-        {
+        } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
             return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
         }
         job.setUpdateBy(getUsername());
         return toAjax(jobService.updateJob(job));
     }
 
-    /**
-     * 定时任务状态修改
-     */
+
+    @ApiOperation("定时任务状态修改")
     @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
-    {
+    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException {
         SysJob newJob = jobService.selectJobById(job.getJobId());
         newJob.setStatus(job.getStatus());
         return toAjax(jobService.changeStatus(newJob));
     }
 
-    /**
-     * 定时任务立即执行一次
-     */
+
+    @ApiOperation("定时任务立即执行一次")
     @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
     @PutMapping("/run")
-    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
-    {
+    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException {
         boolean result = jobService.run(job);
         return result ? success() : error("任务不存在或已过期！");
     }
 
-    /**
-     * 删除定时任务
-     */
+
+    @ApiOperation("删除定时任务")
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
-    {
+    public AjaxResult remove(
+            @ApiParam(name = "id", value = "定时任务id", required = true)
+            @PathVariable Long[] jobIds) throws SchedulerException, TaskException {
         jobService.deleteJobByIds(jobIds);
         return success();
     }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java

@@ -3,6 +3,9 @@ package com.ruoyi.quartz.domain;
 import java.util.Date;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -15,157 +18,163 @@ import com.ruoyi.quartz.util.CronUtils;
 
 /**
  * 定时任务调度表 sys_job
- * 
+ *
  * @author ruoyi
  */
-public class SysJob extends BaseEntity
-{
+@ApiModel(value = "定时任务调度对象")
+public class SysJob extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 任务ID */
+    /**
+     * 任务ID
+     */
+    @ApiModelProperty("任务编号")
     @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
     private Long jobId;
 
-    /** 任务名称 */
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty("任务名称")
     @Excel(name = "任务名称")
     private String jobName;
 
-    /** 任务组名 */
+    /**
+     * 任务组名
+     */
+    @ApiModelProperty("任务组名")
     @Excel(name = "任务组名")
     private String jobGroup;
 
-    /** 调用目标字符串 */
+    /**
+     * 调用目标字符串
+     */
+    @ApiModelProperty("调用目标字符串")
     @Excel(name = "调用目标字符串")
     private String invokeTarget;
 
-    /** cron执行表达式 */
+    /**
+     * cron执行表达式
+     */
+    @ApiModelProperty("指定表达式")
     @Excel(name = "执行表达式 ")
     private String cronExpression;
 
-    /** cron计划策略 */
+    /**
+     * cron计划策略
+     */
+    @ApiModelProperty("计划策略")
     @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
     private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
 
-    /** 是否并发执行（0允许 1禁止） */
+    /**
+     * 是否并发执行（0允许 1禁止）
+     */
+    @ApiModelProperty("并发执行")
     @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
     private String concurrent;
 
-    /** 任务状态（0正常 1暂停） */
+    /**
+     * 任务状态（0正常 1暂停）
+     */
+    @ApiModelProperty("任务状态")
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
-    public Long getJobId()
-    {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Long jobId)
-    {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
     @NotBlank(message = "任务名称不能为空")
     @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
-    public String getJobName()
-    {
+    public String getJobName() {
         return jobName;
     }
 
-    public void setJobName(String jobName)
-    {
+    public void setJobName(String jobName) {
         this.jobName = jobName;
     }
 
-    public String getJobGroup()
-    {
+    public String getJobGroup() {
         return jobGroup;
     }
 
-    public void setJobGroup(String jobGroup)
-    {
+    public void setJobGroup(String jobGroup) {
         this.jobGroup = jobGroup;
     }
 
     @NotBlank(message = "调用目标字符串不能为空")
     @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
-    public String getInvokeTarget()
-    {
+    public String getInvokeTarget() {
         return invokeTarget;
     }
 
-    public void setInvokeTarget(String invokeTarget)
-    {
+    public void setInvokeTarget(String invokeTarget) {
         this.invokeTarget = invokeTarget;
     }
 
     @NotBlank(message = "Cron执行表达式不能为空")
     @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
-    public String getCronExpression()
-    {
+    public String getCronExpression() {
         return cronExpression;
     }
 
-    public void setCronExpression(String cronExpression)
-    {
+    public void setCronExpression(String cronExpression) {
         this.cronExpression = cronExpression;
     }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getNextValidTime()
-    {
-        if (StringUtils.isNotEmpty(cronExpression))
-        {
+    public Date getNextValidTime() {
+        if (StringUtils.isNotEmpty(cronExpression)) {
             return CronUtils.getNextExecution(cronExpression);
         }
         return null;
     }
 
-    public String getMisfirePolicy()
-    {
+    public String getMisfirePolicy() {
         return misfirePolicy;
     }
 
-    public void setMisfirePolicy(String misfirePolicy)
-    {
+    public void setMisfirePolicy(String misfirePolicy) {
         this.misfirePolicy = misfirePolicy;
     }
 
-    public String getConcurrent()
-    {
+    public String getConcurrent() {
         return concurrent;
     }
 
-    public void setConcurrent(String concurrent)
-    {
+    public void setConcurrent(String concurrent) {
         this.concurrent = concurrent;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobId", getJobId())
-            .append("jobName", getJobName())
-            .append("jobGroup", getJobGroup())
-            .append("cronExpression", getCronExpression())
-            .append("nextValidTime", getNextValidTime())
-            .append("misfirePolicy", getMisfirePolicy())
-            .append("concurrent", getConcurrent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("jobId", getJobId())
+                .append("jobName", getJobName())
+                .append("jobGroup", getJobGroup())
+                .append("cronExpression", getCronExpression())
+                .append("nextValidTime", getNextValidTime())
+                .append("misfirePolicy", getMisfirePolicy())
+                .append("concurrent", getConcurrent())
+                .append("status", getStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PostCheckSystemTask.java

@@ -430,10 +430,15 @@ public class PostCheckSystemTask {
     }
 
     public static void main(String[] args) {
+//        Hzsh.eitc@6626.admin = 9888DE88B93ADE3C2F1CF21B3DA5490F1622B52E75C2ED57CD0A3ED8FC621339
+//        Hzsh.eitc@6626.user = 57E00682ED216BB1160100FE7EE9B350111E72584087752289390438A67FBDFA
 
 //        String aesEncrypt = AesUtil.aesEncrypt("Hzsh.eitc@6626.admin", AesUtil.aesKey);
         String aesEncrypt = AesUtil.aesEncrypt("Hzsh.eitc@6626.user", AesUtil.aesKey);
         System.out.println("aesEncrypt = " + aesEncrypt);
+
+        String aesDecrypt = AesUtil.aesDecrypt("D87E964E44C6792A6E433F85B13EC1B6", AesUtil.aesKey);
+        System.out.println("aesDecrypt = " + aesDecrypt);
         if (true) {
             return;
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -1,16 +1,15 @@
 package com.ruoyi.system.domain;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -18,55 +17,53 @@ import java.util.Date;
  *
  * @author ruoyi
  */
+@ApiModel(value = "岗位管理对象")
 public class SysPost extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 岗位序号 */
+    @ApiModelProperty("岗位ID")
     @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
     private Long postId;
 
-    /** 岗位编码 */
+    @ApiModelProperty("岗位编码")
     @Excel(name = "岗位编码")
     private String postCode;
 
-    /** 岗位名称 */
+    @ApiModelProperty("岗位名称")
     @Excel(name = "岗位名称")
     private String postName;
 
-    /** 岗位排序 */
+    @ApiModelProperty("岗位排序")
     @Excel(name = "岗位排序")
     private Integer postSort;
 
-    /** 状态（0正常 1停用） */
+
+    @ApiModelProperty("岗位状态0正常1停用")
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-
-    /**
-     * 部门id
-     */
+    @ApiModelProperty("部门ID")
     private Long deptId;
 
-    /**
-     * 部门id
-     */
-    private Long deptName;
 
-    /**
-     * 部门状态
-     */
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("部门状态0正常1停用")
     @Excel(name = "部门状态（0正常 1停用）")
     private String deptStatus;
 
     /**
      * 级别：0-不设置；1-经理；
      */
+    @ApiModelProperty("级别0员工1经理2领导")
     private Integer postLevel;
 
     /**
      * 是否关键岗位：1-是；2-否；
      */
+    @ApiModelProperty("是否关键岗位1时2否")
     private Integer importantType;
 
 
@@ -175,11 +172,11 @@ public class SysPost extends BaseEntity
         this.deptId = deptId;
     }
 
-    public Long getDeptName() {
+    public String getDeptName() {
         return deptName;
     }
 
-    public void setDeptName(Long deptName) {
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }