项目初始化

datax-config/src/main/resources/config/datax-gateway-dev.yml

@@ -25,7 +25,7 @@ spring:
               args:
                 name: authFallback
                 fallbackUri: forward:/fallback
-        # 系统配置中心
+        # 系统基础设置中心
         - id: datax-service-system
           uri: lb://datax-service-system
           predicates:
@@ -45,7 +45,7 @@ spring:
               args:
                 name: emailFallback
                 fallbackUri: forward:/fallback
-        # 邮件中心
+        # 文件中心
         - id: datax-service-file
           uri: lb://datax-service-file
           predicates:
@@ -55,7 +55,7 @@ spring:
               args:
                 name: fileFallback
                 fallbackUri: forward:/fallback
-        # 即时通讯消息中心
+        # 即时通讯中心
         - id: datax-websocket-server
           uri: ws://localhost:9876
           predicates:

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/query/LogQuery.java

+package cn.datax.service.system.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LogQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 日志标题
+     */
+    private String title;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/query/PostQuery.java

+package cn.datax.service.system.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PostQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/query/RoleQuery.java

+package cn.datax.service.system.api.query;
+
+import cn.datax.common.base.BaseQueryParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RoleQuery extends BaseQueryParams {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+}

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/DeptController.java

@@ -5,6 +5,7 @@ import cn.datax.common.validate.ValidateGroupForSave;
 import cn.datax.common.validate.ValidateGroupForUpdate;
 import cn.datax.service.system.api.dto.DeptDto;
 import cn.datax.service.system.api.entity.DeptEntity;
+import cn.datax.service.system.api.vo.DeptVo;
 import cn.datax.service.system.mapstruct.DeptMapper;
 import cn.datax.service.system.service.DeptService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,6 +19,9 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -48,7 +52,9 @@ public class DeptController extends BaseController {
     @ApiOperation(value = "获取部门列表", notes = "")
     @GetMapping()
     public R getDeptList() {
-        return R.ok().setData(deptService.list(Wrappers.emptyWrapper()));
+        List<DeptEntity> list = deptService.list(Wrappers.emptyWrapper());
+        List<DeptVo> collect = list.stream().map(deptMapper::toVO).collect(Collectors.toList());
+        return R.ok().setData(collect);
     }
 
     @ApiOperation(value = "创建部门", notes = "根据dept对象创建部门")
@@ -77,6 +83,5 @@ public class DeptController extends BaseController {
         deptService.deleteDeptById(id);
         return R.ok();
     }
-
 }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/LogController.java

 package cn.datax.service.system.controller;
 
 import cn.datax.common.base.BaseController;
+import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 import cn.datax.service.system.api.dto.LogDto;
 import cn.datax.service.system.api.entity.LogEntity;
+import cn.datax.service.system.api.query.LogQuery;
+import cn.datax.service.system.api.vo.LogVo;
+import cn.datax.service.system.mapstruct.LogMapper;
 import cn.datax.service.system.service.LogService;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +20,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -32,6 +39,9 @@ public class LogController extends BaseController {
     @Autowired
     private LogService logService;
 
+    @Autowired
+    private LogMapper logMapper;
+
     @ApiOperation(value = "创建日志", notes = "根据log对象创建日志")
     @ApiImplicitParam(name = "log", value = "日志详细实体log", required = true, dataType = "logDto")
     @PostMapping()
@@ -42,17 +52,15 @@ public class LogController extends BaseController {
 
     @ApiOperation(value = "日志分页查询", notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", required = true, dataType = "int", example = "1"),
-            @ApiImplicitParam(name = "pageSize", value = "分页条数", required = true, dataType = "int", example = "20"),
-            @ApiImplicitParam(name = "log", value = "日志详细实体log", required = false, dataTypeClass = LogDto.class)
+            @ApiImplicitParam(name = "logQuery", value = "查询实体logQuery", required = true, dataTypeClass = LogQuery.class)
     })
     @GetMapping("/page")
-    public R getPostPage(@RequestParam(value="pageNum", defaultValue="1") Integer pageNum,
-                         @RequestParam(value="pageSize", defaultValue="20") Integer pageSize,
-                         LogDto log) {
+    public R getPostPage(LogQuery logQuery) {
         QueryWrapper<LogEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotBlank(log.getTitle()), "title", log.getTitle());
-        IPage<LogEntity> page = logService.page(new Page<>(pageNum, pageSize), queryWrapper);
-        return R.ok().setData(page);
+        queryWrapper.like(StrUtil.isNotBlank(logQuery.getTitle()), "title", logQuery.getTitle());
+        IPage<LogEntity> page = logService.page(new Page<>(logQuery.getPageNum(), logQuery.getPageSize()), queryWrapper);
+        List<LogVo> collect = page.getRecords().stream().map(logMapper::toVO).collect(Collectors.toList());
+        JsonPage<LogVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
     }
 }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/MenuController.java

