Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/pom.xml

@@ -24,19 +24,6 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
-        <!-- swagger3-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
          <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseSupplierController.java

@@ -24,7 +24,7 @@ import java.util.List;
  *
  * @author sunhh
  */
-@Api("供应商管理")
+@Api(tags="供应商管理")
 @RestController
 @RequestMapping("/base/supplier")
 public class BaseSupplierController extends BaseController {

purchase-admin/src/main/java/com/ozs/web/controller/system/SysConfigController.java

@@ -2,6 +2,10 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+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;
@@ -28,6 +32,7 @@ import com.ozs.system.service.ISysConfigService;
  *
  * @author ruoyi
  */
+@Api(tags="信息操作处理")
 @RestController
 @RequestMapping("/system/config")
 public class SysConfigController extends BaseController
@@ -40,6 +45,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
+    @ApiOperation("获取参数配置列表")
     public TableDataInfo list(SysConfig config)
     {
         startPage();
@@ -50,6 +56,7 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
+    @ApiOperation("参数导出")
     public void export(HttpServletResponse response, SysConfig config)
     {
         List<SysConfig> list = configService.selectConfigList(config);
@@ -62,6 +69,8 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
+    @ApiOperation("根据参数编号获取详细信息")
+    @ApiImplicitParam(name = "configId", value = "参数ID", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
     public AjaxResult getInfo(@PathVariable Long configId)
     {
         return success(configService.selectConfigById(configId));
@@ -71,6 +80,8 @@ public class SysConfigController extends BaseController
      * 根据参数键名查询参数值
      */
     @GetMapping(value = "/configKey/{configKey}")
+    @ApiOperation("根据参数键名查询参数值")
+    @ApiImplicitParam(name = "configKey", value = "参数键名", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
     public AjaxResult getConfigKey(@PathVariable String configKey)
     {
         return success(configService.selectConfigByKey(configKey));
@@ -82,6 +93,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:add')")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增参数配置")
     public AjaxResult add(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -98,6 +110,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改参数配置")
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -114,6 +127,8 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
+    @ApiOperation("删除参数配置")
+    @ApiImplicitParam(name = "configIds", value = "参数id集合", required = true, dataType = "Long[]", paramType = "path", dataTypeClass = Long.class)
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
         configService.deleteConfigByIds(configIds);
@@ -126,6 +141,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
+    @ApiOperation("刷新参数缓存")
     public AjaxResult refreshCache()
     {
         configService.resetConfigCache();

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

@@ -1,6 +1,9 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+
+import io.swagger.annotations.Api;
+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;
@@ -27,6 +30,7 @@ import com.ozs.system.service.ISysDeptService;
  *
  * @author ruoyi
  */
+@Api(tags="部门信息")
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController
@@ -39,6 +43,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
+    @ApiOperation("获取参数配置列表")
     public AjaxResult list(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);
@@ -50,6 +55,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
+    @ApiOperation("查询部门列表（排除节点）")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -62,6 +68,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
+    @ApiOperation("根据部门编号获取详细信息")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
         deptService.checkDeptDataScope(deptId);
@@ -74,6 +81,7 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增部门")
     public AjaxResult add(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -90,6 +98,7 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改部门")
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
         Long deptId = dept.getDeptId();
@@ -116,6 +125,7 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
+    @ApiOperation("删除部门")
     public AjaxResult remove(@PathVariable Long deptId)
     {
         if (deptService.hasChildByDeptId(deptId))

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDictDataController.java

@@ -3,6 +3,9 @@ package com.ozs.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+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;
@@ -32,6 +35,7 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
+@Api(tags="数据字典信息")
 public class SysDictDataController extends BaseController
 {
     @Autowired
@@ -42,6 +46,7 @@ public class SysDictDataController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
+    @ApiOperation("根据条件分页查询字典数据")
     public TableDataInfo list(SysDictData dictData)
     {
         startPage();
@@ -52,6 +57,7 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
+    @ApiOperation("字典数据")
     public void export(HttpServletResponse response, SysDictData dictData)
     {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
@@ -64,6 +70,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
+    @ApiOperation("查询字典数据详细")
     public AjaxResult getInfo(@PathVariable Long dictCode)
     {
         return success(dictDataService.selectDictDataById(dictCode));
@@ -73,6 +80,7 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
+    @ApiOperation("根据字典类型查询字典数据信息")
     public AjaxResult dictType(@PathVariable String dictType)
     {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
@@ -89,6 +97,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增字典类型")
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
     {
         dict.setCreateBy(getUsername());
@@ -101,6 +110,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改保存字典类型")
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(getUsername());
@@ -113,6 +123,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
+    @ApiOperation("删除字典类型")
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     {
         dictDataService.deleteDictDataByIds(dictCodes);

purchase-admin/src/main/java/com/ozs/web/controller/system/SysDictTypeController.java

@@ -2,6 +2,9 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+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;
@@ -30,6 +33,7 @@ import com.ozs.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/type")
+@Api(tags = "数据字典信息")
 public class SysDictTypeController extends BaseController
 {
     @Autowired
@@ -37,6 +41,7 @@ public class SysDictTypeController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
+    @ApiOperation("根据条件分页查询字典类型")
     public TableDataInfo list(SysDictType dictType)
     {
         startPage();
@@ -47,6 +52,7 @@ public class SysDictTypeController extends BaseController
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
+    @ApiOperation("字典类型")
     public void export(HttpServletResponse response, SysDictType dictType)
     {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
@@ -59,6 +65,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
+    @ApiOperation("查询字典类型详细")
     public AjaxResult getInfo(@PathVariable Long dictId)
     {
         return success(dictTypeService.selectDictTypeById(dictId));
@@ -70,6 +77,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增字典类型")
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -86,6 +94,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改字典类型")
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -102,6 +111,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
+    @ApiOperation("删除字典类型")
     public AjaxResult remove(@PathVariable Long[] dictIds)
     {
         dictTypeService.deleteDictTypeByIds(dictIds);
@@ -114,6 +124,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
+    @ApiOperation("刷新字典缓存")
     public AjaxResult refreshCache()
     {
         dictTypeService.resetDictCache();
@@ -124,6 +135,7 @@ public class SysDictTypeController extends BaseController
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
+    @ApiOperation("获取字典选择框列表")
     public AjaxResult optionselect()
     {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();

purchase-admin/src/main/java/com/ozs/web/controller/system/SysIndexController.java

@@ -1,5 +1,7 @@
 package com.ozs.web.controller.system;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +14,7 @@ import com.ozs.common.utils.StringUtils;
  * @author ruoyi
  */
 @RestController
+@Api(tags = "首页")
 public class SysIndexController
 {
     /** 系统基础配置 */
@@ -22,6 +25,7 @@ public class SysIndexController
      * 访问首页，提示语
      */
     @RequestMapping("/")
+    @ApiOperation("访问首页，提示语")
     public String index()
     {
         return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", purchaseConfig.getName(), purchaseConfig.getVersion());

purchase-admin/src/main/java/com/ozs/web/controller/system/SysLoginController.java

@@ -3,6 +3,7 @@ package com.ozs.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +26,7 @@ import com.ozs.system.service.ISysMenuService;
  * @author ruoyi
  */
 @RestController
+@Api(tags = "登录验证")
 public class SysLoginController
 {
     @Autowired
@@ -42,7 +44,7 @@ public class SysLoginController
      * @param loginBody 登录信息
      * @return 结果
      */
-    @ApiOperation("新增用户")
+    @ApiOperation("登录方法")
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
@@ -60,6 +62,7 @@ public class SysLoginController
      * @return 用户信息
      */
     @GetMapping("getInfo")
+    @ApiOperation("获取用户信息")
     public AjaxResult getInfo()
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -80,6 +83,7 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
+    @ApiOperation("获取路由信息")
     public AjaxResult getRouters()
     {
         Long userId = SecurityUtils.getUserId();

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

@@ -1,6 +1,9 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+
+import io.swagger.annotations.Api;
+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;
@@ -28,6 +31,7 @@ import com.ozs.system.service.ISysMenuService;
  */
 @RestController
 @RequestMapping("/system/menu")
+@Api(tags = "菜单信息")
 public class SysMenuController extends BaseController
 {
     @Autowired
@@ -38,6 +42,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
+    @ApiOperation("获取菜单列表")
     public AjaxResult list(SysMenu menu)
     {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -49,6 +54,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
+    @ApiOperation("根据菜单编号获取详细信息")
     public AjaxResult getInfo(@PathVariable Long menuId)
     {
         return success(menuService.selectMenuById(menuId));
@@ -58,6 +64,7 @@ public class SysMenuController extends BaseController
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
+    @ApiOperation("获取菜单下拉树列表")
     public AjaxResult treeselect(SysMenu menu)
     {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -68,6 +75,7 @@ public class SysMenuController extends BaseController
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    @ApiOperation("加载对应角色菜单列表树")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
         List<SysMenu> menus = menuService.selectMenuList(getUserId());
@@ -83,6 +91,7 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增菜单")
     public AjaxResult add(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
@@ -103,6 +112,7 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改菜单")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
@@ -127,6 +137,7 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
+    @ApiOperation("删除菜单")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
         if (menuService.hasChildByMenuId(menuId))

purchase-admin/src/main/java/com/ozs/web/controller/system/SysNoticeController.java

@@ -1,6 +1,9 @@
 package com.ozs.web.controller.system;
 
 import java.util.List;
+
+import io.swagger.annotations.Api;
+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;
@@ -27,6 +30,7 @@ import com.ozs.system.service.ISysNoticeService;
  */
 @RestController
 @RequestMapping("/system/notice")
+@Api(tags = "公告信息操作处理")
 public class SysNoticeController extends BaseController
 {
     @Autowired
@@ -37,6 +41,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
+    @ApiOperation("获取通知公告列表")
     public TableDataInfo list(SysNotice notice)
     {
         startPage();
@@ -49,6 +54,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
+    @ApiOperation("根据通知公告编号获取详细信息")
     public AjaxResult getInfo(@PathVariable Long noticeId)
     {
         return success(noticeService.selectNoticeById(noticeId));
@@ -60,6 +66,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增通知公告")
     public AjaxResult add(@Validated @RequestBody SysNotice notice)
     {
         notice.setCreateBy(getUsername());
@@ -72,6 +79,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改通知公告")
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
     {
         notice.setUpdateBy(getUsername());
@@ -84,6 +92,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
+    @ApiOperation("删除通知公告")
     public AjaxResult remove(@PathVariable Long[] noticeIds)
     {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));

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

@@ -2,6 +2,9 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+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;
@@ -30,6 +33,7 @@ import com.ozs.system.service.ISysPostService;
  */
 @RestController
 @RequestMapping("/system/post")
+@Api(tags="岗位信息操作处理")
 public class SysPostController extends BaseController
 {
     @Autowired
@@ -40,6 +44,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
+    @ApiOperation("获取岗位列表")
     public TableDataInfo list(SysPost post)
     {
         startPage();
@@ -50,6 +55,7 @@ public class SysPostController extends BaseController
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")
+    @ApiOperation("岗位数据")
     public void export(HttpServletResponse response, SysPost post)
     {
         List<SysPost> list = postService.selectPostList(post);
@@ -62,6 +68,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
+    @ApiOperation("根据岗位编号获取详细信息")
     public AjaxResult getInfo(@PathVariable Long postId)
     {
         return success(postService.selectPostById(postId));
@@ -73,6 +80,7 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增岗位")
     public AjaxResult add(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -93,6 +101,7 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改岗位")
     public AjaxResult edit(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -113,6 +122,7 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
+    @ApiOperation("删除岗位")
     public AjaxResult remove(@PathVariable Long[] postIds)
     {
         return toAjax(postService.deletePostByIds(postIds));
@@ -122,6 +132,7 @@ public class SysPostController extends BaseController
      * 获取岗位选择框列表
      */
     @GetMapping("/optionselect")
+    @ApiOperation("获取岗位选择框列表")
     public AjaxResult optionselect()
     {
         List<SysPost> posts = postService.selectPostAll();

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProcurementStandardController.java

@@ -0,0 +1,52 @@
+package com.ozs.web.controller.system;
+
+
+import com.ozs.common.core.domain.R;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.system.domain.vo.requestVo.SysProcurementStandardVo;
+import com.ozs.system.service.SysProcurementStandardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 采购标准前端控制器
+ * </p>
+ *
+ * @author ytrd
+ * @since 2022-11-02
+ */
+@Api(tags = "采购标准接口")
+@RestController
+@RequestMapping("system/SysProcurementStandard")
+@CrossOrigin
+public class SysProcurementStandardController {
+
+    @Resource
+    private SysProcurementStandardService sysProcurementStandardService;
+
+    @ApiOperation("添加采购单位管理中标准信息")
+    @PostMapping("save")
+    public R<String> save(@RequestBody List<SysProcurementStandardVo> sysProcurementStandardVoList) {
+        boolean isSuccess = false;
+        SysProcurementStandard sysProcurementStandard = new SysProcurementStandard();
+        for (SysProcurementStandardVo sysProcurementStandardVo : sysProcurementStandardVoList) {
+            BeanUtils.copyProperties(sysProcurementStandardVo, sysProcurementStandard);
+            isSuccess = sysProcurementStandardService.save(sysProcurementStandard);
+            if (!isSuccess) {
+                return R.fail();
+            }
+        }
+        return R.ok();
+    }
+}
+

purchase-admin/src/main/java/com/ozs/web/controller/system/SysProfileController.java

@@ -1,5 +1,7 @@
 package com.ozs.web.controller.system;
 
+import io.swagger.annotations.Api;
+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.PostMapping;
@@ -31,6 +33,7 @@ import com.ozs.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user/profile")
+@Api(tags = "个人信息业务处理")
 public class SysProfileController extends BaseController
 {
     @Autowired
@@ -43,6 +46,7 @@ public class SysProfileController extends BaseController
      * 个人信息
      */
     @GetMapping
+    @ApiOperation("个人信息")
     public AjaxResult profile()
     {
         LoginUser loginUser = getLoginUser();
@@ -58,6 +62,7 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改用户")
     public AjaxResult updateProfile(@RequestBody SysUser user)
     {
         LoginUser loginUser = getLoginUser();
@@ -95,6 +100,7 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
+    @ApiOperation("重置密码")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
         LoginUser loginUser = getLoginUser();
@@ -123,6 +129,7 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
+    @ApiOperation("头像上传")
     public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
     {
         if (!file.isEmpty())

purchase-admin/src/main/java/com/ozs/web/controller/system/SysRegisterController.java

@@ -1,5 +1,7 @@
 package com.ozs.web.controller.system;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +19,7 @@ import com.ozs.system.service.ISysConfigService;
  * @author ruoyi
  */
 @RestController
+@Api(tags = "注册验证")
 public class SysRegisterController extends BaseController
 {
     @Autowired
@@ -26,6 +29,7 @@ public class SysRegisterController extends BaseController
     private ISysConfigService configService;
 
     @PostMapping("/register")
+    @ApiOperation("注册")
     public AjaxResult register(@RequestBody RegisterBody user)
     {
         if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))

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

@@ -2,6 +2,9 @@ package com.ozs.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+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;
@@ -39,6 +42,7 @@ import com.ozs.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/role")
+@Api(tags = "角色信息")
 public class SysRoleController extends BaseController
 {
     @Autowired
@@ -58,6 +62,7 @@ public class SysRoleController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
+    @ApiOperation("根据条件分页查询角色数据")
     public TableDataInfo list(SysRole role)
     {
         startPage();
@@ -68,6 +73,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
+    @ApiOperation("角色管理")
     public void export(HttpServletResponse response, SysRole role)
     {
         List<SysRole> list = roleService.selectRoleList(role);
@@ -80,6 +86,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
+    @ApiOperation("根据角色编号获取详细信息")
     public AjaxResult getInfo(@PathVariable Long roleId)
     {
         roleService.checkRoleDataScope(roleId);
@@ -92,6 +99,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增角色")
     public AjaxResult add(@Validated @RequestBody SysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
@@ -113,6 +121,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改保存角色")
     public AjaxResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -148,6 +157,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
+    @ApiOperation("修改保存数据权限")
     public AjaxResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -161,6 +171,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
     public AjaxResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -175,6 +186,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
+    @ApiOperation("删除角色")
     public AjaxResult remove(@PathVariable Long[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));
@@ -185,6 +197,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
+    @ApiOperation("获取角色选择框列表")
     public AjaxResult optionselect()
     {
         return success(roleService.selectRoleAll());
@@ -195,6 +208,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
+    @ApiOperation("查询已分配用户角色列表")
     public TableDataInfo allocatedList(SysUser user)
     {
         startPage();
@@ -207,6 +221,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
+    @ApiOperation("查询未分配用户角色列表")
     public TableDataInfo unallocatedList(SysUser user)
     {
         startPage();
@@ -220,6 +235,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
+    @ApiOperation("取消授权用户")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
     {
         return toAjax(roleService.deleteAuthUser(userRole));
@@ -231,6 +247,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
+    @ApiOperation("批量取消授权用户")
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
     {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
@@ -242,6 +259,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
+    @ApiOperation("批量选择用户授权")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
     {
         roleService.checkRoleDataScope(roleId);
@@ -253,6 +271,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
+    @ApiOperation("获取对应角色部门树列表")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {
         AjaxResult ajax = AjaxResult.success();

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

@@ -3,6 +3,9 @@ package com.ozs.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+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;
@@ -40,6 +43,7 @@ import com.ozs.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user")
+@Api(tags = "用户信息")
 public class SysUserController extends BaseController
 {
     @Autowired
@@ -59,6 +63,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
+    @ApiOperation("获取用户列表")
     public TableDataInfo list(SysUser user)
     {
         startPage();
@@ -69,6 +74,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
+    @ApiOperation("用户管理")
     public void export(HttpServletResponse response, SysUser user)
     {
         List<SysUser> list = userService.selectUserList(user);
@@ -79,6 +85,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
+    @ApiOperation("用户管理")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
     {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -89,6 +96,7 @@ public class SysUserController extends BaseController
     }
 
     @PostMapping("/importTemplate")
+    @ApiOperation("用户数据")
     public void importTemplate(HttpServletResponse response)
     {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -100,6 +108,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
+    @ApiOperation("根据用户编号获取详细信息")
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         userService.checkUserDataScope(userId);
@@ -123,6 +132,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
+    @ApiOperation("新增用户")
     public AjaxResult add(@Validated @RequestBody SysUser user)
     {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
@@ -150,6 +160,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
+    @ApiOperation("修改用户")
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -178,6 +189,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
+    @ApiOperation("删除用户")
     public AjaxResult remove(@PathVariable Long[] userIds)
     {
         if (ArrayUtils.contains(userIds, getUserId()))
@@ -193,6 +205,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
+    @ApiOperation("重置密码")
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -208,6 +221,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
+    @ApiOperation("状态修改")
     public AjaxResult changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -221,6 +235,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
+    @ApiOperation("根据用户编号获取授权角色")
     public AjaxResult authRole(@PathVariable("userId") Long userId)
     {
         AjaxResult ajax = AjaxResult.success();
@@ -237,6 +252,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
+    @ApiOperation("用户授权角色")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.checkUserDataScope(userId);
@@ -249,6 +265,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
+    @ApiOperation("获取部门树列表")
     public AjaxResult deptTree(SysDept dept)
     {
         return success(deptService.selectDeptTreeList(dept));

purchase-admin/src/main/java/com/ozs/web/controller/tool/TestController.java

@@ -37,7 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author ruoyi
  */
-@Api("用户信息管理")
+@Api(tags="用户信息管理")
 @RestController
 @RequestMapping("/test/user")
 public class TestController extends BaseController {

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

@@ -9,8 +9,8 @@ purchase:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
-  #  profile: C:/purchase/uploadPath
-  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  profile: C:/purchase/uploadPath
+#  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

purchase-admin/src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="/home/ruoyi/logs" />-->
-    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs" />
+    <property name="log.path" value="C:/purchase/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

purchase-common/pom.xml

@@ -175,6 +175,19 @@
 
         <!-- es  检索pdf word 内容依赖-->
 
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
     </dependencies>
 
 </project>

purchase-common/src/main/java/com/ozs/common/core/domain/BaseEntity.java

@@ -7,39 +7,49 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * Entity基类
  *
  * @author ruoyi
  */
+@ApiModel(value = "BaseEntity", description = "基础实体")
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
     @JsonIgnore
+    @ApiModelProperty("搜索值")
     private String searchValue;
 
     /** 创建者 */
+    @ApiModelProperty("创建者")
     private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
     /** 更新者 */
+    @ApiModelProperty("更新者")
     private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
     /** 备注 */
+    @ApiModelProperty("备注")
     private String remark;
 
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @ApiModelProperty("请求参数")
     private Map<String, Object> params;
 
     public String getSearchValue()

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysProcurementStandard.java

@@ -0,0 +1,55 @@
+package com.ozs.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * 采购标准
+ */
+@Data
+@TableName("sys_procurement_standard")
+public class SysProcurementStandard implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(value = "采购标准ID")
+    @TableField("procurement_standard_id")
+    private Long procurementStandardId;
+    
+    @ApiModelProperty(value = "部门ID")
+    @TableField("dept_id")
+    private Long deptId;
+
+    /** 类别(0装备类1服务类2装备类3工程类) */
+    @ApiModelProperty(value = "类别")
+    @TableField("category")
+    private Integer category;
+
+    /** 状态(0不限1限额) */
+    @ApiModelProperty(value = "状态")
+    @TableField("state")
+    private Integer state;
+    
+    @ApiModelProperty(value = "最小值(万元)")
+    @TableField("minimum_value")
+    private BigDecimal minimumValue;
+    
+    @ApiModelProperty(value = "最大值(万元)")
+    @TableField("maximum")
+    private BigDecimal maximum;
+    
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+}

purchase-framework/src/main/java/com/ozs/framework/config/MyBatisConfig.java

@@ -29,7 +29,7 @@ import com.ozs.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-@Configuration
+//@Configuration
 public class MyBatisConfig
 {
     @Autowired

purchase-system/src/main/java/com/ozs/system/domain/SysConfig.java

@@ -2,6 +2,9 @@ package com.ozs.system.domain;
 
 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.ozs.common.annotation.Excel;
@@ -13,28 +16,34 @@ import com.ozs.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
+@ApiModel(value = "SysConfig", description = "参数配置")
 public class SysConfig extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 参数主键 */
     @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    @ApiModelProperty("参数主键")
     private Long configId;
 
     /** 参数名称 */
     @Excel(name = "参数名称")
+    @ApiModelProperty("参数名称")
     private String configName;
 
     /** 参数键名 */
     @Excel(name = "参数键名")
+    @ApiModelProperty("参数键名")
     private String configKey;
 
     /** 参数键值 */
     @Excel(name = "参数键值")
+    @ApiModelProperty("参数键值")
     private String configValue;
 
     /** 系统内置（Y是 N否） */
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+    @ApiModelProperty("系统内置")
     private String configType;
 
     public Long getConfigId()

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysProcurementStandardVo.java

@@ -0,0 +1,45 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * 采购标准
+ */
+@Data
+public class SysProcurementStandardVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+    @ApiModelProperty(value = "采购标准ID")
+    private Long procurementStandardId;
+    
+    @ApiModelProperty(value = "部门ID")
+    private Long deptId;
+
+    /** 类别(0装备类1服务类2装备类3工程类) */
+    @ApiModelProperty(value = "类别")
+    private Integer category;
+
+    /** 状态(0不限1限额) */
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+    
+    @ApiModelProperty(value = "最小值(万元)")
+    private BigDecimal minimumValue;
+    
+    @ApiModelProperty(value = "最大值(万元)")
+    private BigDecimal maximum;
+    
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/UnitManagementRequestVo.java

@@ -1,7 +0,0 @@
-package com.ozs.system.domain.vo.requestVo;
-
-/**
- * @author Administrator
- */
-public class UnitManagementRequestVo {
-}

purchase-system/src/main/java/com/ozs/system/mapper/SysProcurementStandardMapper.java

@@ -0,0 +1,15 @@
+package com.ozs.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import org.apache.ibatis.annotations.Mapper;
+import javax.annotation.Resource;
+
+
+/**
+ * @author Administrator
+ */
+@Resource
+@Mapper
+public interface SysProcurementStandardMapper extends BaseMapper<SysProcurementStandard> {
+}

purchase-system/src/main/java/com/ozs/system/service/SysProcurementStandardService.java

@@ -0,0 +1,10 @@
+package com.ozs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
+
+/**
+ * @author Administrator
+ */
+public interface SysProcurementStandardService extends IService<SysProcurementStandard> {
+}

purchase-system/src/main/java/com/ozs/system/service/impl/SysProcurementStandardServiceImpl.java

@@ -0,0 +1,14 @@
+package com.ozs.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.common.core.domain.entity.SysProcurementStandard;
+import com.ozs.system.mapper.SysProcurementStandardMapper;
+import com.ozs.system.service.SysProcurementStandardService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class SysProcurementStandardServiceImpl extends ServiceImpl<SysProcurementStandardMapper, SysProcurementStandard> implements SysProcurementStandardService {
+}

purchase-system/src/main/resources/mapper/system/SysProcurementStandardMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.system.mapper.SysProcurementStandardMapper">
+
+</mapper>