项目初始化

datax-common/datax-common-core/src/main/java/cn/datax/common/core/JsonPage.java

+package cn.datax.common.core;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class JsonPage<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private long pageNum;
+    private long pageSize;
+    private long totalPage;
+    private List<T> data;
+
+    public JsonPage(long pageNum, long pageSize, long totalPage, List<T> data) {
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.totalPage = totalPage;
+        this.data = data;
+    }
+}

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/DeptVo.java

@@ -3,6 +3,7 @@ package cn.datax.service.system.api.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 public class DeptVo implements Serializable {
@@ -11,6 +12,7 @@ public class DeptVo implements Serializable {
 
     private String id;
     private Integer status;
+    private LocalDateTime createTime;
     private String parentId;
     private String deptName;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/MenuVo.java

@@ -3,6 +3,7 @@ package cn.datax.service.system.api.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 public class MenuVo implements Serializable {
@@ -11,6 +12,7 @@ public class MenuVo implements Serializable {
 
     private String id;
     private Integer status;
+    private LocalDateTime createTime;
     private String parentId;
     private String menuName;
     private String menuPath;

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/PostVo.java

@@ -3,6 +3,7 @@ package cn.datax.service.system.api.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 public class PostVo implements Serializable {
@@ -11,5 +12,6 @@ public class PostVo implements Serializable {
 
     private String id;
     private Integer status;
+    private LocalDateTime createTime;
     private String postName;
 }

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/RoleVo.java

@@ -3,6 +3,7 @@ package cn.datax.service.system.api.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -12,6 +13,7 @@ public class RoleVo implements Serializable {
 
     private String id;
     private Integer status;
+    private LocalDateTime createTime;
     private String roleName;
     private String roleCode;
     private Integer dataScope;

datax-modules/system-service-parent/system-service-api/src/main/java/cn/datax/service/system/api/vo/UserVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -14,8 +15,8 @@ public class UserVo implements Serializable {
 
     private String id;
     private Integer status;
+    private LocalDateTime createTime;
     private String username;
-    private String password;
     private String nickname;
     private String email;
     private String phone;

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

 package cn.datax.service.system.controller;
 
+import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 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.vo.PostVo;
 import cn.datax.service.system.mapstruct.PostMapper;
 import cn.datax.service.system.service.PostService;
 import cn.hutool.core.util.StrUtil;
@@ -21,6 +23,9 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -61,7 +66,9 @@ public class PostController extends BaseController {
         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);
-        return R.ok().setData(page);
+        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);
     }
 
     @ApiOperation(value = "创建岗位", notes = "根据post对象创建岗位")

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

 package cn.datax.service.system.controller;
 
+import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 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.vo.RoleVo;
 import cn.datax.service.system.mapstruct.RoleMapper;
 import cn.datax.service.system.service.RoleService;
 import cn.hutool.core.util.StrUtil;
@@ -21,6 +23,9 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -73,7 +78,9 @@ public class RoleController extends BaseController {
         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);
-        return R.ok().setData(page);
+        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);
     }
 
     /**

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

 package cn.datax.service.system.controller;
 
+import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 import cn.datax.common.log.annotation.LogAop;
 import cn.datax.common.validate.ValidateGroupForSave;
@@ -8,11 +9,11 @@ import cn.datax.service.system.api.dto.UserDto;
 import cn.datax.service.system.api.dto.UserPasswordDto;
 import cn.datax.service.system.api.entity.UserEntity;
 import cn.datax.service.system.api.query.UserQuery;
+import cn.datax.service.system.api.vo.UserVo;
 import cn.datax.service.system.mapstruct.UserMapper;
 import cn.datax.service.system.service.UserService;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,6 +29,9 @@ import org.springframework.web.bind.annotation.*;
 
 import cn.datax.common.base.BaseController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  前端控制器
@@ -72,8 +76,9 @@ public class UserController extends BaseController {
             });
         }
         IPage<UserEntity> page = userService.page(new Page<>(userQuery.getPageNum(), userQuery.getPageSize()), queryWrapper);
-        System.out.println(JSON.toJSONString(page));
-        return R.ok().setData(page);
+        List<UserVo> collect = page.getRecords().stream().map(userMapper::toVO).collect(Collectors.toList());
+        JsonPage<UserVo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
     }
 
     @ApiOperation(value = "创建用户", notes = "根据user对象创建用户")

datax-tools/datax-tool-codegen/src/main/resources/templates/controller.java.vm

 package ${package.Controller};
 
+import cn.datax.common.core.JsonPage;
 import cn.datax.common.core.R;
 import cn.datax.common.validate.ValidateGroupForSave;
 import cn.datax.common.validate.ValidateGroupForUpdate;
@@ -20,11 +21,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-
 #if(${superControllerClassPackage})
 import ${superControllerClassPackage};
 #end
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * $!{table.comment} 前端控制器
@@ -80,7 +83,9 @@ public class ${table.controllerName} {
     public R getRolePage(${className}Query ${classNameLower}Query) {
         QueryWrapper<${entity}> queryWrapper = new QueryWrapper<>();
         IPage<${entity}> page = ${classNameLower}Service.page(new Page<>(${classNameLower}Query.getPageNum(), ${classNameLower}Query.getPageSize()), queryWrapper);
-        return R.ok().setData(page);
+        List<${className}Vo> collect = page.getRecords().stream().map(${classNameLower}Mapper::toVO).collect(Collectors.toList());
+        JsonPage<${className}Vo> jsonPage = new JsonPage<>(page.getCurrent(), page.getSize(), page.getTotal(), collect);
+        return R.ok().setData(jsonPage);
     }
 
     /**