@@ -5,6 +5,7 @@ import cn.datax.common.validate.ValidateGroupForSave;
 import cn.datax.common.validate.ValidateGroupForUpdate;
 import cn.datax.service.system.api.dto.MenuDto;
 import cn.datax.service.system.api.entity.MenuEntity;
+import cn.datax.service.system.api.vo.MenuVo;
 import cn.datax.service.system.mapstruct.MenuMapper;
 import cn.datax.service.system.service.MenuService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -18,6 +19,9 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -48,7 +52,9 @@ public class MenuController extends BaseController {
     @ApiOperation(value = "获取资源列表", notes = "")
     @GetMapping()
     public R getMenuList() {
-        return R.ok().setData(menuService.list(Wrappers.emptyWrapper()));
+        List<MenuEntity> list = menuService.list(Wrappers.emptyWrapper());
+        List<MenuVo> collect = list.stream().map(menuMapper::toVO).collect(Collectors.toList());
+        return R.ok().setData(collect);
     }
 
     @ApiOperation(value = "创建资源", notes = "根据menu对象创建资源")
@@ -77,6 +83,5 @@ public class MenuController extends BaseController {
         menuService.deleteMenuById(id);
         return R.ok();
     }
-
 }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/PostController.java

@@ -6,6 +6,7 @@ import cn.datax.common.validate.ValidateGroupForSave;
 import cn.datax.common.validate.ValidateGroupForUpdate;
 import cn.datax.service.system.api.dto.PostDto;
 import cn.datax.service.system.api.entity.PostEntity;
+import cn.datax.service.system.api.query.PostQuery;
 import cn.datax.service.system.api.vo.PostVo;
 import cn.datax.service.system.mapstruct.PostMapper;
 import cn.datax.service.system.service.PostService;
@@ -55,17 +56,13 @@ public class PostController extends BaseController {
 
     @ApiOperation(value = "岗位分页查询", notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", required = true, dataType = "int", example = "1"),
-            @ApiImplicitParam(name = "pageSize", value = "分页条数", required = true, dataType = "int", example = "20"),
-            @ApiImplicitParam(name = "post", value = "岗位详细实体post", required = false, dataTypeClass = PostDto.class)
+            @ApiImplicitParam(name = "postQuery", value = "查询实体postQuery", required = true, dataTypeClass = PostQuery.class)
     })
     @GetMapping("/page")
-    public R getPostPage(@RequestParam(value="pageNum", defaultValue="1") Integer pageNum,
-                         @RequestParam(value="pageSize", defaultValue="20") Integer pageSize,
-                         PostDto post) {
+    public R getPostPage(PostQuery postQuery) {
         QueryWrapper<PostEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotBlank(post.getPostName()), "post_name", post.getPostName());
-        IPage<PostEntity> page = postService.page(new Page<>(pageNum, pageSize), queryWrapper);
+        queryWrapper.like(StrUtil.isNotBlank(postQuery.getPostName()), "post_name", postQuery.getPostName());
+        IPage<PostEntity> page = postService.page(new Page<>(postQuery.getPageNum(), postQuery.getPageSize()), queryWrapper);
         List<PostVo> collect = page.getRecords().stream().map(postMapper::toVO).collect(Collectors.toList());
         JsonPage<PostVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
         return R.ok().setData(jsonPage);
@@ -97,6 +94,5 @@ public class PostController extends BaseController {
         postService.deletePostById(id);
         return R.ok();
     }
-
 }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/RoleController.java

@@ -6,6 +6,7 @@ import cn.datax.common.validate.ValidateGroupForSave;
 import cn.datax.common.validate.ValidateGroupForUpdate;
 import cn.datax.service.system.api.dto.RoleDto;
 import cn.datax.service.system.api.entity.RoleEntity;
+import cn.datax.service.system.api.query.RoleQuery;
 import cn.datax.service.system.api.vo.RoleVo;
 import cn.datax.service.system.mapstruct.RoleMapper;
 import cn.datax.service.system.service.RoleService;
@@ -45,11 +46,6 @@ public class RoleController extends BaseController {
     @Autowired
     private RoleMapper roleMapper;
 
-    /**
-     * 通过ID查询角色信息
-     * @param id
-     * @return
-     */
     @ApiOperation(value = "获取角色详细信息", notes = "根据url的id来获取角色详细信息")
     @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "String", paramType = "path")
     @GetMapping("/{id}")
@@ -58,36 +54,20 @@ public class RoleController extends BaseController {
         return R.ok().setData(roleMapper.toVO(roleEntity));
     }
 
-    /**
-     * 分页查询角色信息
-     * @param pageNum
-     * @param pageSize
-     * @param role
-     * @return
-     */
     @ApiOperation(value = "角色分页查询", notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页码", required = true, dataType = "int", example = "1"),
-            @ApiImplicitParam(name = "pageSize", value = "分页条数", required = true, dataType = "int", example = "20"),
-            @ApiImplicitParam(name = "role", value = "角色详细实体role", required = false, dataTypeClass = RoleDto.class)
+            @ApiImplicitParam(name = "roleQuery", value = "查询实体roleQuery", required = true, dataTypeClass = RoleQuery.class)
     })
     @GetMapping("/page")
-    public R getRolePage(@RequestParam(value="pageNum", defaultValue="1") Integer pageNum,
-                         @RequestParam(value="pageSize", defaultValue="20") Integer pageSize,
-                         RoleDto role) {
+    public R getRolePage(RoleQuery roleQuery) {
         QueryWrapper<RoleEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotBlank(role.getRoleName()), "role_name", role.getRoleName());
-        IPage<RoleEntity> page = roleService.page(new Page<>(pageNum, pageSize), queryWrapper);
+        queryWrapper.like(StrUtil.isNotBlank(roleQuery.getRoleName()), "role_name", roleQuery.getRoleName());
+        IPage<RoleEntity> page = roleService.page(new Page<>(roleQuery.getPageNum(), roleQuery.getPageSize()), queryWrapper);
         List<RoleVo> collect = page.getRecords().stream().map(roleMapper::toVO).collect(Collectors.toList());
         JsonPage<RoleVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
         return R.ok().setData(jsonPage);
     }
 
-    /**
-     * 添加角色
-     * @param role
-     * @return
-     */
     @ApiOperation(value = "创建角色", notes = "根据role对象创建角色")
     @ApiImplicitParam(name = "role", value = "角色详细实体role", required = true, dataType = "RoleDto")
     @PostMapping()
@@ -96,11 +76,6 @@ public class RoleController extends BaseController {
         return R.ok();
     }
 
-    /**
-     * 修改角色
-     * @param role
-     * @return
-     */
     @ApiOperation(value = "更新角色详细信息", notes = "根据url的id来指定更新对象，并根据传过来的role信息来更新角色详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "String", paramType = "path"),
@@ -112,11 +87,6 @@ public class RoleController extends BaseController {
         return R.ok();
     }
 
-    /**
-     * 删除角色
-     * @param id
-     * @return
-     */
     @ApiOperation(value = "删除角色", notes = "根据url的id来指定删除对象")
     @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "String", paramType = "path")
     @DeleteMapping("/{id}")
@@ -124,6 +94,5 @@ public class RoleController extends BaseController {
         roleService.deleteRoleById(id);
         return R.ok();
     }
-
 }
 

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/controller/UserController.java

@@ -119,6 +119,5 @@ public class UserController extends BaseController {
         userService.deleteUserById(id);
         return R.ok();
     }
-
 }