From bad1ebf54c1d93d0e4ac1079b0baf1f771bfd1b4 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 9 Jun 2022 18:21:21 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8-=E6=95=B0=E6=8D=AE=E8=A1=A8=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/GenerateController.java | 30 ++++++++++++++ .../hxkj/admin/service/IGenerateService.java | 15 +++++++ .../service/impl/GenerateServiceImpl.java | 40 +++++++++++++++++++ .../java/com/hxkj/common/core/PageResult.java | 7 ++-- .../hxkj/common/entity/generate/GenTable.java | 20 ++++++++++ .../mapper/generate/GenTableMapper.java | 23 +++++++++++ 6 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java create mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java create mode 100644 server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java create mode 100644 server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java new file mode 100644 index 00000000..e088594a --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java @@ -0,0 +1,30 @@ +package com.hxkj.admin.controller; + +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.common.core.AjaxResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("api/generate") +public class GenerateController { + + @Resource + IGenerateService iGenerateService; + + @GetMapping("/db") + public Object db(@Validated PageParam pageParam, + @RequestParam Map params) { + List> list = iGenerateService.db(pageParam, params); + return AjaxResult.success(list); + } + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java new file mode 100644 index 00000000..5fae6a3c --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java @@ -0,0 +1,15 @@ +package com.hxkj.admin.service; + +import com.hxkj.admin.validate.PageParam; + +import java.util.List; +import java.util.Map; + +/** + * 代码生成接口服务类 + */ +public interface IGenerateService { + + List> db(PageParam pageParam, Map params); + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java new file mode 100644 index 00000000..76665aff --- /dev/null +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java @@ -0,0 +1,40 @@ +package com.hxkj.admin.service.impl; + +import com.github.pagehelper.PageHelper; +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.mapper.generate.GenTableMapper; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +@Service +public class GenerateServiceImpl implements IGenerateService { + + @Resource + GenTableMapper genTableMapper; + + @Override + public List> db(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + PageHelper.startPage(page, limit); + List> tables = genTableMapper.selectDbTableList(); + + List> list = new LinkedList<>(); + for (Map item : tables) { + Map map = new LinkedHashMap<>(); + map.put("tableName", item.get("table_name")); + map.put("tableComment", item.get("table_comment")); + map.put("createTime", item.get("create_time")); + map.put("updateTime", item.getOrDefault("update_time", "")); + list.add(map); + } + System.out.println(PageResult.pageHelper(tables)); + return list; + } + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java index 626eded8..a8d92d8d 100644 --- a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java +++ b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageInfo; import lombok.Data; -import java.util.HashMap; import java.util.List; @Data @@ -24,7 +23,7 @@ public class PageResult { * @return PageList */ public static PageResult pageHelper(List list) { - PageResult pageResult = new PageResult(); + PageResult pageResult = new PageResult<>(); PageInfo pageInfo = new PageInfo<>(list); pageResult.setCount(pageInfo.getTotal()); pageResult.setPageNo(pageInfo.getPageNum()); @@ -41,7 +40,7 @@ public class PageResult { * @return PageList */ public static PageResult iPageHandle(IPage iPage) { - PageResult pageResult = new PageResult(); + PageResult pageResult = new PageResult<>(); pageResult.setCount(iPage.getTotal()); pageResult.setPageNo((int) iPage.getCurrent()); pageResult.setPageSize((int) iPage.getSize()); @@ -57,7 +56,7 @@ public class PageResult { * @return PageList */ public static PageResult iPageHandle(Long total, Long pageNo, Long size, List lists) { - PageResult pageResult = new PageResult(); + PageResult pageResult = new PageResult<>(); pageResult.setCount(total); pageResult.setPageNo(Math.toIntExact(pageNo)); pageResult.setPageSize(Math.toIntExact(size)); diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java b/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java new file mode 100644 index 00000000..bdc283f4 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java @@ -0,0 +1,20 @@ +package com.hxkj.common.entity.generate; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + * 代码生成业务实体 + */ +@Data +public class GenTable implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + private Integer id; + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java new file mode 100644 index 00000000..548079fb --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java @@ -0,0 +1,23 @@ +package com.hxkj.common.mapper.generate; + +import com.hxkj.common.core.basics.IBaseMapper; +import com.hxkj.common.entity.generate.GenTable; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface GenTableMapper extends IBaseMapper { + + @Select( + "SELECT table_name, table_comment, create_time, update_time " + + "FROM information_schema.tables " + + "WHERE table_schema = (SELECT database()) " + + "AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%' " + + "AND table_name NOT IN (select table_name from ls_gen_table)" + ) + List> selectDbTableList(); + +} From 97dc15dead7dccefe2cd219493d62cf284e4a1f7 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 9 Jun 2022 19:00:36 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8-=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/GenerateController.java | 11 +++++++++- .../hxkj/admin/service/IGenerateService.java | 11 +++++++++- .../service/impl/GenerateServiceImpl.java | 19 +++++++++++++---- .../mapper/generate/GenTableMapper.java | 21 +++++++++++++++---- 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java index e088594a..e4d4791f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java @@ -3,6 +3,7 @@ package com.hxkj.admin.controller; import com.hxkj.admin.service.IGenerateService; import com.hxkj.admin.validate.PageParam; import com.hxkj.common.core.AjaxResult; +import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,10 +21,18 @@ public class GenerateController { @Resource IGenerateService iGenerateService; + /** + * 数据表列表 + * + * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return Object + */ @GetMapping("/db") public Object db(@Validated PageParam pageParam, @RequestParam Map params) { - List> list = iGenerateService.db(pageParam, params); + PageResult> list = iGenerateService.db(pageParam, params); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java index 5fae6a3c..6b7f2225 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java @@ -1,6 +1,7 @@ package com.hxkj.admin.service; import com.hxkj.admin.validate.PageParam; +import com.hxkj.common.core.PageResult; import java.util.List; import java.util.Map; @@ -10,6 +11,14 @@ import java.util.Map; */ public interface IGenerateService { - List> db(PageParam pageParam, Map params); + /** + * 数据表列表 + * + * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult> + */ + PageResult> db(PageParam pageParam, Map params); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java index 76665aff..fa92fc0e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java @@ -10,19 +10,30 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; +/** + * 代码生成器服务实现类 + */ @Service public class GenerateServiceImpl implements IGenerateService { @Resource GenTableMapper genTableMapper; + /** + * 数据表列表 + * + * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult> + */ @Override - public List> db(PageParam pageParam, Map params) { + public PageResult> db(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectDbTableList(); + List> tables = genTableMapper.selectDbTableList(params); List> list = new LinkedList<>(); for (Map item : tables) { @@ -33,8 +44,8 @@ public class GenerateServiceImpl implements IGenerateService { map.put("updateTime", item.getOrDefault("update_time", "")); list.add(map); } - System.out.println(PageResult.pageHelper(tables)); - return list; + + return PageResult.pageHelper(tables, list); } } diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java index 548079fb..0e395511 100644 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java +++ b/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java @@ -11,13 +11,26 @@ import java.util.Map; @Mapper public interface GenTableMapper extends IBaseMapper { - @Select( + /** + * 查询库中的数据表 + * + * @author fzr + * @param params 参数 + * @return List> + */ + @Select({""}) + List> selectDbTableList(Map params); } From 9062c0fde325623dd74fcb9119234c506d0a7945 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 10 Jun 2022 19:02:29 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-admin/pom.xml | 5 + .../admin/controller/GenerateController.java | 39 ---- .../service/impl/GenerateServiceImpl.java | 51 ----- .../LikeAdminApplication.java | 2 +- .../LikeAdminInterceptor.java | 18 +- .../LikeAdminThreadLocal.java | 2 +- .../config/AdminConfig.java | 2 +- .../config/MybatisPlusConfig.java | 2 +- .../config/WebMvcConfig.java | 4 +- .../{admin => generator}/config/aop/Log.java | 2 +- .../config/aop/LogAspect.java | 7 +- .../controller/AlbumController.java | 12 +- .../controller/ArticleController.java | 18 +- .../controller/IndexController.java | 4 +- .../controller/UploadController.java | 8 +- .../controller/monitor/CacheController.java | 4 +- .../controller/monitor/ServerController.java | 9 +- .../controller/setting/BasicsController.java | 6 +- .../system/SystemAdminController.java | 16 +- .../system/SystemDeptController.java | 8 +- .../system/SystemLogController.java | 10 +- .../system/SystemLoginController.java | 6 +- .../system/SystemMenuController.java | 12 +- .../system/SystemPostController.java | 10 +- .../system/SystemRoleController.java | 12 +- .../service/IAlbumService.java | 8 +- .../service/IArticleService.java | 14 +- .../service/IBasicsService.java | 2 +- .../service/IIndexService.java | 2 +- .../service/ISystemAdminService.java | 10 +- .../service/ISystemDeptService.java | 6 +- .../service/ISystemLogServer.java | 8 +- .../service/ISystemLoginService.java | 4 +- .../service/ISystemMenuService.java | 9 +- .../service/ISystemPostService.java | 8 +- .../service/ISystemRoleMenuService.java | 2 +- .../service/ISystemRoleService.java | 8 +- .../service/impl/AlbumServiceImpl.java | 12 +- .../service/impl/ArticleServiceImpl.java | 16 +- .../service/impl/BasicsServiceImpl.java | 4 +- .../service/impl/IndexServiceImpl.java | 4 +- .../service/impl/SystemAdminServiceImpl.java | 22 +- .../service/impl/SystemDeptServiceImpl.java | 8 +- .../service/impl/SystemLogServerImpl.java | 10 +- .../service/impl/SystemLoginServiceImpl.java | 10 +- .../service/impl/SystemMenuServiceImpl.java | 14 +- .../service/impl/SystemPostService.java | 10 +- .../impl/SystemRoleMenuServiceImpl.java | 6 +- .../service/impl/SystemRoleServiceImpl.java | 14 +- .../validate/AlbumParam.java | 2 +- .../validate/PageParam.java | 2 +- .../validate/article/ArticleParam.java | 3 +- .../validate/article/CategoryParam.java | 2 +- .../validate/system/SystemAdminParam.java | 2 +- .../validate/system/SystemDeptParam.java | 2 +- .../validate/system/SystemLoginParam.java | 2 +- .../validate/system/SystemMenuParam.java | 3 +- .../validate/system/SystemPostParam.java | 2 +- .../validate/system/SystemRoleParam.java | 2 +- .../vo/album/AlbumCateVo.java | 2 +- .../vo/album/AlbumVo.java | 2 +- .../vo/article/ArticleDetailVo.java | 2 +- .../vo/article/ArticleListVo.java | 2 +- .../vo/article/CategoryVo.java | 2 +- .../vo/system/LogLoginVo.java | 2 +- .../vo/system/LogOperateVo.java | 2 +- .../vo/system/SystemAdminVo.java | 2 +- .../vo/system/SystemAuthVo.java | 2 +- .../vo/system/SystemDeptVo.java | 2 +- .../vo/system/SystemMenuVo.java | 2 +- .../vo/system/SystemPostVo.java | 2 +- .../vo/system/SystemRoleVo.java | 2 +- .../vo/system/SystemSelfVo.java | 2 +- .../main/resources/vm/java/controller.java.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../hxkj/common/constant/GenConstants.java | 96 +++++++++ .../hxkj/common/entity/generate/GenTable.java | 20 -- .../mapper/generate/GenTableMapper.java | 36 ---- server/like-generator/pom.xml | 37 ++++ .../generator/controller/GenController.java | 59 ++++++ .../com/hxkj/generator/entity/GenTable.java | 36 ++++ .../hxkj/generator/entity/GenTableColumn.java | 39 ++++ .../mapper/GenTableColumnMapper.java | 12 ++ .../hxkj/generator/mapper/GenTableMapper.java | 75 +++++++ .../generator}/service/IGenerateService.java | 17 +- .../service/impl/GenerateServiceImpl.java | 200 ++++++++++++++++++ .../java/com/hxkj/generator/util/GenUtil.java | 135 ++++++++++++ .../com/hxkj/generator/util/VelocityUtil.java | 86 ++++++++ .../hxkj/generator/validate/PageParam.java | 28 +++ .../src/main/resources/vm/controller.java.vm | 1 + .../main/resources/vm/java/controller.java.vm | 1 + .../src/main/resources/vm/vue/index.vue.vm | 0 server/pom.xml | 1 + 93 files changed, 1036 insertions(+), 373 deletions(-) delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java delete mode 100644 server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/LikeAdminApplication.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/LikeAdminInterceptor.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/LikeAdminThreadLocal.java (98%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/config/AdminConfig.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/config/MybatisPlusConfig.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/config/WebMvcConfig.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/config/aop/Log.java (85%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/config/aop/LogAspect.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/AlbumController.java (93%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/ArticleController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/IndexController.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/UploadController.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/monitor/CacheController.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/monitor/ServerController.java (77%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/setting/BasicsController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemAdminController.java (89%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemDeptController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemLogController.java (85%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemLoginController.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemMenuController.java (88%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemPostController.java (90%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/controller/system/SystemRoleController.java (88%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/IAlbumService.java (90%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/IArticleService.java (84%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/IBasicsService.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/IIndexService.java (89%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemAdminService.java (87%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemDeptService.java (87%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemLogServer.java (78%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemLoginService.java (80%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemMenuService.java (82%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemPostService.java (85%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemRoleMenuService.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/ISystemRoleService.java (83%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/AlbumServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/ArticleServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/BasicsServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/IndexServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemAdminServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemDeptServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemLogServerImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemLoginServiceImpl.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemMenuServiceImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemPostService.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemRoleMenuServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/service/impl/SystemRoleServiceImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/AlbumParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/PageParam.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/article/ArticleParam.java (95%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/article/CategoryParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemAdminParam.java (98%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemDeptParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemLoginParam.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemMenuParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemPostParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/validate/system/SystemRoleParam.java (96%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/album/AlbumCateVo.java (89%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/album/AlbumVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/article/ArticleDetailVo.java (92%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/article/ArticleListVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/article/CategoryVo.java (88%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/LogLoginVo.java (90%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/LogOperateVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemAdminVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemAuthVo.java (86%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemDeptVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemMenuVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemPostVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemRoleVo.java (92%) rename server/like-admin/src/main/java/com/hxkj/{admin => generator}/vo/system/SystemSelfVo.java (80%) create mode 100644 server/like-admin/src/main/resources/vm/java/controller.java.vm create mode 100644 server/like-admin/src/main/resources/vm/vue/index.vue.vm create mode 100644 server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java delete mode 100644 server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java delete mode 100644 server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java create mode 100644 server/like-generator/pom.xml create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java rename server/{like-admin/src/main/java/com/hxkj/admin => like-generator/src/main/java/com/hxkj/generator}/service/IGenerateService.java (60%) create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java create mode 100644 server/like-generator/src/main/resources/vm/controller.java.vm create mode 100644 server/like-generator/src/main/resources/vm/java/controller.java.vm create mode 100644 server/like-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/server/like-admin/pom.xml b/server/like-admin/pom.xml index 518577ef..1dd6979b 100644 --- a/server/like-admin/pom.xml +++ b/server/like-admin/pom.xml @@ -22,6 +22,11 @@ org.hxkj like-common + + org.hxkj + like-generator + 1.0.0 + diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java deleted file mode 100644 index e4d4791f..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/GenerateController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hxkj.admin.controller; - -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.common.core.AjaxResult; -import com.hxkj.common.core.PageResult; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("api/generate") -public class GenerateController { - - @Resource - IGenerateService iGenerateService; - - /** - * 数据表列表 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return Object - */ - @GetMapping("/db") - public Object db(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult> list = iGenerateService.db(pageParam, params); - return AjaxResult.success(list); - } - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java deleted file mode 100644 index fa92fc0e..00000000 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hxkj.admin.service.impl; - -import com.github.pagehelper.PageHelper; -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.common.core.PageResult; -import com.hxkj.common.mapper.generate.GenTableMapper; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.*; - -/** - * 代码生成器服务实现类 - */ -@Service -public class GenerateServiceImpl implements IGenerateService { - - @Resource - GenTableMapper genTableMapper; - - /** - * 数据表列表 - * - * @author fzr - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return PageResult> - */ - @Override - public PageResult> db(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); - - PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectDbTableList(params); - - List> list = new LinkedList<>(); - for (Map item : tables) { - Map map = new LinkedHashMap<>(); - map.put("tableName", item.get("table_name")); - map.put("tableComment", item.get("table_comment")); - map.put("createTime", item.get("create_time")); - map.put("updateTime", item.getOrDefault("update_time", "")); - list.add(map); - } - - return PageResult.pageHelper(tables, list); - } - -} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java rename to server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java index f8c23949..21ebf84e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java @@ -1,4 +1,4 @@ -package com.hxkj.admin; +package com.hxkj.generator; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java rename to server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java index 12ccbfd3..41164ff0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java @@ -1,10 +1,10 @@ -package com.hxkj.admin; +package com.hxkj.generator; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemAdminService; +import com.hxkj.generator.service.ISystemRoleMenuService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.HttpEnum; import com.hxkj.common.utils.RedisUtil; @@ -36,11 +36,11 @@ public class LikeAdminInterceptor implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { // 404拦截 response.setContentType("application/json;charset=utf-8"); - if (response.getStatus() == 404) { - AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg()); - response.getWriter().print(JSON.toJSONString(result)); - return false; - } +// if (response.getStatus() == 404) { +// AjaxResult result = AjaxResult.failed(HttpEnum.REQUEST_404_ERROR.getCode(), HttpEnum.REQUEST_404_ERROR.getMsg()); +// response.getWriter().print(JSON.toJSONString(result)); +// return false; +// } // 判断请求接口 if (!(handler instanceof HandlerMethod)) { diff --git a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java rename to server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java index 77ff28d2..6bff4fde 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java @@ -1,4 +1,4 @@ -package com.hxkj.admin; +package com.hxkj.generator; import java.util.LinkedHashMap; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java rename to server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java index a3d19d33..a81e0cee 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.config; +package com.hxkj.generator.config; /** * 后台公共配置 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java b/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java rename to server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java index 08026f47..4a5c8a38 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.config; +package com.hxkj.generator.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java b/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java rename to server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java index 1444be62..8d7a1602 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.config; +package com.hxkj.generator.config; -import com.hxkj.admin.LikeAdminInterceptor; +import com.hxkj.generator.LikeAdminInterceptor; import com.hxkj.common.config.GlobalConfig; import com.hxkj.common.utils.YmlUtil; import org.springframework.context.annotation.Configuration; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java b/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java rename to server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java index 979e92a8..618b84a9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.config.aop; +package com.hxkj.generator.config.aop; import java.lang.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java rename to server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java index 2cf2ace6..7d4c86b3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java @@ -1,10 +1,9 @@ -package com.hxkj.admin.config.aop; +package com.hxkj.generator.config.aop; import com.alibaba.fastjson.JSON; -import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.generator.LikeAdminThreadLocal; import com.hxkj.common.entity.system.SystemLogOperate; import com.hxkj.common.mapper.system.SystemLogOperateMapper; -import com.hxkj.common.utils.HttpUtil; import com.hxkj.common.utils.IpUtil; import com.hxkj.common.utils.RequestUtil; import org.aspectj.lang.JoinPoint; @@ -37,7 +36,7 @@ public class LogAspect { /** * 声明切面点拦截那些类 */ - @Pointcut("@annotation(com.hxkj.admin.config.aop.Log)") + @Pointcut("@annotation(com.hxkj.generator.config.aop.Log)") private void pointCutMethodController() {} /** diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java index 826742d0..53bf0d46 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IAlbumService; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.IAlbumService; +import com.hxkj.generator.validate.AlbumParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.album.AlbumVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.ArrayUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java index 4c703705..b221082a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java @@ -1,13 +1,13 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IArticleService; -import com.hxkj.admin.validate.article.CategoryParam; -import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.IArticleService; +import com.hxkj.generator.validate.article.CategoryParam; +import com.hxkj.generator.validate.article.ArticleParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.article.ArticleDetailVo; +import com.hxkj.generator.vo.article.ArticleListVo; +import com.hxkj.generator.vo.article.CategoryVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java index 21f8a5e4..43db587f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; -import com.hxkj.admin.service.IIndexService; +import com.hxkj.generator.service.IIndexService; import com.hxkj.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java index 152ab16b..6ee238bd 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IAlbumService; +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.IAlbumService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.AlbumEnum; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java index 73cb857a..dee12f0f 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.controller.monitor; +package com.hxkj.generator.controller.monitor; -import com.hxkj.admin.config.aop.Log; +import com.hxkj.generator.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.utils.StringUtil; import org.springframework.data.redis.connection.RedisServerCommands; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java similarity index 77% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java index 61f27741..e8e22115 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java @@ -1,17 +1,12 @@ -package com.hxkj.admin.controller.monitor; +package com.hxkj.generator.controller.monitor; -import com.hxkj.admin.config.aop.Log; +import com.hxkj.generator.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.ServerResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - /** * 服务监控管理 */ diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java index 3ae2cfff..eac566e4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.controller.setting; +package com.hxkj.generator.controller.setting; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.IBasicsService; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.IBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java index ca125b9f..0345a3da 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java @@ -1,12 +1,12 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.ISystemAdminService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemAdminParam; +import com.hxkj.generator.vo.system.SystemAdminVo; +import com.hxkj.generator.vo.system.SystemSelfVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java index 85e9162a..fccd88fe 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.service.ISystemDeptService; -import com.hxkj.admin.validate.system.SystemDeptParam; -import com.hxkj.admin.vo.system.SystemDeptVo; +import com.hxkj.generator.service.ISystemDeptService; +import com.hxkj.generator.validate.system.SystemDeptParam; +import com.hxkj.generator.vo.system.SystemDeptVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java index 549de132..8c077e74 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; -import com.hxkj.admin.service.ISystemLogServer; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.system.LogLoginVo; -import com.hxkj.admin.vo.system.LogOperateVo; +import com.hxkj.generator.service.ISystemLogServer; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.system.LogLoginVo; +import com.hxkj.generator.vo.system.LogOperateVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java index 817b41b3..8e667ffb 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; -import com.hxkj.admin.service.ISystemLoginService; -import com.hxkj.admin.validate.system.SystemLoginParam; +import com.hxkj.generator.service.ISystemLoginService; +import com.hxkj.generator.validate.system.SystemLoginParam; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.exception.LoginException; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java index 4539e97d..642298ab 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemMenuService; -import com.hxkj.admin.validate.system.SystemMenuParam; -import com.hxkj.admin.vo.system.SystemMenuVo; +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.ISystemMenuService; +import com.hxkj.generator.validate.system.SystemMenuParam; +import com.hxkj.generator.vo.system.SystemMenuVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java index a3a6ec17..ef253d62 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; -import com.hxkj.admin.service.ISystemPostService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemPostParam; -import com.hxkj.admin.vo.system.SystemPostVo; +import com.hxkj.generator.service.ISystemPostService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemPostParam; +import com.hxkj.generator.vo.system.SystemPostVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java rename to server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java index fcff8669..764a42f9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java @@ -1,10 +1,10 @@ -package com.hxkj.admin.controller.system; +package com.hxkj.generator.controller.system; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemRoleParam; -import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.ISystemRoleService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemRoleParam; +import com.hxkj.generator.vo.system.SystemRoleVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java index 09257fb2..eb8127fc 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.generator.validate.AlbumParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java similarity index 84% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java index 7ad505ac..f289041b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.article.CategoryParam; -import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.article.CategoryParam; +import com.hxkj.generator.validate.article.ArticleParam; +import com.hxkj.generator.vo.article.ArticleDetailVo; +import com.hxkj.generator.vo.article.ArticleListVo; +import com.hxkj.generator.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java index 6ca9660d..d84e9641 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java index eebf56db..339eab32 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java index 8047ae2f..8d5aaa9b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemAdminParam; +import com.hxkj.generator.vo.system.SystemAdminVo; +import com.hxkj.generator.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java index f0291401..ed87ce68 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.validate.system.SystemDeptParam; -import com.hxkj.admin.vo.system.SystemDeptVo; +import com.hxkj.generator.validate.system.SystemDeptParam; +import com.hxkj.generator.vo.system.SystemDeptVo; import java.util.List; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java similarity index 78% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java index d7d45409..a121310a 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.system.LogLoginVo; -import com.hxkj.admin.vo.system.LogOperateVo; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.system.LogLoginVo; +import com.hxkj.generator.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java index 5aa1c7b5..dc2a61a5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.system.SystemLoginParam; +import com.hxkj.generator.validate.system.SystemLoginParam; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java similarity index 82% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java index 2d8fd7e2..9f4921a3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java @@ -1,11 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.admin.validate.system.SystemMenuParam; -import com.hxkj.admin.vo.system.SystemAuthVo; -import com.hxkj.admin.vo.system.SystemMenuVo; - -import java.util.List; +import com.hxkj.generator.validate.system.SystemMenuParam; +import com.hxkj.generator.vo.system.SystemMenuVo; /** * 系统菜单服务接口类 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java index 4224dc53..6efb0340 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemPostParam; -import com.hxkj.admin.vo.system.SystemPostVo; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemPostParam; +import com.hxkj.generator.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java index 1fa03f7f..c40a5a19 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java similarity index 83% rename from server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java index 96451a6a..1689b6b4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemRoleParam; -import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemRoleParam; +import com.hxkj.generator.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java index c3acf31f..a62394f5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.IAlbumService; -import com.hxkj.admin.validate.AlbumParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.album.AlbumCateVo; -import com.hxkj.admin.vo.album.AlbumVo; +import com.hxkj.generator.service.IAlbumService; +import com.hxkj.generator.validate.AlbumParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.album.AlbumCateVo; +import com.hxkj.generator.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Album; import com.hxkj.common.entity.AlbumCate; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java index f95d9022..82862b29 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java @@ -1,16 +1,16 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.service.IArticleService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.article.CategoryParam; -import com.hxkj.admin.validate.article.ArticleParam; -import com.hxkj.admin.vo.article.ArticleDetailVo; -import com.hxkj.admin.vo.article.ArticleListVo; -import com.hxkj.admin.vo.article.CategoryVo; +import com.hxkj.generator.service.IArticleService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.article.CategoryParam; +import com.hxkj.generator.validate.article.ArticleParam; +import com.hxkj.generator.vo.article.ArticleDetailVo; +import com.hxkj.generator.vo.article.ArticleListVo; +import com.hxkj.generator.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Article; import com.hxkj.common.entity.ArticleCategory; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java index 1aae9a21..26d61693 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java @@ -1,6 +1,6 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; -import com.hxkj.admin.service.IBasicsService; +import com.hxkj.generator.service.IBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java index af08b64b..1a76cde5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.admin.service.IIndexService; +import com.hxkj.generator.service.IIndexService; import com.hxkj.common.entity.Article; import com.hxkj.common.mapper.ArticleMapper; import com.hxkj.common.utils.ConfigUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java index 11071690..0b4101e1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemRoleVo; -import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemAdminService; +import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.generator.service.ISystemRoleService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemAdminParam; +import com.hxkj.generator.vo.system.SystemAdminVo; +import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.generator.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemMenu; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java index f4c1ced7..76c07401 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java @@ -1,11 +1,11 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.service.ISystemDeptService; -import com.hxkj.admin.validate.system.SystemDeptParam; -import com.hxkj.admin.vo.system.SystemDeptVo; +import com.hxkj.generator.service.ISystemDeptService; +import com.hxkj.generator.validate.system.SystemDeptParam; +import com.hxkj.generator.vo.system.SystemDeptVo; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemDept; import com.hxkj.common.mapper.system.SystemAdminMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java index e4fc3a3d..931f6cd5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java @@ -1,13 +1,13 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.service.ISystemLogServer; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.system.LogLoginVo; -import com.hxkj.admin.vo.system.LogOperateVo; +import com.hxkj.generator.service.ISystemLogServer; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.system.LogLoginVo; +import com.hxkj.generator.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.entity.system.SystemLogOperate; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java index bc1fe9d6..0d04bd7e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemLoginService; -import com.hxkj.admin.validate.system.SystemLoginParam; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemAdminService; +import com.hxkj.generator.service.ISystemLoginService; +import com.hxkj.generator.validate.system.SystemLoginParam; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.enums.HttpEnum; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java index 6f766f13..b7c6a0cd 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java @@ -1,14 +1,14 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemMenuService; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.validate.system.SystemMenuParam; -import com.hxkj.admin.vo.system.SystemMenuVo; +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemMenuService; +import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.generator.validate.system.SystemMenuParam; +import com.hxkj.generator.vo.system.SystemMenuVo; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; import com.hxkj.common.utils.*; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java index b9770414..d17350db 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java @@ -1,13 +1,13 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.service.ISystemPostService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemPostParam; -import com.hxkj.admin.vo.system.SystemPostVo; +import com.hxkj.generator.service.ISystemPostService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemPostParam; +import com.hxkj.generator.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemPost; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java index f91a1200..422117ca 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemRoleMenuService; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.entity.system.SystemRoleMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java index 08e981a3..262726a4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemRoleParam; -import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.generator.config.AdminConfig; +import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.generator.service.ISystemRoleService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemRoleParam; +import com.hxkj.generator.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemRole; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java index 0900576d..cca10286 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java index 405a2428..a175e6a8 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java index f93858e8..c294e7c3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java @@ -1,6 +1,5 @@ -package com.hxkj.admin.validate.article; +package com.hxkj.generator.validate.article; -import com.hxkj.admin.validate.system.SystemAdminParam; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java index 5965b8a7..e0cfc593 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.article; +package com.hxkj.generator.validate.article; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java index ce5abfb7..9a07fec9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java index c6a866ce..8c4e8f36 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java index 90b412fb..948fc335 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java index c29b8cf3..638541ca 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; @@ -9,7 +9,6 @@ import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java index 77c18b4a..90f1ae4e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java rename to server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java index 8952d480..12385f77 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package com.hxkj.generator.validate.system; import com.hxkj.common.validator.annotation.IDMust; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java index 000ca700..cc63b5ec 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.album; +package com.hxkj.generator.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java index 53dcb2ed..12deb077 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.album; +package com.hxkj.generator.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java index 4af833ee..dee859ac 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.generator.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java index 99361ab3..5d251160 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.generator.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java index 76731fe8..3bef1641 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.article; +package com.hxkj.generator.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java index 04dd8406..924e4885 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java index 320734f4..c65f8f69 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java index 9d91caae..fb457381 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java similarity index 86% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java index 97b76f1a..37bbf59c 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java index 405b06a9..cda4a397 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java index 6c1ca055..6543da39 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java index 9a894450..bd5efe1e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java index fb9593bb..08bc1c93 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java rename to server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java index 1915a32e..1297a6aa 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java +++ b/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.system; +package com.hxkj.generator.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/resources/vm/java/controller.java.vm b/server/like-admin/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-admin/src/main/resources/vm/vue/index.vue.vm b/server/like-admin/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java new file mode 100644 index 00000000..e7a6d3c3 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java @@ -0,0 +1,96 @@ +package com.hxkj.common.constant; + +public class GenConstants { + + /** 单表（增删改查） */ + public static final String TPL_CRUD = "crud"; + + /** 树表（增删改查） */ + public static final String TPL_TREE = "tree"; + + /** 主子表（增删改查） */ + public static final String TPL_SUB = "sub"; + + /** 树编码字段 */ + public static final String TREE_CODE = "treeCode"; + + /** 树父编码字段 */ + public static final String TREE_PARENT_CODE = "treeParentCode"; + + /** 树名称字段 */ + public static final String TREE_NAME = "treeName"; + + /** 数据库字符串类型 */ + public static final String[] COLUMN_TYPE_STR = {"char", "varchar", "nvarchar", "varchar2"}; + + /** 数据库文本类型 */ + public static final String[] COLUMN_TYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"}; + + /** 数据库时间类型 */ + public static final String[] COLUMN_TYPE_TIME = {"datetime", "time", "date", "timestamp"}; + + /** 数据库数字类型 */ + public static final String[] COLUMN_TYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", + "number", "integer", "bit", "bigint", "float", "double", "decimal"}; + + /** 页面不需要编辑字段 */ + public static final String[] COLUMN_NAME_NOT_EDIT = {"id", "create_time", "update_time", "delete_time"}; + + /** 页面不需要列表字段 */ + public static final String[] COLUMN_NAME_NOT_LIST = {"id", "create_time", "update_time", "delete_time"}; + + /** 页面不需要查询字段 */ + public static final String[] COLUMN_NAME_NOT_QUERY = {"id", "create_time", "update_time", "delete_time"}; + + /** 文本框 */ + public static final String HTML_INPUT = "input"; + + /** 文本域 */ + public static final String HTML_TEXTAREA = "textarea"; + + /** 下拉框 */ + public static final String HTML_SELECT = "select"; + + /** 单选框 */ + public static final String HTML_RADIO = "radio"; + + /** 复选框 */ + public static final String HTML_CHECKBOX = "checkbox"; + + /** 日期控件 */ + public static final String HTML_DATETIME = "datetime"; + + /** 图片上传控件 */ + public static final String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** 文件上传控件 */ + public static final String HTML_FILE_UPLOAD = "fileUpload"; + + /** 富文本控件 */ + public static final String HTML_EDITOR = "editor"; + + /** 字符串类型 */ + public static final String TYPE_STRING = "String"; + + /** 整型 */ + public static final String TYPE_INTEGER = "Integer"; + + /** 长整型 */ + public static final String TYPE_LONG = "Long"; + + /** 高精度计算类型 */ + public static final String TYPE_BIG_DECIMAL = "BigDecimal"; + + /** 时间类型 */ + public static final String TYPE_DATE = "Date"; + + /** 模糊查询 */ + public static final String QUERY_LIKE = "LIKE"; + + /** 相等查询 */ + public static final String QUERY_EQ = "EQ"; + + /** 需要 */ + public static final Integer REQUIRE = 1; + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java b/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java deleted file mode 100644 index bdc283f4..00000000 --- a/server/like-common/src/main/java/com/hxkj/common/entity/generate/GenTable.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hxkj.common.entity.generate; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.io.Serializable; - -/** - * 代码生成业务实体 - */ -@Data -public class GenTable implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value="id", type= IdType.AUTO) - private Integer id; - -} diff --git a/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java b/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java deleted file mode 100644 index 0e395511..00000000 --- a/server/like-common/src/main/java/com/hxkj/common/mapper/generate/GenTableMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hxkj.common.mapper.generate; - -import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.generate.GenTable; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; -import java.util.Map; - -@Mapper -public interface GenTableMapper extends IBaseMapper { - - /** - * 查询库中的数据表 - * - * @author fzr - * @param params 参数 - * @return List> - */ - @Select({""}) - List> selectDbTableList(Map params); - -} diff --git a/server/like-generator/pom.xml b/server/like-generator/pom.xml new file mode 100644 index 00000000..252ed9d9 --- /dev/null +++ b/server/like-generator/pom.xml @@ -0,0 +1,37 @@ + + + + + likeadmin-java + org.hxkj + 1.0.0 + + + 4.0.0 + like-generator + + + + + + org.hxkj + like-common + + + + commons-collections + commons-collections + 3.2.2 + + + + + org.apache.velocity + velocity-engine-core + 2.3 + + + + \ No newline at end of file diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java new file mode 100644 index 00000000..09fac4e1 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -0,0 +1,59 @@ +package com.hxkj.generator.controller; + +import com.hxkj.common.core.AjaxResult; +import com.hxkj.common.core.PageResult; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.validate.PageParam; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +@RestController +@RequestMapping("/api/gen") +public class GenController { + + @Resource + IGenerateService iGenerateService; + + /** + * 数据表列表 + * + * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return Object + */ + @GetMapping("/db") + public Object db(@Validated PageParam pageParam, + @RequestParam Map params) { + PageResult> list = iGenerateService.db(pageParam, params); + return AjaxResult.success(list); + } + + /** + * 导入数据表 + * + * @param tables 参数 + * @return Object + */ + @PostMapping("/importTable") + public Object importTable(String tables) { + String[] tableNames = tables.split(","); + iGenerateService.importTable(tableNames); + return AjaxResult.success(); + } + + /** + * 预览代码 + * + * @return Object + */ + @GetMapping("/previewCode") + public Object previewCode() { + iGenerateService.previewCode(); + return null; + } + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java new file mode 100644 index 00000000..3baad489 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -0,0 +1,36 @@ +package com.hxkj.generator.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + * 代码生成业务实体 + */ +@Data +public class GenTable implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + private Integer id; + private String tableName; + private String tableComment; + private String subTableName; + private String subTableFk; + private String entityName; + private String packageName; + private String moduleName; + private String businessName; + private String functionName; + private String functionAuthor; + private String genTpl; + private String genType; + private String genPath; + private Long createTime; + private Long updateTime; + private Long deleteTime; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java new file mode 100644 index 00000000..1b39cc4a --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -0,0 +1,39 @@ +package com.hxkj.generator.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + * 代码生成表列实体类 + */ +@Data +public class GenTableColumn implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value="id", type= IdType.AUTO) + private Integer id; + private Integer tableId; + private String columnName; + private String columnComment; + private String columnType; + private String javaType; + private String javaField; + private Integer isPk; + private Integer isIncrement; + private Integer isRequired; + private Integer isInsert; + private Integer isEdit; + private Integer isList; + private Integer isQuery; + private String queryType; + private String htmlType; + private String dictType; + private Integer sort; + private Long createTime; + private Long updateTime; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java new file mode 100644 index 00000000..218db9e2 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java @@ -0,0 +1,12 @@ +package com.hxkj.generator.mapper; + +import com.hxkj.common.core.basics.IBaseMapper; +import com.hxkj.generator.entity.GenTableColumn; +import org.apache.ibatis.annotations.Mapper; + +/** + * 代码生成表列 + */ +@Mapper +public interface GenTableColumnMapper extends IBaseMapper { +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java new file mode 100644 index 00000000..b0d3376a --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -0,0 +1,75 @@ +package com.hxkj.generator.mapper; + +import com.hxkj.common.core.basics.IBaseMapper; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * 代码生成表 + */ +@Mapper +public interface GenTableMapper extends IBaseMapper { + + /** + * 查询库中的数据表 + * + * @author fzr + * @param params 参数 + * @return List> + */ + @Select({""}) + List> selectDbTableList(Map params); + + /** + * 根据表名集查询表 + * + * @author fzr + * @param tableNames 表名集 + * @return List> + */ + @Select({""}) + List> selectDbTableListByNames(String[] tableNames); + + /** + * 根据表名查询列信息 + * + * @author fzr + * @param tableName 表名 + * @return List + */ + @Select({""}) + List selectDbTableColumnsByName(String tableName); + +} diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java similarity index 60% rename from server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java rename to server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index 6b7f2225..fa1f66da 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -1,9 +1,8 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; -import com.hxkj.admin.validate.PageParam; import com.hxkj.common.core.PageResult; +import com.hxkj.generator.validate.PageParam; -import java.util.List; import java.util.Map; /** @@ -12,7 +11,7 @@ import java.util.Map; public interface IGenerateService { /** - * 数据表列表 + * 表列表 * * @author fzr * @param pageParam 分页参数 @@ -21,4 +20,14 @@ public interface IGenerateService { */ PageResult> db(PageParam pageParam, Map params); + /** + * 导入表 + * + * @author fzr + * @param tableNames 参数 + */ + void importTable(String[] tableNames); + + Object previewCode(); + } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java new file mode 100644 index 00000000..25136fa9 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -0,0 +1,200 @@ +package com.hxkj.generator.service.impl; + +import com.github.pagehelper.PageHelper; +import com.hxkj.common.constant.GenConstants; +import com.hxkj.common.core.PageResult; + +import com.hxkj.common.utils.StringUtil; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.mapper.GenTableColumnMapper; +import com.hxkj.generator.mapper.GenTableMapper; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.util.GenUtil; +import com.hxkj.generator.validate.PageParam; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.StringWriter; +import java.util.*; + +/** + * 代码生成器服务实现类 + */ +@Service +public class GenerateServiceImpl implements IGenerateService { + + @Resource + GenTableMapper genTableMapper; + + @Resource + GenTableColumnMapper genTableColumnMapper; + + /** + * 数据表列表 + * + * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult> + */ + @Override + public PageResult> db(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + PageHelper.startPage(page, limit); + List> tables = genTableMapper.selectDbTableList(params); + + List> list = new LinkedList<>(); + for (Map item : tables) { + Map map = new LinkedHashMap<>(); + map.put("tableName", item.get("table_name")); + map.put("tableComment", item.get("table_comment")); + map.put("createTime", item.get("create_time")); + map.put("updateTime", item.getOrDefault("update_time", "")); + list.add(map); + } + + return PageResult.pageHelper(tables, list); + } + + @Override + public void importTable(String[] tableNames) { + List> tables = genTableMapper.selectDbTableListByNames(tableNames); + + for (Map map : tables) { + // 生成表信息 + String tableName = map.get("table_name"); + String tableDesc = map.get("table_comment"); + GenTable table = new GenTable(); + table.setTableName(tableName); + table.setTableComment(tableDesc); + table.setEntityName(GenUtil.toClassName(tableName)); + table.setPackageName("com.hxkj.admin"); + table.setModuleName(GenUtil.toModuleName("com.hxkj.admin")); + table.setBusinessName(GenUtil.toBusinessName(tableName)); + table.setFunctionName(GenUtil.replaceText(tableDesc)); + table.setFunctionAuthor("likeAdmin"); + table.setCreateTime(System.currentTimeMillis() / 1000); + table.setUpdateTime(System.currentTimeMillis() / 1000); + int row = genTableMapper.insert(table); + + // 生成列信息 + if (row > 0) { + List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); + for (GenTableColumn column : genTableColumns) { + String columnType = GenUtil.getDbType(column.getColumnType()); + String columnName = column.getColumnName(); + + column.setTableId(table.getId()); + column.setUpdateTime(table.getUpdateTime()); + column.setCreateTime(table.getCreateTime()); + column.setJavaField(StringUtil.toCamelCase(columnName)); + column.setJavaType("String"); + column.setQueryType("EQ"); + column.setIsInsert(GenConstants.REQUIRE); + + if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || + GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { + Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) + ? GenConstants.HTML_TEXTAREA + : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); + } + + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } + + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { + column.setHtmlType(GenConstants.HTML_INPUT); + String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { + column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { + column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 + } else { + column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + } + } + + // 编辑字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + column.setIsEdit(GenConstants.REQUIRE); + } + + // 列表字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { + column.setIsList(GenConstants.REQUIRE); + } + + // 查询字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { + column.setIsQuery(GenConstants.REQUIRE); + } + + // 查询字段类型 + if (StringUtil.endsWithIgnoreCase(columnName, "name")) { + column.setQueryType(GenConstants.QUERY_LIKE); + } + + // 根据字段设置 + if (StringUtil.endsWithIgnoreCase(columnName, "status")) { + // 状态字段设置单选框 + column.setHtmlType(GenConstants.HTML_RADIO); + } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || + StringUtil.endsWithIgnoreCase(columnName, "sex")) { + // 类型&性别字段设置下拉框 + column.setHtmlType(GenConstants.HTML_SELECT); + } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { + // 图片字段设置图片上传控件 + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { + // 文件字段设置文件上传控件 + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { + // 内容字段设置富文本控件 + column.setHtmlType(GenConstants.HTML_EDITOR); + } + + genTableColumnMapper.insert(column); + } + } + } + } + + @Override + public Object previewCode() { + try{ + Velocity.init(getDefaultProp()); + VelocityContext context = new VelocityContext(); + context.put("hello", "Hello World!"); + StringWriter w = new StringWriter(); + Template t = Velocity.getTemplate("vm/java/controller.java.vm"); + t.merge(context, w); + System.out.println("template:" + w); + }catch (Exception e){ + e.printStackTrace(); + } + return null; + } + + public Properties getDefaultProp(){ + Properties prop = new Properties(); +// prop.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); +// prop.setProperty(RuntimeConstants.RESOURCE_LOADER_CLASS, "classpath"); + prop.setProperty(RuntimeConstants.RESOURCE_LOADERS, "classpath"); +// prop.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); + prop.setProperty("resource.loader.file.class", ClasspathResourceLoader.class.getName()); + return prop; + } + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java new file mode 100644 index 00000000..2dc8679c --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -0,0 +1,135 @@ +package com.hxkj.generator.util; + +import com.hxkj.common.utils.StringUtil; +import org.apache.commons.lang3.RegExUtils; + +import java.util.Arrays; + +public class GenUtil { + + /** + * 转模块名 + * + * @author fzr + * @param packageName 包名 + * @return 模块名 + */ + public static String toModuleName(String packageName) + { + int lastIndex = packageName.lastIndexOf("."); + int nameLength = packageName.length(); + return StringUtil.substring(packageName, lastIndex + 1, nameLength); + } + + /** + * 转业务名 + * + * @author fzr + * @param tableName 表名 + * @return 业务名 + */ + public static String toBusinessName(String tableName) + { + int lastIndex = tableName.lastIndexOf("_"); + int nameLength = tableName.length(); + return StringUtil.substring(tableName, lastIndex + 1, nameLength); + } + + /** + * 表名转Java类名 + * + * @author fzr + * @param tableName 表名称 + * @return 类名 + */ + public static String toClassName(String tableName) + { + String tablePrefix = "ls_"; + if (StringUtil.isNotEmpty(tablePrefix)) { + String[] searchList = StringUtil.split(tablePrefix, ","); + tableName = replaceFirst(tableName, searchList); + } + return StringUtil.convertToCamelCase(tableName); + } + + /** + * 批量替换前缀 + * + * @author fzr + * @param replaceVal 替换值 + * @param searchList 替换列表 + * @return String + */ + public static String replaceFirst(String replaceVal, String[] searchList) + { + String text = replaceVal; + for (String searchString : searchList) { + if (replaceVal.startsWith(searchString)) { + text = replaceVal.replaceFirst(searchString, ""); + break; + } + } + return text; + } + + /** + * 关键字替换 + * + * @author fzr + * @param text 需要被替换的名字 + * @return 替换后的名字 + */ + public static String replaceText(String text) + { + return RegExUtils.replaceAll(text, "(?:表)", ""); + } + + /** + * 校验数组是否包含指定值 + * + * @author fzr + * @param arr 数组 + * @param targetValue 值 + * @return 是否包含 + */ + public static boolean isArraysContains(String[] arr, String targetValue) + { + return Arrays.asList(arr).contains(targetValue); + } + + /** + * 获取数据库类型字段 + * + * @author fzr + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static String getDbType(String columnType) + { + if (StringUtil.indexOf(columnType, "(") > 0) { + return StringUtil.substringBefore(columnType, "("); + } + else { + return columnType; + } + } + + /** + * 获取字段长度 + * + * @author fzr + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static Integer getColumnLength(String columnType) + { + if (StringUtil.indexOf(columnType, "(") > 0) { + String length = StringUtil.substringBetween(columnType, "(", ")"); + return Integer.valueOf(length); + } + else { + return 0; + } + } + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java new file mode 100644 index 00000000..1883cf1b --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -0,0 +1,86 @@ +package com.hxkj.generator.util; + +import com.hxkj.common.utils.StringUtil; +import com.hxkj.generator.entity.GenTable; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +public class VelocityUtil { + + /** + * 初始化vm方法 + */ + public static void initVelocity() + { + try { + Properties p = new Properties(); + p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); + p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); + p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); + Velocity.init(p); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 设置模板变量信息 + * + * @return 模板列表 + */ + public static VelocityContext prepareContext(GenTable genTable) + { + String moduleName = genTable.getModuleName(); + String businessName = genTable.getBusinessName(); + String packageName = genTable.getPackageName(); + String tplCategory = genTable.getGenTpl(); + String functionName = genTable.getFunctionName(); + + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("tplCategory", genTable.getGenTpl()); + velocityContext.put("tableName", genTable.getTableName()); + velocityContext.put("functionName", StringUtil.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); + velocityContext.put("ClassName", genTable.getEntityName()); + return velocityContext; + } + + /** + * 获取模板信息 + * + * @return 模板列表 + */ + public static List getTemplateList(String tplCategory) + { + List templates = new ArrayList(); +// templates.add("vm/java/domain.java.vm"); +// templates.add("vm/java/mapper.java.vm"); +// templates.add("vm/java/service.java.vm"); +// templates.add("vm/java/serviceImpl.java.vm"); + templates.add("vm/java/controller.java.vm"); +// templates.add("vm/xml/mapper.xml.vm"); +// templates.add("vm/sql/sql.vm"); +// templates.add("vm/js/api.js.vm"); +// if (GenConstants.TPL_CRUD.equals(tplCategory)) +// { +// templates.add("vm/vue/index.vue.vm"); +// } +// else if (GenConstants.TPL_TREE.equals(tplCategory)) +// { +// templates.add("vm/vue/index-tree.vue.vm"); +// } +// else if (GenConstants.TPL_SUB.equals(tplCategory)) +// { +// templates.add("vm/vue/index.vue.vm"); +// templates.add("vm/java/sub-domain.java.vm"); +// } + return templates; + } + + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java new file mode 100644 index 00000000..a175e6a8 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java @@ -0,0 +1,28 @@ +package com.hxkj.generator.validate; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import java.io.Serializable; + +/** + * 分页参数 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class PageParam implements Serializable { + + // 当前分页 + @DecimalMin(value = "1", message = "pageNo参数必须大于0的数字") + public Integer pageNo = 1; + + // 每页条数 + @DecimalMin(value = "1", message = "pageSize参数必须是大于0的数字") + @DecimalMax(value = "60", message = "pageSize参数必须是小于60的数字") + private Integer pageSize = 20; + +} diff --git a/server/like-generator/src/main/resources/vm/controller.java.vm b/server/like-generator/src/main/resources/vm/controller.java.vm new file mode 100644 index 00000000..017ed174 --- /dev/null +++ b/server/like-generator/src/main/resources/vm/controller.java.vm @@ -0,0 +1 @@ +$hello \ No newline at end of file diff --git a/server/like-generator/src/main/resources/vm/java/controller.java.vm b/server/like-generator/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 00000000..017ed174 --- /dev/null +++ b/server/like-generator/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1 @@ +$hello \ No newline at end of file diff --git a/server/like-generator/src/main/resources/vm/vue/index.vue.vm b/server/like-generator/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/pom.xml b/server/pom.xml index 64fdcee4..aad7aa06 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -13,6 +13,7 @@ like-admin like-front like-common + like-generator From b08bf59e6378cc8666ace517ea3cba1313269530 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 13 Jun 2022 16:44:18 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxkj/common/constant/GenConstants.java | 5 +- .../generator/controller/GenController.java | 80 +++++++- .../com/hxkj/generator/entity/GenTable.java | 2 +- .../generator/service/IGenerateService.java | 58 +++++- .../service/impl/GenerateServiceImpl.java | 184 +++++++++++++++--- .../com/hxkj/generator/util/VelocityUtil.java | 39 ++-- .../com/hxkj/generator/validate/GenParam.java | 81 ++++++++ .../main/resources/java/controller.java.vm | 96 +++++++++ .../vue/index.vue.vm => java/entity.java.vm} | 0 .../src/main/resources/java/mapper.java.vm | 0 .../src/main/resources/java/service.java.vm | 0 .../main/resources/java/serviceImpl.java.vm | 0 .../src/main/resources/java/validate.java.vm | 0 .../src/main/resources/vm/controller.java.vm | 1 - .../main/resources/vm/java/controller.java.vm | 1 - .../src/main/resources/vue/index.vue.vm | 2 + 16 files changed, 492 insertions(+), 57 deletions(-) create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java create mode 100644 server/like-generator/src/main/resources/java/controller.java.vm rename server/like-generator/src/main/resources/{vm/vue/index.vue.vm => java/entity.java.vm} (100%) create mode 100644 server/like-generator/src/main/resources/java/mapper.java.vm create mode 100644 server/like-generator/src/main/resources/java/service.java.vm create mode 100644 server/like-generator/src/main/resources/java/serviceImpl.java.vm create mode 100644 server/like-generator/src/main/resources/java/validate.java.vm delete mode 100644 server/like-generator/src/main/resources/vm/controller.java.vm delete mode 100644 server/like-generator/src/main/resources/vm/java/controller.java.vm create mode 100644 server/like-generator/src/main/resources/vue/index.vue.vm diff --git a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java index e7a6d3c3..7601fac6 100644 --- a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java +++ b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java @@ -30,8 +30,9 @@ public class GenConstants { public static final String[] COLUMN_TYPE_TIME = {"datetime", "time", "date", "timestamp"}; /** 数据库数字类型 */ - public static final String[] COLUMN_TYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", - "number", "integer", "bit", "bigint", "float", "double", "decimal"}; + public static final String[] COLUMN_TYPE_NUMBER = { + "tinyint", "smallint", "mediumint", "int", "number", + "integer", "bit", "bigint", "float", "double", "decimal"}; /** 页面不需要编辑字段 */ public static final String[] COLUMN_NAME_NOT_EDIT = {"id", "create_time", "update_time", "delete_time"}; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 09fac4e1..e3460503 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -2,6 +2,7 @@ package com.hxkj.generator.controller; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; +import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.validate.PageParam; import org.springframework.validation.annotation.Validated; @@ -18,7 +19,7 @@ public class GenController { IGenerateService iGenerateService; /** - * 数据表列表 + * 库列表 * * @author fzr * @param pageParam 分页参数 @@ -33,7 +34,32 @@ public class GenController { } /** - * 导入数据表 + * 生成列表 + * + * @author fzr + * @return Object + */ + @GetMapping("/genList") + public Object genList(@Validated PageParam pageParam, + @RequestParam Map params) { + PageResult> list = iGenerateService.genList(pageParam, params); + return AjaxResult.success(list); + } + + /** + * 生成详情 + * + * @author fzr + * @return Object + */ + @GetMapping("/genDetail") + public Object genDetail(@Validated @IDMust() @RequestParam("id") Integer id) { + Map maps = iGenerateService.genDetail(id); + return AjaxResult.success(maps); + } + + /** + * 导入表结构 * * @param tables 参数 * @return Object @@ -45,14 +71,60 @@ public class GenController { return AjaxResult.success(); } + /** + * 编辑表结构 + * + * @author fzr + * @return Object + */ + @PostMapping("/editTable") + public Object editTable(@Validated @IDMust() @RequestParam("id") Integer id) { + iGenerateService.editTable(id); + return AjaxResult.success(); + } + + /** + * 删除表结构 + * + * @author fzr + * @return Object + */ + @PostMapping("/deleteTable") + public Object deleteTable(@Validated @IDMust() @RequestParam("id") Integer id) { + iGenerateService.deleteTable(id); + return AjaxResult.success(); + } + + /** + * 同步表结构 + * + * @author fzr + * @return Object + */ + public Object syncTable(@Validated @IDMust() @RequestParam("id") Integer id) { + return null; + } + /** * 预览代码 * + * @author fzr * @return Object */ @GetMapping("/previewCode") - public Object previewCode() { - iGenerateService.previewCode(); + public Object previewCode(@Validated @IDMust() @RequestParam("id") Integer id) { + Map map = iGenerateService.previewCode(id); + return AjaxResult.success(map); + } + + /** + * 生成代码 + * + * @author fzr + * @return Object + */ + @GetMapping("genCode") + public Object genCode(@Validated @IDMust() @RequestParam("id") Integer id) { return null; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 3baad489..f92c2ce3 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -29,8 +29,8 @@ public class GenTable implements Serializable { private String genTpl; private String genType; private String genPath; + private String remarks; private Long createTime; private Long updateTime; - private Long deleteTime; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index fa1f66da..e4bd4077 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -3,6 +3,7 @@ package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; import com.hxkj.generator.validate.PageParam; +import java.util.List; import java.util.Map; /** @@ -11,7 +12,7 @@ import java.util.Map; public interface IGenerateService { /** - * 表列表 + * 库列表 * * @author fzr * @param pageParam 分页参数 @@ -21,13 +22,64 @@ public interface IGenerateService { PageResult> db(PageParam pageParam, Map params); /** - * 导入表 + * 生成列表 + * + * @author fzr + * @return Object + */ + PageResult> genList(PageParam pageParam, Map params); + + /** + * 生成详情 + * + * @author fzr + * @return Object + */ + Map genDetail(Integer id); + + /** + * 导入表结构 * * @author fzr * @param tableNames 参数 */ void importTable(String[] tableNames); - Object previewCode(); + /** + * 编辑表结构 + * + * @author fzr + */ + void editTable(Integer id); + + /** + * 删除表结构 + * + * @author fzr + */ + void deleteTable(Integer id); + + /** + * 同步数据表 + * + * @author fzr + */ + void syncTable(Integer id); + + /** + * 预览代码 + * + * @author fzr + * @return Map + */ + Map previewCode(Integer id); + + /** + * 生成代码 + * + * @author fzr + * @return Object + */ + Object genCode(Integer id); } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 25136fa9..3b0b4131 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,22 +1,23 @@ package com.hxkj.generator.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.StringUtil; +import com.hxkj.common.utils.TimeUtil; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import com.hxkj.generator.mapper.GenTableColumnMapper; import com.hxkj.generator.mapper.GenTableMapper; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.util.GenUtil; +import com.hxkj.generator.util.VelocityUtil; import com.hxkj.generator.validate.PageParam; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -36,7 +37,7 @@ public class GenerateServiceImpl implements IGenerateService { GenTableColumnMapper genTableColumnMapper; /** - * 数据表列表 + * 库列表 * * @author fzr * @param pageParam 分页参数 @@ -64,6 +65,96 @@ public class GenerateServiceImpl implements IGenerateService { return PageResult.pageHelper(tables, list); } + /** + * 生成列表 + * + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult> + */ + @Override + public PageResult> genList(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByDesc("id"); + queryWrapper.select("id,entity_name,table_name,table_comment,create_time,update_time"); + + genTableMapper.setSearch(queryWrapper, params, new String[]{ + "like:tableName@table_name:str", + "like:tableComment@table_comment:str", + "datetime:startTime-endTime@create_time:str" + }); + + PageHelper.startPage(page, limit); + List> tables = genTableMapper.selectMaps(queryWrapper); + + List> list = new LinkedList<>(); + for (Map item : tables) { + Map map = new LinkedHashMap<>(); + map.put("id", item.get("id")); + map.put("tableName", item.get("table_name")); + map.put("entityName", item.get("entity_name")); + map.put("tableComment", item.get("table_comment")); + map.put("createTime", TimeUtil.timestampToDate(item.get("create_time").toString())); + map.put("updateTime", TimeUtil.timestampToDate(item.get("update_time").toString())); + list.add(map); + } + + return PageResult.pageHelper(tables, list); + } + + /** + * 生成详情 + * + * @author fzr + * @return Object + */ + @Override + public Map genDetail(Integer id) { + Map maps = new LinkedHashMap<>(); + GenTable genTable = genTableMapper.selectById(id); + + // 基本信息 + Map base = new LinkedHashMap<>(); + base.put("id", genTable.getId()); + base.put("tableName", genTable.getTableName()); + base.put("entityName", genTable.getEntityName()); + base.put("tableComment", genTable.getTableComment()); + base.put("functionAuthor", genTable.getFunctionName()); + base.put("createTime", TimeUtil.timestampToDate(genTable.getCreateTime())); + base.put("updateTime", TimeUtil.timestampToDate(genTable.getUpdateTime())); + maps.put("base", base); + + // 生成信息 + Map gen = new LinkedHashMap<>(); + gen.put("genTpl", genTable.getGenTpl()); + gen.put("genType", genTable.getGenType()); + gen.put("genPath", genTable.getGenPath()); + gen.put("moduleName", genTable.getModuleName()); + gen.put("packageName", genTable.getPackageName()); + gen.put("businessName", genTable.getBusinessName()); + gen.put("functionName", genTable.getFunctionName()); + maps.put("gen", gen); + + // 字段信息 + List columns = genTableColumnMapper.selectList( + new QueryWrapper() + .eq("table_id", id) + .orderByDesc("sort")); + + maps.put("column", columns); + + return maps; + } + + /** + * 导入表结构 + * + * @author fzr + * @param tableNames 参数 + */ @Override public void importTable(String[] tableNames) { List> tables = genTableMapper.selectDbTableListByNames(tableNames); @@ -171,30 +262,75 @@ public class GenerateServiceImpl implements IGenerateService { } } + /** + * 编辑表结构 + * + * @author fzr + * @param id 主键 + */ @Override - public Object previewCode() { - try{ - Velocity.init(getDefaultProp()); - VelocityContext context = new VelocityContext(); - context.put("hello", "Hello World!"); - StringWriter w = new StringWriter(); - Template t = Velocity.getTemplate("vm/java/controller.java.vm"); - t.merge(context, w); - System.out.println("template:" + w); - }catch (Exception e){ - e.printStackTrace(); + public void editTable(Integer id) { + + } + + /** + * 删除表结构 + * + * @author fzr + * @param id 主键 + */ + @Override + public void deleteTable(Integer id) { + + } + + /** + * 同步数据表 + * + * @author fzr + */ + @Override + public void syncTable(Integer id) { + + } + + /** + * 预览代码 + * + * @author fzr + * @return Map + */ + @Override + public Map previewCode(Integer id) { + + GenTable table = genTableMapper.selectById(id); + + // 初始模板 + VelocityUtil.initVelocity(); + VelocityContext context = VelocityUtil.prepareContext(table); + + // 渲染模板 + Map map = new LinkedHashMap<>(); + List templates = VelocityUtil.getTemplateList("curd"); + for (String template : templates) { + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, "UTF-8"); + tpl.merge(context, sw); + map.put(template, sw.toString()); } + + return map; + } + + /** + * 生成代码 + * + * @author fzr + * @return Object + */ + @Override + public Object genCode(Integer id) { return null; } - public Properties getDefaultProp(){ - Properties prop = new Properties(); -// prop.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); -// prop.setProperty(RuntimeConstants.RESOURCE_LOADER_CLASS, "classpath"); - prop.setProperty(RuntimeConstants.RESOURCE_LOADERS, "classpath"); -// prop.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); - prop.setProperty("resource.loader.file.class", ClasspathResourceLoader.class.getName()); - return prop; - } - } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 1883cf1b..6eedd619 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -1,13 +1,16 @@ package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; +import com.hxkj.common.utils.TimeUtil; import com.hxkj.generator.entity.GenTable; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import java.sql.Time; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -43,10 +46,16 @@ public class VelocityUtil { String functionName = genTable.getFunctionName(); VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("tplCategory", genTable.getGenTpl()); + velocityContext.put("genTpl", genTable.getGenTpl()); velocityContext.put("tableName", genTable.getTableName()); velocityContext.put("functionName", StringUtil.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); velocityContext.put("ClassName", genTable.getEntityName()); + velocityContext.put("moduleName", genTable.getModuleName()); + velocityContext.put("BusinessName", StringUtil.capitalize(genTable.getBusinessName())); + velocityContext.put("businessName", genTable.getBusinessName()); + velocityContext.put("packageName", packageName); + velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("datetime", TimeUtil.nowDate()); return velocityContext; } @@ -55,30 +64,18 @@ public class VelocityUtil { * * @return 模板列表 */ - public static List getTemplateList(String tplCategory) + public static List getTemplateList(String genTpl) { - List templates = new ArrayList(); -// templates.add("vm/java/domain.java.vm"); -// templates.add("vm/java/mapper.java.vm"); -// templates.add("vm/java/service.java.vm"); -// templates.add("vm/java/serviceImpl.java.vm"); - templates.add("vm/java/controller.java.vm"); + List templates = new LinkedList<>(); + templates.add("java/controller.java.vm"); + +// templates.add("java/domain.java.vm"); +// templates.add("java/mapper.java.vm"); +// templates.add("java/service.java.vm"); +// templates.add("java/serviceImpl.java.vm"); // templates.add("vm/xml/mapper.xml.vm"); // templates.add("vm/sql/sql.vm"); // templates.add("vm/js/api.js.vm"); -// if (GenConstants.TPL_CRUD.equals(tplCategory)) -// { -// templates.add("vm/vue/index.vue.vm"); -// } -// else if (GenConstants.TPL_TREE.equals(tplCategory)) -// { -// templates.add("vm/vue/index-tree.vue.vm"); -// } -// else if (GenConstants.TPL_SUB.equals(tplCategory)) -// { -// templates.add("vm/vue/index.vue.vm"); -// templates.add("vm/java/sub-domain.java.vm"); -// } return templates; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java new file mode 100644 index 00000000..d623ef57 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -0,0 +1,81 @@ +package com.hxkj.generator.validate; + +import com.hxkj.common.validator.annotation.IDMust; +import com.hxkj.common.validator.annotation.IntegerContains; +import com.hxkj.common.validator.annotation.StringContains; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 生成参数 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class GenParam implements Serializable { + + @IDMust(message = "id参数必传且需大于0") + private Integer id; + + @NotNull(message = "tableName参数缺失") + @NotEmpty(message = "表名称不能为空") + @Length(min = 1, max = 200, message = "名称不能大于200个字符") + private String tableName; + + @NotNull(message = "entityName参数缺失") + @NotEmpty(message = "实体类名称不能为空") + @Length(min = 1, max = 200, message = "实体类名称不能大于200个字符") + private String entityName; + + @NotNull(message = "tableComment参数缺失") + @NotEmpty(message = "表描述不能为空") + @Length(min = 1, max = 200, message = "表描述不能大于200个字符") + private String tableComment; + + @NotNull(message = "functionAuthor参数缺失") + @NotEmpty(message = "表描述不能为空") + @Length(min = 1, max = 60, message = "表描述不能大于200个字符") + private String functionAuthor; + + @Length(max = 60, message = "备注不能大于200个字符") + private String remarks; + + @NotNull(message = "genTpl参数缺失") + @NotEmpty(message = "请选择生成模板") + @StringContains(values = {"curd", "tree"}, message = "选择的生成模板不符合") + private String genTpl; + + @NotNull(message = "packageName参数缺失") + @NotEmpty(message = "生成包路径不能为空") + @Length(min = 1, max = 60, message = "生成包路径不能大于200个字符") + private String packageName; + + @NotNull(message = "moduleName参数缺失") + @NotEmpty(message = "生成模块名不能为空") + @Length(min = 1, max = 60, message = "生成模块名不能大于60个字符") + private String moduleName; + + @NotNull(message = "businessName参数缺失") + @NotEmpty(message = "生成业务名不能为空") + @Length(min = 1, max = 60, message = "生成业务名不能大于60个字符") + private String businessName; + + @NotNull(message = "functionName参数缺失") + @NotEmpty(message = "生成功能名不能为空") + @Length(min = 1, max = 60, message = "生成功能名不能大于60个字符") + private String functionName; + + @NotNull(message = "genType参数缺失") + @IntegerContains(values = {0, 1}, message = "选择的生成代码方式不符合") + private Integer genType; + + @Length(max = 200, message = "生成代码路径不能大于200个字符") + private String genPath; + +} diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm new file mode 100644 index 00000000..4135e697 --- /dev/null +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -0,0 +1,96 @@ +package ${packageName}.controller; + +import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.generator.config.aop.Log; +import com.hxkj.generator.service.ISystemAdminService; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.validate.system.SystemAdminParam; +import com.hxkj.generator.vo.system.SystemAdminVo; +import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.common.core.AjaxResult; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.validator.annotation.IDMust; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * ${functionName}管理 + */ +@RestController +@RequestMapping("api/${moduleName}/${businessName}") +public class ${ClassName}Controller { + + @Resource + ISystemAdminService iSystemAdminService; + + /** + * ${functionName}列表 + * + * @author fzr + * @return Object + */ + @GetMapping("/list") + public Object list(@Validated PageParam pageParam, + @RequestParam Map params) { + PageResult list = iSystemAdminService.list(pageParam, params); + return AjaxResult.success(list); + } + + /** + * ${functionName}详情 + * + * @author fzr + * @param id 主键ID + * @return Object + */ + @GetMapping("/detail") + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + SystemAdminVo vo = iSystemAdminService.detail(id); + return AjaxResult.success(vo); + } + + /** + * ${functionName}新增 + * + * @author fzr + * @param systemAdminParam 参数 + * @return Object + */ + @Log(title = "${functionName}新增") + @PostMapping("/add") + public Object add(@Validated(value = SystemAdminParam.create.class) @RequestBody SystemAdminParam systemAdminParam) { + iSystemAdminService.add(systemAdminParam); + return AjaxResult.success(); + } + + /** + * ${functionName}编辑 + * + * @author fzr + * @param systemAdminParam 参数 + * @return Object + */ + @Log(title = "${functionName}编辑") + @PostMapping("/edit") + public Object edit(@Validated(value = SystemAdminParam.update.class) @RequestBody SystemAdminParam systemAdminParam) { + iSystemAdminService.edit(systemAdminParam); + return AjaxResult.success(); + } + + /** + * ${functionName}删除 + * + * @author fzr + * @return Object + */ + @Log(title = "${functionName}删除") + @PostMapping("/del") + public Object del(@Validated(value = SystemAdminParam.delete.class) @RequestBody SystemAdminParam systemAdminParam) { + iSystemAdminService.del(systemAdminParam.getId()); + return AjaxResult.success(); + } + +} diff --git a/server/like-generator/src/main/resources/vm/vue/index.vue.vm b/server/like-generator/src/main/resources/java/entity.java.vm similarity index 100% rename from server/like-generator/src/main/resources/vm/vue/index.vue.vm rename to server/like-generator/src/main/resources/java/entity.java.vm diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm new file mode 100644 index 00000000..e69de29b diff --git a/server/like-generator/src/main/resources/vm/controller.java.vm b/server/like-generator/src/main/resources/vm/controller.java.vm deleted file mode 100644 index 017ed174..00000000 --- a/server/like-generator/src/main/resources/vm/controller.java.vm +++ /dev/null @@ -1 +0,0 @@ -$hello \ No newline at end of file diff --git a/server/like-generator/src/main/resources/vm/java/controller.java.vm b/server/like-generator/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index 017ed174..00000000 --- a/server/like-generator/src/main/resources/vm/java/controller.java.vm +++ /dev/null @@ -1 +0,0 @@ -$hello \ No newline at end of file diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm new file mode 100644 index 00000000..51cf1e95 --- /dev/null +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -0,0 +1,2 @@ +$hello +ffff \ No newline at end of file From 19d4bf34ec2c8124e8d2251b1b8e4808a5b076e8 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 13 Jun 2022 18:15:46 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20-?= =?UTF-8?q?=20=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/controller/GenController.java | 5 ++- .../com/hxkj/generator/entity/GenTable.java | 2 +- .../generator/service/IGenerateService.java | 3 +- .../service/impl/GenerateServiceImpl.java | 42 ++++++++++++++++++- .../com/hxkj/generator/validate/GenParam.java | 4 ++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index e3460503..df776e96 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -4,6 +4,7 @@ import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -78,8 +79,8 @@ public class GenController { * @return Object */ @PostMapping("/editTable") - public Object editTable(@Validated @IDMust() @RequestParam("id") Integer id) { - iGenerateService.editTable(id); + public Object editTable(@Validated() @RequestBody GenParam genParam) { + iGenerateService.editTable(genParam); return AjaxResult.success(); } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index f92c2ce3..7a3424c6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -27,7 +27,7 @@ public class GenTable implements Serializable { private String functionName; private String functionAuthor; private String genTpl; - private String genType; + private Integer genType; private String genPath; private String remarks; private Long createTime; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index e4bd4077..e901008b 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -1,6 +1,7 @@ package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; +import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; import java.util.List; @@ -50,7 +51,7 @@ public interface IGenerateService { * * @author fzr */ - void editTable(Integer id); + void editTable(GenParam genParam); /** * 删除表结构 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 3b0b4131..6823f33c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,6 +1,7 @@ package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.github.pagehelper.PageHelper; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; @@ -14,11 +15,13 @@ import com.hxkj.generator.mapper.GenTableMapper; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.util.GenUtil; import com.hxkj.generator.util.VelocityUtil; +import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.StringWriter; @@ -156,6 +159,7 @@ public class GenerateServiceImpl implements IGenerateService { * @param tableNames 参数 */ @Override + @Transactional public void importTable(String[] tableNames) { List> tables = genTableMapper.selectDbTableListByNames(tableNames); @@ -266,11 +270,45 @@ public class GenerateServiceImpl implements IGenerateService { * 编辑表结构 * * @author fzr - * @param id 主键 + * @param genParam 参数 */ @Override - public void editTable(Integer id) { + @Transactional + public void editTable(GenParam genParam) { + GenTable model = genTableMapper.selectById(genParam.getId()); + Assert.notNull(model, "数据已丢失"); + model.setTableName(genParam.getTableName()); + model.setEntityName(genParam.getEntityName()); + model.setTableComment(genParam.getTableComment()); + model.setFunctionAuthor(genParam.getFunctionAuthor()); + model.setRemarks(genParam.getRemarks()); + model.setGenTpl(genParam.getGenTpl()); + model.setModuleName(genParam.getModuleName()); + model.setPackageName(genParam.getPackageName()); + model.setBusinessName(genParam.getBusinessName()); + model.setFunctionName(genParam.getFunctionName()); + model.setGenType(genParam.getGenType()); + model.setGenPath(genParam.getGenPath()); + genTableMapper.updateById(model); + + for (Map item : genParam.getColumns()) { + Integer id = Integer.parseInt(item.get("id")); + GenTableColumn column = genTableColumnMapper.selectById(id); + column.setColumnComment(item.get("columnComment")); + column.setJavaField(item.get("javaField")); + column.setIsPk(Integer.parseInt(item.get("isPK"))); + column.setIsIncrement(Integer.parseInt(item.get("isIncrement"))); + column.setIsRequired(Integer.parseInt(item.get("isRequired"))); + column.setIsInsert(Integer.parseInt(item.get("isInsert"))); + column.setIsEdit(Integer.parseInt(item.get("isEdit"))); + column.setIsList(Integer.parseInt(item.get("isList"))); + column.setIsQuery(Integer.parseInt(item.get("isQuery"))); + column.setQueryType(item.get("queryType")); + column.setHtmlType(item.get("htmlType")); + column.setDictType(item.get("dictType")); + genTableColumnMapper.updateById(column); + } } /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index d623ef57..5c454daf 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -11,6 +11,8 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * 生成参数 @@ -78,4 +80,6 @@ public class GenParam implements Serializable { @Length(max = 200, message = "生成代码路径不能大于200个字符") private String genPath; + private List> columns; + } From 57c94a1e7d0d3fca9ef0f1d57a7d58bd8e889291 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 13 Jun 2022 18:23:35 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/generator/service/impl/GenerateServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 6823f33c..a922e7dc 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -318,8 +318,13 @@ public class GenerateServiceImpl implements IGenerateService { * @param id 主键 */ @Override + @Transactional public void deleteTable(Integer id) { + GenTable genTable = genTableMapper.selectById(id); + Assert.notNull(genTable, "数据已丢失"); + genTableMapper.deleteById(id); + genTableColumnMapper.delete(new QueryWrapper().eq("table_id", id)); } /** From 61790c744483ca4ee7f62c67651fdf2a8666e7e0 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 14 Jun 2022 17:00:35 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-generator/pom.xml | 1 - .../com/hxkj/generator/config/GenConfig.java | 17 ++ .../generator/controller/GenController.java | 18 +- .../com/hxkj/generator/entity/GenTable.java | 2 +- .../hxkj/generator/mapper/GenTableMapper.java | 3 +- .../generator/service/IGenerateService.java | 8 +- .../service/impl/GenerateServiceImpl.java | 267 ++++++++++-------- .../java/com/hxkj/generator/util/GenUtil.java | 4 + .../com/hxkj/generator/util/VelocityUtil.java | 2 +- .../com/hxkj/generator/validate/GenParam.java | 8 +- .../java/com/hxkj/generator/vo/DbTableVo.java | 20 ++ .../com/hxkj/generator/vo/GenColumnVo.java | 32 +++ .../com/hxkj/generator/vo/GenTableVo.java | 22 ++ 13 files changed, 261 insertions(+), 143 deletions(-) create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java diff --git a/server/like-generator/pom.xml b/server/like-generator/pom.xml index 252ed9d9..678caae6 100644 --- a/server/like-generator/pom.xml +++ b/server/like-generator/pom.xml @@ -24,7 +24,6 @@ commons-collections commons-collections 3.2.2 - diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java new file mode 100644 index 00000000..e171a0a6 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -0,0 +1,17 @@ +package com.hxkj.generator.config; + +public class GenConfig { + + // 作者姓名 + public static String authorName = "LikeAdmin"; + + // 生成包名 + public static String packageName = "com.hxkj.like-admin"; + + // 表前缀名 + public static String tablePrefix = "ls_"; + + // 是否去除表前缀 + public static Boolean isRemoveTablePrefix = true; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index df776e96..450d788f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -1,11 +1,14 @@ package com.hxkj.generator.controller; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.generator.service.IGenerateService; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,7 +33,7 @@ public class GenController { @GetMapping("/db") public Object db(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult> list = iGenerateService.db(pageParam, params); + PageResult list = iGenerateService.db(pageParam, params); return AjaxResult.success(list); } @@ -40,10 +43,10 @@ public class GenController { * @author fzr * @return Object */ - @GetMapping("/genList") - public Object genList(@Validated PageParam pageParam, + @GetMapping("/list") + public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult> list = iGenerateService.genList(pageParam, params); + PageResult list = iGenerateService.list(pageParam, params); return AjaxResult.success(list); } @@ -53,9 +56,9 @@ public class GenController { * @author fzr * @return Object */ - @GetMapping("/genDetail") - public Object genDetail(@Validated @IDMust() @RequestParam("id") Integer id) { - Map maps = iGenerateService.genDetail(id); + @GetMapping("/detail") + public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + Map maps = iGenerateService.detail(id); return AjaxResult.success(maps); } @@ -67,6 +70,7 @@ public class GenController { */ @PostMapping("/importTable") public Object importTable(String tables) { + Assert.notNull(tables, "tables参数缺失"); String[] tableNames = tables.split(","); iGenerateService.importTable(tableNames); return AjaxResult.success(); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 7a3424c6..4c848652 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -20,12 +20,12 @@ public class GenTable implements Serializable { private String tableComment; private String subTableName; private String subTableFk; + private String authorName; private String entityName; private String packageName; private String moduleName; private String businessName; private String functionName; - private String functionAuthor; private String genTpl; private Integer genType; private String genPath; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index b0d3376a..c891e938 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -3,6 +3,7 @@ package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -35,7 +36,7 @@ public interface GenTableMapper extends IBaseMapper { "AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))" + "", ""}) - List> selectDbTableList(Map params); + List selectDbTableList(Map params); /** * 根据表名集查询表 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index e901008b..e4af40fd 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -3,6 +3,8 @@ package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import java.util.List; import java.util.Map; @@ -20,7 +22,7 @@ public interface IGenerateService { * @param params 搜索参数 * @return PageResult> */ - PageResult> db(PageParam pageParam, Map params); + PageResult db(PageParam pageParam, Map params); /** * 生成列表 @@ -28,7 +30,7 @@ public interface IGenerateService { * @author fzr * @return Object */ - PageResult> genList(PageParam pageParam, Map params); + PageResult list(PageParam pageParam, Map params); /** * 生成详情 @@ -36,7 +38,7 @@ public interface IGenerateService { * @author fzr * @return Object */ - Map genDetail(Integer id); + Map detail(Integer id); /** * 导入表结构 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index a922e7dc..a612a9fc 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,13 +1,17 @@ package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; +import com.hxkj.common.exception.OperateException; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.generator.config.GenConfig; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import com.hxkj.generator.mapper.GenTableColumnMapper; @@ -17,9 +21,13 @@ import com.hxkj.generator.util.GenUtil; import com.hxkj.generator.util.VelocityUtil; import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenColumnVo; +import com.hxkj.generator.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,24 +56,20 @@ public class GenerateServiceImpl implements IGenerateService { * @return PageResult> */ @Override - public PageResult> db(PageParam pageParam, Map params) { + public PageResult db(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectDbTableList(params); + List tables = genTableMapper.selectDbTableList(params); - List> list = new LinkedList<>(); - for (Map item : tables) { - Map map = new LinkedHashMap<>(); - map.put("tableName", item.get("table_name")); - map.put("tableComment", item.get("table_comment")); - map.put("createTime", item.get("create_time")); - map.put("updateTime", item.getOrDefault("update_time", "")); - list.add(map); + for (DbTableVo vo : tables) { + if (vo.getUpdateTime() == null) { + vo.setUpdateTime(""); + } } - return PageResult.pageHelper(tables, list); + return PageResult.pageHelper(tables); } /** @@ -76,13 +80,13 @@ public class GenerateServiceImpl implements IGenerateService { * @return PageResult> */ @Override - public PageResult> genList(PageParam pageParam, Map params) { + public PageResult list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("id"); - queryWrapper.select("id,entity_name,table_name,table_comment,create_time,update_time"); + queryWrapper.select("id,gen_tpl,entity_name,table_name,table_comment,create_time,update_time"); genTableMapper.setSearch(queryWrapper, params, new String[]{ "like:tableName@table_name:str", @@ -90,22 +94,18 @@ public class GenerateServiceImpl implements IGenerateService { "datetime:startTime-endTime@create_time:str" }); - PageHelper.startPage(page, limit); - List> tables = genTableMapper.selectMaps(queryWrapper); + IPage iPage = genTableMapper.selectPage(new Page<>(page, limit), queryWrapper); - List> list = new LinkedList<>(); - for (Map item : tables) { - Map map = new LinkedHashMap<>(); - map.put("id", item.get("id")); - map.put("tableName", item.get("table_name")); - map.put("entityName", item.get("entity_name")); - map.put("tableComment", item.get("table_comment")); - map.put("createTime", TimeUtil.timestampToDate(item.get("create_time").toString())); - map.put("updateTime", TimeUtil.timestampToDate(item.get("update_time").toString())); - list.add(map); + List list = new LinkedList<>(); + for (GenTable item : iPage.getRecords()) { + GenTableVo vo = new GenTableVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + list.add(vo); } - return PageResult.pageHelper(tables, list); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** @@ -115,7 +115,7 @@ public class GenerateServiceImpl implements IGenerateService { * @return Object */ @Override - public Map genDetail(Integer id) { + public Map detail(Integer id) { Map maps = new LinkedHashMap<>(); GenTable genTable = genTableMapper.selectById(id); @@ -123,9 +123,10 @@ public class GenerateServiceImpl implements IGenerateService { Map base = new LinkedHashMap<>(); base.put("id", genTable.getId()); base.put("tableName", genTable.getTableName()); - base.put("entityName", genTable.getEntityName()); base.put("tableComment", genTable.getTableComment()); - base.put("functionAuthor", genTable.getFunctionName()); + base.put("entityName", genTable.getEntityName()); + base.put("authorName", genTable.getAuthorName()); + base.put("remarks", genTable.getRemarks()); base.put("createTime", TimeUtil.timestampToDate(genTable.getCreateTime())); base.put("updateTime", TimeUtil.timestampToDate(genTable.getUpdateTime())); maps.put("base", base); @@ -142,10 +143,17 @@ public class GenerateServiceImpl implements IGenerateService { maps.put("gen", gen); // 字段信息 - List columns = genTableColumnMapper.selectList( - new QueryWrapper() - .eq("table_id", id) - .orderByDesc("sort")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("table_id", id); + queryWrapper.orderByAsc("sort"); + List columns = new LinkedList<>(); + for (GenTableColumn item : genTableColumnMapper.selectList(queryWrapper)) { + GenColumnVo vo = new GenColumnVo(); + BeanUtils.copyProperties(item, vo); + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + columns.add(vo); + } maps.put("column", columns); @@ -161,108 +169,117 @@ public class GenerateServiceImpl implements IGenerateService { @Override @Transactional public void importTable(String[] tableNames) { - List> tables = genTableMapper.selectDbTableListByNames(tableNames); + try { + List> tables = genTableMapper.selectDbTableListByNames(tableNames); - for (Map map : tables) { - // 生成表信息 - String tableName = map.get("table_name"); - String tableDesc = map.get("table_comment"); - GenTable table = new GenTable(); - table.setTableName(tableName); - table.setTableComment(tableDesc); - table.setEntityName(GenUtil.toClassName(tableName)); - table.setPackageName("com.hxkj.admin"); - table.setModuleName(GenUtil.toModuleName("com.hxkj.admin")); - table.setBusinessName(GenUtil.toBusinessName(tableName)); - table.setFunctionName(GenUtil.replaceText(tableDesc)); - table.setFunctionAuthor("likeAdmin"); - table.setCreateTime(System.currentTimeMillis() / 1000); - table.setUpdateTime(System.currentTimeMillis() / 1000); - int row = genTableMapper.insert(table); + for (Map map : tables) { + // 取基本数据 + String tableName = map.get("table_name"); + String tableDesc = map.get("table_comment"); - // 生成列信息 - if (row > 0) { - List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) { - String columnType = GenUtil.getDbType(column.getColumnType()); - String columnName = column.getColumnName(); + // 生成表信息 + GenTable table = new GenTable(); + table.setTableName(tableName); + table.setTableComment(tableDesc); + table.setAuthorName(GenConfig.authorName); + table.setEntityName(GenUtil.toClassName(tableName)); + table.setModuleName(GenUtil.toModuleName(GenConfig.packageName)); + table.setPackageName(GenConfig.packageName); + table.setBusinessName(GenUtil.toBusinessName(tableName)); + table.setFunctionName(GenUtil.replaceText(tableDesc)); + table.setCreateTime(System.currentTimeMillis() / 1000); + table.setUpdateTime(System.currentTimeMillis() / 1000); + int row = genTableMapper.insert(table); - column.setTableId(table.getId()); - column.setUpdateTime(table.getUpdateTime()); - column.setCreateTime(table.getCreateTime()); - column.setJavaField(StringUtil.toCamelCase(columnName)); - column.setJavaType("String"); - column.setQueryType("EQ"); - column.setIsInsert(GenConstants.REQUIRE); + // 生成列信息 + if (row > 0) { + List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); - if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || - GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { - Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) - ? GenConstants.HTML_TEXTAREA - : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } + for (GenTableColumn column : genTableColumns) { + String columnName = column.getColumnName(); + String columnType = GenUtil.getDbType(column.getColumnType()); + column.setTableId(table.getId()); + column.setJavaField(StringUtil.toCamelCase(columnName)); + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + column.setIsInsert(GenConstants.REQUIRE); + column.setUpdateTime(table.getUpdateTime()); + column.setCreateTime(table.getCreateTime()); - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } - - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { - column.setHtmlType(GenConstants.HTML_INPUT); - String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { - column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 - } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 - } else { - column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + // 文本域组 + if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || + GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { + Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) + ? GenConstants.HTML_TEXTAREA + : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); } - } - // 编辑字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { - column.setIsEdit(GenConstants.REQUIRE); - } + // 日期组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } - // 列表字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { - column.setIsList(GenConstants.REQUIRE); - } + // 数字组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { + column.setHtmlType(GenConstants.HTML_INPUT); + String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { + column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { + column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 + } else { + column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + } + } - // 查询字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { - column.setIsQuery(GenConstants.REQUIRE); - } + // 编辑字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + column.setIsEdit(GenConstants.REQUIRE); + } - // 查询字段类型 - if (StringUtil.endsWithIgnoreCase(columnName, "name")) { - column.setQueryType(GenConstants.QUERY_LIKE); - } + // 列表字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { + column.setIsList(GenConstants.REQUIRE); + } - // 根据字段设置 - if (StringUtil.endsWithIgnoreCase(columnName, "status")) { - // 状态字段设置单选框 - column.setHtmlType(GenConstants.HTML_RADIO); - } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || - StringUtil.endsWithIgnoreCase(columnName, "sex")) { - // 类型&性别字段设置下拉框 - column.setHtmlType(GenConstants.HTML_SELECT); - } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { - // 图片字段设置图片上传控件 - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { - // 文件字段设置文件上传控件 - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { - // 内容字段设置富文本控件 - column.setHtmlType(GenConstants.HTML_EDITOR); - } + // 查询字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { + column.setIsQuery(GenConstants.REQUIRE); + } - genTableColumnMapper.insert(column); + // 查询字段类型 + if (StringUtil.endsWithIgnoreCase(columnName, "name")) { + column.setQueryType(GenConstants.QUERY_LIKE); + } + + // 根据字段设置 + if (StringUtil.endsWithIgnoreCase(columnName, "status")) { + // 状态字段设置单选框 + column.setHtmlType(GenConstants.HTML_RADIO); + } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || + StringUtil.endsWithIgnoreCase(columnName, "sex")) { + // 类型&性别字段设置下拉框 + column.setHtmlType(GenConstants.HTML_SELECT); + } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { + // 图片字段设置图片上传控件 + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { + // 文件字段设置文件上传控件 + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { + // 内容字段的设置富文本控件 + column.setHtmlType(GenConstants.HTML_EDITOR); + } + + genTableColumnMapper.insert(column); + } } } + } catch (Exception e) { + throw new OperateException("导入失败：" + e.getMessage()); } } @@ -279,15 +296,15 @@ public class GenerateServiceImpl implements IGenerateService { Assert.notNull(model, "数据已丢失"); model.setTableName(genParam.getTableName()); - model.setEntityName(genParam.getEntityName()); model.setTableComment(genParam.getTableComment()); - model.setFunctionAuthor(genParam.getFunctionAuthor()); - model.setRemarks(genParam.getRemarks()); - model.setGenTpl(genParam.getGenTpl()); + model.setAuthorName(genParam.getAuthorName()); + model.setEntityName(genParam.getEntityName()); model.setModuleName(genParam.getModuleName()); model.setPackageName(genParam.getPackageName()); model.setBusinessName(genParam.getBusinessName()); model.setFunctionName(genParam.getFunctionName()); + model.setRemarks(genParam.getRemarks()); + model.setGenTpl(genParam.getGenTpl()); model.setGenType(genParam.getGenType()); model.setGenPath(genParam.getGenPath()); genTableMapper.updateById(model); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 2dc8679c..f6a30039 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -132,4 +132,8 @@ public class GenUtil { } } + public static void setPkColumn() { + + } + } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 6eedd619..689f87bb 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -54,7 +54,7 @@ public class VelocityUtil { velocityContext.put("BusinessName", StringUtil.capitalize(genTable.getBusinessName())); velocityContext.put("businessName", genTable.getBusinessName()); velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("author", genTable.getAuthorName()); velocityContext.put("datetime", TimeUtil.nowDate()); return velocityContext; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index 5c454daf..3d5e9d29 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -40,10 +40,10 @@ public class GenParam implements Serializable { @Length(min = 1, max = 200, message = "表描述不能大于200个字符") private String tableComment; - @NotNull(message = "functionAuthor参数缺失") - @NotEmpty(message = "表描述不能为空") - @Length(min = 1, max = 60, message = "表描述不能大于200个字符") - private String functionAuthor; + @NotNull(message = "authorName参数缺失") + @NotEmpty(message = "作者名称不能为空") + @Length(min = 1, max = 100, message = "作者名称不能大于60个字符") + private String authorName; @Length(max = 60, message = "备注不能大于200个字符") private String remarks; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java new file mode 100644 index 00000000..2eaad1da --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java @@ -0,0 +1,20 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/*** + * 表实体 + */ +@Data +public class DbTableVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String tableName; // 表的名称 + private String tableComment; // 表的描述 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java new file mode 100644 index 00000000..1f255b49 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java @@ -0,0 +1,32 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/*** + * 列实体 + */ +@Data +public class GenColumnVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 主键 + private String columnName; // 字段名称 + private String columnComment; // 字段描述 + private String columnType; // 字段类型 + private String javaType; // JAVA类型 + private String javaField; // JAVA字段 + private Integer isRequired; // 是否必填 + private Integer isInsert; // 是否插入字段 + private Integer isEdit; // 是否编辑字段 + private Integer isList; // 是否列表字段 + private Integer isQuery; // 是否查询字段 + private String queryType; // 查询方式: [等于、不等于、大于、小于、范围] + private String htmlType; // 显示类型: [文本框、文本域、下拉框、复选框、单选框、日期控件] + private String dictType; // 字典类型 + private String createTime; // 创建时间 + private String updateTime; // 更新时间 + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java new file mode 100644 index 00000000..eb1e0e42 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -0,0 +1,22 @@ +package com.hxkj.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 生成表实体 + */ +@Data +public class GenTableVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer id; // 生成主键 + private String genTpl; // 生成模板 + private String tableName; // 表的名称 + private String tableComment; // 表的描述 + private String createTime; // 创建时间 + private String updateTime; // 删除时间 + +} From 731cf9044e6d688e309523f8d0b8dc663320ab8d Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 14 Jun 2022 18:58:50 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20-?= =?UTF-8?q?=20=E7=BB=93=E6=9E=84=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/controller/GenController.java | 4 +- .../hxkj/generator/mapper/GenTableMapper.java | 12 ++ .../service/impl/GenerateServiceImpl.java | 155 +++++++----------- .../java/com/hxkj/generator/util/GenUtil.java | 146 ++++++++++++++--- .../com/hxkj/generator/util/VelocityUtil.java | 11 +- 5 files changed, 202 insertions(+), 126 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 450d788f..815698ed 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -106,8 +106,10 @@ public class GenController { * @author fzr * @return Object */ + @PostMapping("/syncTable") public Object syncTable(@Validated @IDMust() @RequestParam("id") Integer id) { - return null; + iGenerateService.syncTable(id); + return AjaxResult.success(); } /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index c891e938..52f6a924 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -73,4 +73,16 @@ public interface GenTableMapper extends IBaseMapper { ""}) List selectDbTableColumnsByName(String tableName); + @Select({""}) + Map selectGenTableByName(Integer id); + } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index a612a9fc..5acb2dd7 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -9,8 +9,10 @@ import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; +import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.common.utils.ToolsUtil; import com.hxkj.generator.config.GenConfig; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; @@ -34,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.StringWriter; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 代码生成器服务实现类 @@ -171,109 +175,18 @@ public class GenerateServiceImpl implements IGenerateService { public void importTable(String[] tableNames) { try { List> tables = genTableMapper.selectDbTableListByNames(tableNames); - for (Map map : tables) { - // 取基本数据 - String tableName = map.get("table_name"); - String tableDesc = map.get("table_comment"); - // 生成表信息 GenTable table = new GenTable(); - table.setTableName(tableName); - table.setTableComment(tableDesc); - table.setAuthorName(GenConfig.authorName); - table.setEntityName(GenUtil.toClassName(tableName)); - table.setModuleName(GenUtil.toModuleName(GenConfig.packageName)); - table.setPackageName(GenConfig.packageName); - table.setBusinessName(GenUtil.toBusinessName(tableName)); - table.setFunctionName(GenUtil.replaceText(tableDesc)); - table.setCreateTime(System.currentTimeMillis() / 1000); - table.setUpdateTime(System.currentTimeMillis() / 1000); + GenUtil.initTable(table, map); int row = genTableMapper.insert(table); // 生成列信息 if (row > 0) { + String tableName = map.get("table_name"); List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) { - String columnName = column.getColumnName(); - String columnType = GenUtil.getDbType(column.getColumnType()); - column.setTableId(table.getId()); - column.setJavaField(StringUtil.toCamelCase(columnName)); - column.setJavaType(GenConstants.TYPE_STRING); - column.setQueryType(GenConstants.QUERY_EQ); - column.setIsInsert(GenConstants.REQUIRE); - column.setUpdateTime(table.getUpdateTime()); - column.setCreateTime(table.getCreateTime()); - - // 文本域组 - if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || - GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { - Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) - ? GenConstants.HTML_TEXTAREA - : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } - - // 日期组件 - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } - - // 数字组件 - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { - column.setHtmlType(GenConstants.HTML_INPUT); - String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { - column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 - } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 - } else { - column.setJavaType(GenConstants.TYPE_LONG); // 长整形 - } - } - - // 编辑字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { - column.setIsEdit(GenConstants.REQUIRE); - } - - // 列表字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { - column.setIsList(GenConstants.REQUIRE); - } - - // 查询字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { - column.setIsQuery(GenConstants.REQUIRE); - } - - // 查询字段类型 - if (StringUtil.endsWithIgnoreCase(columnName, "name")) { - column.setQueryType(GenConstants.QUERY_LIKE); - } - - // 根据字段设置 - if (StringUtil.endsWithIgnoreCase(columnName, "status")) { - // 状态字段设置单选框 - column.setHtmlType(GenConstants.HTML_RADIO); - } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || - StringUtil.endsWithIgnoreCase(columnName, "sex")) { - // 类型&性别字段设置下拉框 - column.setHtmlType(GenConstants.HTML_SELECT); - } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { - // 图片字段设置图片上传控件 - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { - // 文件字段设置文件上传控件 - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { - // 内容字段的设置富文本控件 - column.setHtmlType(GenConstants.HTML_EDITOR); - } - + GenUtil.initColumn(column, table); genTableColumnMapper.insert(column); } } @@ -348,10 +261,63 @@ public class GenerateServiceImpl implements IGenerateService { * 同步数据表 * * @author fzr + * @param id 主键 */ @Override + @Transactional public void syncTable(Integer id) { + // 原表数据 + GenTable genTable = genTableMapper.selectById(id); + List genTableColumns = genTableColumnMapper.selectList( + new QueryWrapper() + .eq("table_id", id) + .orderByAsc("sort")); + // 原表转Map + Map tableColumnMap = genTableColumns + .stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); + + // 新表数据 + List columns = genTableMapper.selectDbTableColumnsByName(genTable.getTableName()); + if (StringUtil.isNull(columns)) { + throw new OperateException("同步结构失败,原表结构不存在！"); + } + + // 处理更新字段 + columns.forEach(column -> { + GenUtil.initColumn(column, genTable); + if (tableColumnMap.containsKey(column.getColumnName())) { + GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); + column.setId(prevColumn.getId()); + + if (column.getIsList() != null && column.getIsList() == 1) { + column.setDictType(prevColumn.getDictType()); + column.setQueryType(prevColumn.getQueryType()); + } + + if (prevColumn.getIsRequired() == 1 + && column.getIsPk() == 0 + && (column.getIsInsert() == 1 || column.getIsEdit() == 1)) { + column.setHtmlType(prevColumn.getHtmlType()); + column.setIsRequired(prevColumn.getIsRequired()); + } + + genTableColumnMapper.updateById(column); + } else { + genTableColumnMapper.insert(column); + } + }); + + // 删除弃用字段 + List dbTableColumnNames = columns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); + List delColumns = genTableColumns.stream() + .filter(column -> !dbTableColumnNames.contains(column.getColumnName())) + .collect(Collectors.toList()); + if (StringUtil.isNotEmpty(delColumns)) { + for (GenTableColumn item : delColumns) { + genTableColumnMapper.deleteById(item); + } + } } /** @@ -362,7 +328,6 @@ public class GenerateServiceImpl implements IGenerateService { */ @Override public Map previewCode(Integer id) { - GenTable table = genTableMapper.selectById(id); // 初始模板 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index f6a30039..a4322d4c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -1,12 +1,126 @@ package com.hxkj.generator.util; +import com.hxkj.common.constant.GenConstants; import com.hxkj.common.utils.StringUtil; +import com.hxkj.generator.config.GenConfig; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; +import java.util.Map; public class GenUtil { + /** + * 初始化表 + * + * @author fzr + * @param table 表 + * @param map 参数 + */ + public static void initTable(GenTable table, Map map) { + String tableName = map.get("table_name"); + String tableDesc = map.get("table_comment"); + table.setTableName(tableName); + table.setTableComment(tableDesc); + table.setAuthorName(GenConfig.authorName); + table.setEntityName(GenUtil.toClassName(tableName)); + table.setModuleName(GenUtil.toModuleName(GenConfig.packageName)); + table.setPackageName(GenConfig.packageName); + table.setBusinessName(GenUtil.toBusinessName(tableName)); + table.setFunctionName(GenUtil.replaceText(tableDesc)); + table.setCreateTime(System.currentTimeMillis() / 1000); + table.setUpdateTime(System.currentTimeMillis() / 1000); + } + + /** + * 初始化字段列 + * + * @author fzr + * @param column 列 + * @param table 表 + */ + public static void initColumn(GenTableColumn column, GenTable table) { + String columnName = column.getColumnName(); + String columnType = GenUtil.getDbType(column.getColumnType()); + column.setTableId(table.getId()); + column.setJavaField(StringUtil.toCamelCase(columnName)); + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + column.setIsInsert(GenConstants.REQUIRE); + column.setUpdateTime(table.getUpdateTime()); + column.setCreateTime(table.getCreateTime()); + + // 文本域组 + if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || + GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { + Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) + ? GenConstants.HTML_TEXTAREA + : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); + } + + // 日期组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } + + // 数字组件 + else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { + column.setHtmlType(GenConstants.HTML_INPUT); + String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { + column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { + column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 + } else { + column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + } + } + + // 编辑字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + column.setIsEdit(GenConstants.REQUIRE); + } + + // 列表字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { + column.setIsList(GenConstants.REQUIRE); + } + + // 查询字段 + if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { + column.setIsQuery(GenConstants.REQUIRE); + } + + // 查询字段类型 + if (StringUtil.endsWithIgnoreCase(columnName, "name")) { + column.setQueryType(GenConstants.QUERY_LIKE); + } + + // 根据字段设置 + if (StringUtil.endsWithIgnoreCase(columnName, "status")) { + // 状态字段设置单选框 + column.setHtmlType(GenConstants.HTML_RADIO); + } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || + StringUtil.endsWithIgnoreCase(columnName, "sex")) { + // 类型&性别字段设置下拉框 + column.setHtmlType(GenConstants.HTML_SELECT); + } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { + // 图片字段设置图片上传控件 + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { + // 文件字段设置文件上传控件 + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { + // 内容字段的设置富文本控件 + column.setHtmlType(GenConstants.HTML_EDITOR); + } + } + /** * 转模块名 * @@ -14,8 +128,7 @@ public class GenUtil { * @param packageName 包名 * @return 模块名 */ - public static String toModuleName(String packageName) - { + public static String toModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); return StringUtil.substring(packageName, lastIndex + 1, nameLength); @@ -28,8 +141,7 @@ public class GenUtil { * @param tableName 表名 * @return 业务名 */ - public static String toBusinessName(String tableName) - { + public static String toBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtil.substring(tableName, lastIndex + 1, nameLength); @@ -42,8 +154,7 @@ public class GenUtil { * @param tableName 表名称 * @return 类名 */ - public static String toClassName(String tableName) - { + public static String toClassName(String tableName) { String tablePrefix = "ls_"; if (StringUtil.isNotEmpty(tablePrefix)) { String[] searchList = StringUtil.split(tablePrefix, ","); @@ -60,8 +171,7 @@ public class GenUtil { * @param searchList 替换列表 * @return String */ - public static String replaceFirst(String replaceVal, String[] searchList) - { + public static String replaceFirst(String replaceVal, String[] searchList) { String text = replaceVal; for (String searchString : searchList) { if (replaceVal.startsWith(searchString)) { @@ -79,8 +189,7 @@ public class GenUtil { * @param text 需要被替换的名字 * @return 替换后的名字 */ - public static String replaceText(String text) - { + public static String replaceText(String text) { return RegExUtils.replaceAll(text, "(?:表)", ""); } @@ -90,10 +199,9 @@ public class GenUtil { * @author fzr * @param arr 数组 * @param targetValue 值 - * @return 是否包含 + * @return Boolean */ - public static boolean isArraysContains(String[] arr, String targetValue) - { + public static Boolean isArraysContains(String[] arr, String targetValue) { return Arrays.asList(arr).contains(targetValue); } @@ -102,10 +210,9 @@ public class GenUtil { * * @author fzr * @param columnType 列类型 - * @return 截取后的列类型 + * @return String */ - public static String getDbType(String columnType) - { + public static String getDbType(String columnType) { if (StringUtil.indexOf(columnType, "(") > 0) { return StringUtil.substringBefore(columnType, "("); } @@ -121,8 +228,7 @@ public class GenUtil { * @param columnType 列类型 * @return 截取后的列类型 */ - public static Integer getColumnLength(String columnType) - { + public static Integer getColumnLength(String columnType) { if (StringUtil.indexOf(columnType, "(") > 0) { String length = StringUtil.substringBetween(columnType, "(", ")"); return Integer.valueOf(length); @@ -132,8 +238,4 @@ public class GenUtil { } } - public static void setPkColumn() { - - } - } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 689f87bb..4c024088 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -8,8 +8,6 @@ import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; -import java.sql.Time; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -19,8 +17,7 @@ public class VelocityUtil { /** * 初始化vm方法 */ - public static void initVelocity() - { + public static void initVelocity() { try { Properties p = new Properties(); p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); @@ -37,8 +34,7 @@ public class VelocityUtil { * * @return 模板列表 */ - public static VelocityContext prepareContext(GenTable genTable) - { + public static VelocityContext prepareContext(GenTable genTable) { String moduleName = genTable.getModuleName(); String businessName = genTable.getBusinessName(); String packageName = genTable.getPackageName(); @@ -64,8 +60,7 @@ public class VelocityUtil { * * @return 模板列表 */ - public static List getTemplateList(String genTpl) - { + public static List getTemplateList(String genTpl) { List templates = new LinkedList<>(); templates.add("java/controller.java.vm"); From ca43595e8f6cd815e91a288017554b8ca703a4cd Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 15 Jun 2022 14:21:31 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LikeAdminApplication.java | 2 +- .../LikeAdminInterceptor.java | 8 +- .../LikeAdminThreadLocal.java | 2 +- .../config/AdminConfig.java | 2 +- .../config/MybatisPlusConfig.java | 2 +- .../config/WebMvcConfig.java | 4 +- .../{generator => admin}/config/aop/Log.java | 2 +- .../config/aop/LogAspect.java | 6 +- .../controller/AlbumController.java | 12 +- .../controller/ArticleController.java | 18 +- .../controller/IndexController.java | 4 +- .../controller/UploadController.java | 8 +- .../controller/monitor/CacheController.java | 4 +- .../controller/monitor/ServerController.java | 4 +- .../controller/setting/BasicsController.java | 6 +- .../system/SystemAdminController.java | 16 +- .../system/SystemDeptController.java | 8 +- .../system/SystemLogController.java | 10 +- .../system/SystemLoginController.java | 6 +- .../system/SystemMenuController.java | 12 +- .../system/SystemPostController.java | 10 +- .../system/SystemRoleController.java | 12 +- .../service/IAlbumService.java | 8 +- .../service/IArticleService.java | 14 +- .../service/IBasicsService.java | 2 +- .../service/IIndexService.java | 2 +- .../service/ISystemAdminService.java | 10 +- .../service/ISystemDeptService.java | 6 +- .../service/ISystemLogServer.java | 8 +- .../service/ISystemLoginService.java | 4 +- .../service/ISystemMenuService.java | 6 +- .../service/ISystemPostService.java | 8 +- .../service/ISystemRoleMenuService.java | 2 +- .../service/ISystemRoleService.java | 8 +- .../service/impl/AlbumServiceImpl.java | 12 +- .../service/impl/ArticleServiceImpl.java | 16 +- .../service/impl/BasicsServiceImpl.java | 4 +- .../service/impl/IndexServiceImpl.java | 4 +- .../service/impl/SystemAdminServiceImpl.java | 22 +- .../service/impl/SystemDeptServiceImpl.java | 8 +- .../service/impl/SystemLogServerImpl.java | 10 +- .../service/impl/SystemLoginServiceImpl.java | 10 +- .../service/impl/SystemMenuServiceImpl.java | 14 +- .../service/impl/SystemPostService.java | 10 +- .../impl/SystemRoleMenuServiceImpl.java | 6 +- .../service/impl/SystemRoleServiceImpl.java | 14 +- .../validate/AlbumParam.java | 2 +- .../validate/PageParam.java | 2 +- .../validate/article/ArticleParam.java | 2 +- .../validate/article/CategoryParam.java | 2 +- .../validate/system/SystemAdminParam.java | 2 +- .../validate/system/SystemDeptParam.java | 2 +- .../validate/system/SystemLoginParam.java | 2 +- .../validate/system/SystemMenuParam.java | 2 +- .../validate/system/SystemPostParam.java | 2 +- .../validate/system/SystemRoleParam.java | 2 +- .../vo/album/AlbumCateVo.java | 2 +- .../vo/album/AlbumVo.java | 2 +- .../vo/article/ArticleDetailVo.java | 2 +- .../vo/article/ArticleListVo.java | 2 +- .../vo/article/CategoryVo.java | 2 +- .../vo/system/LogLoginVo.java | 2 +- .../vo/system/LogOperateVo.java | 2 +- .../vo/system/SystemAdminVo.java | 2 +- .../vo/system/SystemAuthVo.java | 2 +- .../vo/system/SystemDeptVo.java | 2 +- .../vo/system/SystemMenuVo.java | 2 +- .../vo/system/SystemPostVo.java | 2 +- .../vo/system/SystemRoleVo.java | 2 +- .../vo/system/SystemSelfVo.java | 2 +- .../config/GenConfig.java | 2 +- .../controller/GenController.java | 12 +- .../{generator => admin}/entity/GenTable.java | 2 +- .../entity/GenTableColumn.java | 2 +- .../mapper/GenTableColumnMapper.java | 4 +- .../mapper/GenTableMapper.java | 8 +- .../service/IGenerateService.java | 11 +- .../service/impl/GenerateServiceImpl.java | 37 +-- .../{generator => admin}/util/GenUtil.java | 10 +- .../com/hxkj/admin/util/VelocityUtil.java | 75 +++++ .../validate/GenParam.java | 2 +- .../validate/PageParam.java | 2 +- .../{generator => admin}/vo/DbTableVo.java | 2 +- .../{generator => admin}/vo/GenColumnVo.java | 2 +- .../{generator => admin}/vo/GenTableVo.java | 2 +- .../com/hxkj/generator/util/VelocityUtil.java | 78 ------ .../main/resources/java/controller.java.vm | 24 +- .../src/main/resources/java/entity.java.vm | 18 ++ .../src/main/resources/java/mapper.java.vm | 12 + .../src/main/resources/java/service.java.vm | 97 +++++++ .../main/resources/java/serviceImpl.java.vm | 260 ++++++++++++++++++ 91 files changed, 730 insertions(+), 346 deletions(-) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/LikeAdminApplication.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/LikeAdminInterceptor.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/LikeAdminThreadLocal.java (98%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/config/AdminConfig.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/config/MybatisPlusConfig.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/config/WebMvcConfig.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/config/aop/Log.java (85%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/config/aop/LogAspect.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/AlbumController.java (93%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/ArticleController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/IndexController.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/UploadController.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/monitor/CacheController.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/monitor/ServerController.java (88%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/setting/BasicsController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemAdminController.java (89%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemDeptController.java (92%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemLogController.java (85%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemLoginController.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemMenuController.java (88%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemPostController.java (90%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/controller/system/SystemRoleController.java (88%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/IAlbumService.java (90%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/IArticleService.java (84%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/IBasicsService.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/IIndexService.java (89%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemAdminService.java (87%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemDeptService.java (87%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemLogServer.java (78%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemLoginService.java (80%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemMenuService.java (86%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemPostService.java (85%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemRoleMenuService.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/ISystemRoleService.java (83%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/AlbumServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/ArticleServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/BasicsServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/IndexServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemAdminServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemDeptServiceImpl.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemLogServerImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemLoginServiceImpl.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemMenuServiceImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemPostService.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemRoleMenuServiceImpl.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/service/impl/SystemRoleServiceImpl.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/AlbumParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/PageParam.java (95%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/article/ArticleParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/article/CategoryParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemAdminParam.java (98%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemDeptParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemLoginParam.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemMenuParam.java (98%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemPostParam.java (97%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/validate/system/SystemRoleParam.java (96%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/album/AlbumCateVo.java (89%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/album/AlbumVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/article/ArticleDetailVo.java (92%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/article/ArticleListVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/article/CategoryVo.java (88%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/LogLoginVo.java (90%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/LogOperateVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemAdminVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemAuthVo.java (86%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemDeptVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemMenuVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemPostVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemRoleVo.java (92%) rename server/like-admin/src/main/java/com/hxkj/{generator => admin}/vo/system/SystemSelfVo.java (80%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/config/GenConfig.java (90%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/controller/GenController.java (92%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/entity/GenTable.java (96%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/entity/GenTableColumn.java (96%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/mapper/GenTableColumnMapper.java (71%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/mapper/GenTableMapper.java (95%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/service/IGenerateService.java (85%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/service/impl/GenerateServiceImpl.java (93%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/util/GenUtil.java (97%) create mode 100644 server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/validate/GenParam.java (98%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/validate/PageParam.java (95%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/vo/DbTableVo.java (92%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/vo/GenColumnVo.java (97%) rename server/like-generator/src/main/java/com/hxkj/{generator => admin}/vo/GenTableVo.java (94%) delete mode 100644 server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java index 21ebf84e..f8c23949 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminApplication.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java @@ -1,4 +1,4 @@ -package com.hxkj.generator; +package com.hxkj.admin; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java index 41164ff0..abb83e30 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java @@ -1,10 +1,10 @@ -package com.hxkj.generator; +package com.hxkj.admin; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.HttpEnum; import com.hxkj.common.utils.RedisUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java rename to server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java index 6bff4fde..77ff28d2 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/LikeAdminThreadLocal.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java @@ -1,4 +1,4 @@ -package com.hxkj.generator; +package com.hxkj.admin; import java.util.LinkedHashMap; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index a81e0cee..a3d19d33 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; /** * 后台公共配置 diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java index 4a5c8a38..08026f47 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/MybatisPlusConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java index 8d7a1602..1444be62 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/WebMvcConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; -import com.hxkj.generator.LikeAdminInterceptor; +import com.hxkj.admin.LikeAdminInterceptor; import com.hxkj.common.config.GlobalConfig; import com.hxkj.common.utils.YmlUtil; import org.springframework.context.annotation.Configuration; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java index 618b84a9..979e92a8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/Log.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config.aop; +package com.hxkj.admin.config.aop; import java.lang.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java rename to server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java index 7d4c86b3..e4f31e22 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.config.aop; +package com.hxkj.admin.config.aop; import com.alibaba.fastjson.JSON; -import com.hxkj.generator.LikeAdminThreadLocal; +import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.common.entity.system.SystemLogOperate; import com.hxkj.common.mapper.system.SystemLogOperateMapper; import com.hxkj.common.utils.IpUtil; @@ -36,7 +36,7 @@ public class LogAspect { /** * 声明切面点拦截那些类 */ - @Pointcut("@annotation(com.hxkj.generator.config.aop.Log)") + @Pointcut("@annotation(com.hxkj.admin.config.aop.Log)") private void pointCutMethodController() {} /** diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java index 53bf0d46..826742d0 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IAlbumService; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IAlbumService; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.ArrayUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java index b221082a..4c703705 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/ArticleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IArticleService; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IArticleService; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java index 43db587f..21f8a5e4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/IndexController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.service.IIndexService; +import com.hxkj.admin.service.IIndexService; import com.hxkj.common.core.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java index 6ee238bd..152ab16b 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IAlbumService; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IAlbumService; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.enums.AlbumEnum; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java index dee12f0f..73cb857a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/CacheController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.monitor; +package com.hxkj.admin.controller.monitor; -import com.hxkj.generator.config.aop.Log; +import com.hxkj.admin.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.utils.StringUtil; import org.springframework.data.redis.connection.RedisServerCommands; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java index e8e22115..a890c4f8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/monitor/ServerController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.controller.monitor; +package com.hxkj.admin.controller.monitor; -import com.hxkj.generator.config.aop.Log; +import com.hxkj.admin.config.aop.Log; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.ServerResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java index eac566e4..3ae2cfff 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/setting/BasicsController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.setting; +package com.hxkj.admin.controller.setting; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.IBasicsService; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.IBasicsService; import com.hxkj.common.core.AjaxResult; import org.springframework.web.bind.annotation.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java index 0345a3da..ca125b9f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemAdminController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java @@ -1,12 +1,12 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java index fccd88fe..85e9162a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemDeptController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.service.ISystemDeptService; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.service.ISystemDeptService; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java index 8c077e74..549de132 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLogController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemLogServer; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.service.ISystemLogServer; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java index 8e667ffb..817b41b3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemLoginController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemLoginService; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.exception.LoginException; import com.hxkj.common.exception.OperateException; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java index 642298ab..4539e97d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemMenuController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemMenuService; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemMenuService; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java index ef253d62..a3a6ec17 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemPostController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemPostController.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.service.ISystemPostService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.service.ISystemPostService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java rename to server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java index 764a42f9..fcff8669 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/controller/system/SystemRoleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java @@ -1,10 +1,10 @@ -package com.hxkj.generator.controller.system; +package com.hxkj.admin.controller.system; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java index eb8127fc..09257fb2 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IAlbumService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java similarity index 84% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java index f289041b..7ad505ac 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IArticleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java index d84e9641..6ca9660d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IBasicsService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java index 339eab32..eebf56db 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/IIndexService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java index 8d5aaa9b..8047ae2f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemAdminService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java similarity index 87% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java index ed87ce68..f0291401 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemDeptService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import java.util.List; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java similarity index 78% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java index a121310a..d7d45409 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLogServer.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java index dc2a61a5..5aa1c7b5 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemLoginService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.validate.system.SystemLoginParam; import java.util.Map; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java similarity index 86% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java index 9f4921a3..f5791fdd 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.alibaba.fastjson.JSONArray; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; /** * 系统菜单服务接口类 diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java similarity index 85% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java index 6efb0340..4224dc53 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemPostService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java index c40a5a19..1fa03f7f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleMenuService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java similarity index 83% rename from server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java index 1689b6b4..96451a6a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/ISystemRoleService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import org.springframework.validation.annotation.Validated; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java index a62394f5..c3acf31f 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.service.IAlbumService; -import com.hxkj.generator.validate.AlbumParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.album.AlbumCateVo; -import com.hxkj.generator.vo.album.AlbumVo; +import com.hxkj.admin.service.IAlbumService; +import com.hxkj.admin.validate.AlbumParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.album.AlbumCateVo; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Album; import com.hxkj.common.entity.AlbumCate; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java index 82862b29..f95d9022 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/ArticleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java @@ -1,16 +1,16 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.service.IArticleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.article.CategoryParam; -import com.hxkj.generator.validate.article.ArticleParam; -import com.hxkj.generator.vo.article.ArticleDetailVo; -import com.hxkj.generator.vo.article.ArticleListVo; -import com.hxkj.generator.vo.article.CategoryVo; +import com.hxkj.admin.service.IArticleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.article.CategoryParam; +import com.hxkj.admin.validate.article.ArticleParam; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; +import com.hxkj.admin.vo.article.CategoryVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.Article; import com.hxkj.common.entity.ArticleCategory; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java index 26d61693..1aae9a21 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/BasicsServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java @@ -1,6 +1,6 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; -import com.hxkj.generator.service.IBasicsService; +import com.hxkj.admin.service.IBasicsService; import com.hxkj.common.utils.ConfigUtil; import com.hxkj.common.utils.UrlUtil; import org.springframework.stereotype.Service; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java index 1a76cde5..af08b64b 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/IndexServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.generator.service.IIndexService; +import com.hxkj.admin.service.IIndexService; import com.hxkj.common.entity.Article; import com.hxkj.common.mapper.ArticleMapper; import com.hxkj.common.utils.ConfigUtil; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java index 0b4101e1..11071690 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemRoleVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemMenu; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java index 76c07401..f4c1ced7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemDeptServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java @@ -1,11 +1,11 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.generator.service.ISystemDeptService; -import com.hxkj.generator.validate.system.SystemDeptParam; -import com.hxkj.generator.vo.system.SystemDeptVo; +import com.hxkj.admin.service.ISystemDeptService; +import com.hxkj.admin.validate.system.SystemDeptParam; +import com.hxkj.admin.vo.system.SystemDeptVo; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemDept; import com.hxkj.common.mapper.system.SystemAdminMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java index 931f6cd5..e4fc3a3d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.generator.service.ISystemLogServer; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.system.LogLoginVo; -import com.hxkj.generator.vo.system.LogOperateVo; +import com.hxkj.admin.service.ISystemLogServer; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.system.LogLoginVo; +import com.hxkj.admin.vo.system.LogOperateVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.entity.system.SystemLogOperate; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java index 0d04bd7e..bc1fe9d6 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemLoginServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.service.ISystemLoginService; -import com.hxkj.generator.validate.system.SystemLoginParam; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemLoginService; +import com.hxkj.admin.validate.system.SystemLoginParam; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemLogLogin; import com.hxkj.common.enums.HttpEnum; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java index b7c6a0cd..6f766f13 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java @@ -1,14 +1,14 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemMenuService; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.validate.system.SystemMenuParam; -import com.hxkj.generator.vo.system.SystemMenuVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemMenuService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.validate.system.SystemMenuParam; +import com.hxkj.admin.vo.system.SystemMenuVo; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; import com.hxkj.common.utils.*; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java index d17350db..b9770414 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java @@ -1,13 +1,13 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.service.ISystemPostService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemPostParam; -import com.hxkj.generator.vo.system.SystemPostVo; +import com.hxkj.admin.service.ISystemPostService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemPostParam; +import com.hxkj.admin.vo.system.SystemPostVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemPost; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java index 422117ca..f91a1200 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java @@ -1,8 +1,8 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemRoleMenuService; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemRoleMenuService; import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.entity.system.SystemRoleMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java rename to server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java index 262726a4..08e981a3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/service/impl/SystemRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java @@ -1,15 +1,15 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hxkj.generator.config.AdminConfig; -import com.hxkj.generator.service.ISystemRoleMenuService; -import com.hxkj.generator.service.ISystemRoleService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemRoleParam; -import com.hxkj.generator.vo.system.SystemRoleVo; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemRoleParam; +import com.hxkj.admin.vo.system.SystemRoleVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.system.SystemAdmin; import com.hxkj.common.entity.system.SystemRole; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java index cca10286..0900576d 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/AlbumParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java similarity index 95% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java index a175e6a8..405a2428 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/PageParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java index c294e7c3..f5693ef4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.article; +package com.hxkj.admin.validate.article; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java index e0cfc593..5965b8a7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.article; +package com.hxkj.admin.validate.article; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java index 9a07fec9..ce5abfb7 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemAdminParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java index 8c4e8f36..c6a866ce 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemDeptParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemDeptParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java index 948fc335..90b412fb 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemLoginParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java similarity index 98% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java index 638541ca..e9d1d43a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemMenuParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java index 90f1ae4e..77c18b4a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemPostParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemPostParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java index 12385f77..8952d480 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/validate/system/SystemRoleParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate.system; +package com.hxkj.admin.validate.system; import com.hxkj.common.validator.annotation.IDMust; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java similarity index 89% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java index cc63b5ec..000ca700 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java index 12deb077..53dcb2ed 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java index dee859ac..4af833ee 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java index 5d251160..99361ab3 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java similarity index 88% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java index 3bef1641..76731fe8 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/article/CategoryVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java similarity index 90% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java index 924e4885..04dd8406 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogLoginVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java index c65f8f69..320734f4 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/LogOperateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java index fb457381..9d91caae 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAdminVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java similarity index 86% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java index 37bbf59c..97b76f1a 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemAuthVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAuthVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java index cda4a397..405b06a9 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemDeptVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemDeptVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java index 6543da39..6c1ca055 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemMenuVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java index bd5efe1e..9a894450 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemPostVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemPostVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java similarity index 92% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java index 08bc1c93..fb9593bb 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemRoleVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java similarity index 80% rename from server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java index 1297a6aa..1915a32e 100644 --- a/server/like-admin/src/main/java/com/hxkj/generator/vo/system/SystemSelfVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemSelfVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo.system; +package com.hxkj.admin.vo.system; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java similarity index 90% rename from server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java rename to server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java index e171a0a6..f3e2be36 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.config; +package com.hxkj.admin.config; public class GenConfig { diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java rename to server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java index 815698ed..92df954f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java @@ -1,14 +1,14 @@ -package com.hxkj.generator.controller; +package com.hxkj.admin.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; -import com.hxkj.generator.service.IGenerateService; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java rename to server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java index 4c848652..137d44b9 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.entity; +package com.hxkj.admin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java rename to server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java index 1b39cc4a..7f2fac31 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.entity; +package com.hxkj.admin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java similarity index 71% rename from server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java rename to server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java index 218db9e2..d217a96e 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.generator.mapper; +package com.hxkj.admin.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.admin.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java rename to server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java index 52f6a924..dcfff793 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.hxkj.generator.mapper; +package com.hxkj.admin.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; -import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.admin.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java similarity index 85% rename from server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java rename to server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java index e4af40fd..e34daae4 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java @@ -1,12 +1,11 @@ -package com.hxkj.generator.service; +package com.hxkj.admin.service; import com.hxkj.common.core.PageResult; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenTableVo; -import java.util.List; import java.util.Map; /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java similarity index 93% rename from server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java rename to server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java index 5acb2dd7..b1ebaca2 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java @@ -1,31 +1,27 @@ -package com.hxkj.generator.service.impl; +package com.hxkj.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; -import com.hxkj.common.constant.GenConstants; import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; -import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; -import com.hxkj.common.utils.ToolsUtil; -import com.hxkj.generator.config.GenConfig; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; -import com.hxkj.generator.mapper.GenTableColumnMapper; -import com.hxkj.generator.mapper.GenTableMapper; -import com.hxkj.generator.service.IGenerateService; -import com.hxkj.generator.util.GenUtil; -import com.hxkj.generator.util.VelocityUtil; -import com.hxkj.generator.validate.GenParam; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.vo.DbTableVo; -import com.hxkj.generator.vo.GenColumnVo; -import com.hxkj.generator.vo.GenTableVo; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.admin.mapper.GenTableColumnMapper; +import com.hxkj.admin.mapper.GenTableMapper; +import com.hxkj.admin.service.IGenerateService; +import com.hxkj.admin.util.GenUtil; +import com.hxkj.admin.util.VelocityUtil; +import com.hxkj.admin.validate.GenParam; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.admin.vo.GenColumnVo; +import com.hxkj.admin.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -329,10 +325,14 @@ public class GenerateServiceImpl implements IGenerateService { @Override public Map previewCode(Integer id) { GenTable table = genTableMapper.selectById(id); + List columns = genTableColumnMapper.selectList( + new QueryWrapper() + .eq("table_id", id) + .orderByAsc("sort")); // 初始模板 VelocityUtil.initVelocity(); - VelocityContext context = VelocityUtil.prepareContext(table); + VelocityContext context = VelocityUtil.prepareContext(table, columns); // 渲染模板 Map map = new LinkedHashMap<>(); @@ -342,6 +342,7 @@ public class GenerateServiceImpl implements IGenerateService { Template tpl = Velocity.getTemplate(template, "UTF-8"); tpl.merge(context, sw); map.put(template, sw.toString()); + System.out.println(sw); } return map; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java rename to server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java index a4322d4c..2b1e7d69 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java @@ -1,10 +1,10 @@ -package com.hxkj.generator.util; +package com.hxkj.admin.util; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.utils.StringUtil; -import com.hxkj.generator.config.GenConfig; -import com.hxkj.generator.entity.GenTable; -import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.admin.config.GenConfig; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; @@ -141,7 +141,7 @@ public class GenUtil { * @param tableName 表名 * @return 业务名 */ - public static String toBusinessName(String tableName) { + public static String toBusinessName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtil.substring(tableName, lastIndex + 1, nameLength); diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java new file mode 100644 index 00000000..5d11ccef --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java @@ -0,0 +1,75 @@ +package com.hxkj.admin.util; + +import com.hxkj.common.utils.StringUtil; +import com.hxkj.admin.entity.GenTable; +import com.hxkj.admin.entity.GenTableColumn; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; + +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; + +public class VelocityUtil { + + /** + * 初始化vm方法 + */ + public static void initVelocity() { + try { + Properties p = new Properties(); + p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); + p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); + p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); + Velocity.init(p); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 设置模板变量信息 + * + * @author fzr + * @return VelocityContext + */ + public static VelocityContext prepareContext(GenTable table, List columns) { + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("genTpl", table.getGenTpl()); + velocityContext.put("tableName", table.getTableName()); + velocityContext.put("authorName", table.getAuthorName()); + velocityContext.put("entityName", table.getEntityName()); + velocityContext.put("moduleName", table.getModuleName()); + velocityContext.put("packageName", table.getPackageName()); + velocityContext.put("businessName", StringUtil.capitalize(table.getBusinessName())); + velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); + velocityContext.put("table", table); + velocityContext.put("columns", columns); + System.out.println(table.getTableName()); + System.out.println(table.getAuthorName()); + System.out.println(table.getEntityName()); + System.out.println(table.getModuleName()); + System.out.println(table.getPackageName()); + return velocityContext; + } + + /** + * 获取模板列表 + * + * @author fzr + * @return List + */ + public static List getTemplateList(String genTpl) { + List templates = new LinkedList<>(); +// templates.add("java/controller.java.vm"); + templates.add("java/entity.java.vm"); +// templates.add("java/mapper.java.vm"); +// templates.add("java/service.java.vm"); +// templates.add("java/serviceImpl.java.vm"); +// templates.add("java/validate.java.vm"); + return templates; + } + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java rename to server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java index 3d5e9d29..bd6f9b45 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java b/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java rename to server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java index a175e6a8..405a2428 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.validate; +package com.hxkj.admin.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java index 2eaad1da..be8ab12a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java index 1f255b49..4a4a84ac 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java similarity index 94% rename from server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java rename to server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java index eb1e0e42..08c56a84 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.generator.vo; +package com.hxkj.admin.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java deleted file mode 100644 index 4c024088..00000000 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.hxkj.generator.util; - -import com.hxkj.common.utils.StringUtil; -import com.hxkj.common.utils.TimeUtil; -import com.hxkj.generator.entity.GenTable; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; - -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - -public class VelocityUtil { - - /** - * 初始化vm方法 - */ - public static void initVelocity() { - try { - Properties p = new Properties(); - p.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath"); - p.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName()); - p.setProperty(Velocity.INPUT_ENCODING, "UTF-8"); - Velocity.init(p); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * 设置模板变量信息 - * - * @return 模板列表 - */ - public static VelocityContext prepareContext(GenTable genTable) { - String moduleName = genTable.getModuleName(); - String businessName = genTable.getBusinessName(); - String packageName = genTable.getPackageName(); - String tplCategory = genTable.getGenTpl(); - String functionName = genTable.getFunctionName(); - - VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("genTpl", genTable.getGenTpl()); - velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtil.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); - velocityContext.put("ClassName", genTable.getEntityName()); - velocityContext.put("moduleName", genTable.getModuleName()); - velocityContext.put("BusinessName", StringUtil.capitalize(genTable.getBusinessName())); - velocityContext.put("businessName", genTable.getBusinessName()); - velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getAuthorName()); - velocityContext.put("datetime", TimeUtil.nowDate()); - return velocityContext; - } - - /** - * 获取模板信息 - * - * @return 模板列表 - */ - public static List getTemplateList(String genTpl) { - List templates = new LinkedList<>(); - templates.add("java/controller.java.vm"); - -// templates.add("java/domain.java.vm"); -// templates.add("java/mapper.java.vm"); -// templates.add("java/service.java.vm"); -// templates.add("java/serviceImpl.java.vm"); -// templates.add("vm/xml/mapper.xml.vm"); -// templates.add("vm/sql/sql.vm"); -// templates.add("vm/js/api.js.vm"); - return templates; - } - - -} diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 4135e697..4fe09ddc 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -1,12 +1,12 @@ package ${packageName}.controller; -import com.hxkj.generator.LikeAdminThreadLocal; -import com.hxkj.generator.config.aop.Log; -import com.hxkj.generator.service.ISystemAdminService; -import com.hxkj.generator.validate.PageParam; -import com.hxkj.generator.validate.system.SystemAdminParam; -import com.hxkj.generator.vo.system.SystemAdminVo; -import com.hxkj.generator.vo.system.SystemSelfVo; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.aop.Log; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -29,7 +29,7 @@ public class ${ClassName}Controller { /** * ${functionName}列表 * - * @author fzr + * @author ${authorName} * @return Object */ @GetMapping("/list") @@ -42,7 +42,7 @@ public class ${ClassName}Controller { /** * ${functionName}详情 * - * @author fzr + * @author ${authorName} * @param id 主键ID * @return Object */ @@ -55,7 +55,7 @@ public class ${ClassName}Controller { /** * ${functionName}新增 * - * @author fzr + * @author ${authorName} * @param systemAdminParam 参数 * @return Object */ @@ -69,7 +69,7 @@ public class ${ClassName}Controller { /** * ${functionName}编辑 * - * @author fzr + * @author ${authorName} * @param systemAdminParam 参数 * @return Object */ @@ -83,7 +83,7 @@ public class ${ClassName}Controller { /** * ${functionName}删除 * - * @author fzr + * @author ${authorName} * @return Object */ @Log(title = "${functionName}删除") diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index e69de29b..882b9ade 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -0,0 +1,18 @@ +package com.hxkj.common.entity; + +/** + * ${functionName}实体 + */ +@Data +public class ${entityName} implements Serializable { + + private static final long serialVersionUID = 1L; + + #foreach ($column in $columns) + #if($column.isPk) + @TableId(value="${column.columnName}", type= IdType.AUTO) + #end + private ${column.javaType} ${column.javaField}; + #end + +} \ No newline at end of file diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index e69de29b..05add54a 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -0,0 +1,12 @@ +package com.hxkj.common.mapper; + +import com.hxkj.common.core.basics.IBaseMapper; +import com.hxkj.common.entity.${entityName}; +import org.apache.ibatis.annotations.Mapper; + +/** + * 系统管理员 + */ +@Mapper +public interface ${entityName}Mapper extends IBaseMapper<${entityName}> { +} diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index e69de29b..8047ae2f 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -0,0 +1,97 @@ +package com.hxkj.admin.service; + +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; + +import java.util.Map; + +/** + * 系统管理员服务接口类 + */ +public interface ISystemAdminService { + + /** + * 根据账号查找管理员 + * + * @author fzr + * @param username 主键ID + * @return SysAdmin + */ + SystemAdmin findByUsername(String username); + + /** + * 管理员列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ + PageResult list(PageParam pageParam, Map params); + + /** + * 当前管理员 + * + * @author fzr + * @return SystemSelfVo + */ + SystemSelfVo self(Integer adminId); + + /** + * 管理员详情 + * + * @author fzr + * @param id 主键参数 + * @return SysAdmin + */ + SystemAdminVo detail(Integer id); + + /** + * 管理员新增 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void add(SystemAdminParam systemAdminParam); + + /** + * 管理员编辑 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void edit(SystemAdminParam systemAdminParam); + + /** + * 当前管理员更新 + * + * @author fzr + * @param systemAdminParam 参数 + */ + void upInfo(SystemAdminParam systemAdminParam, Integer adminId); + + /** + * 管理员删除 + * + * @author fzr + * @param id 主键参数 + */ + void del(Integer id); + + /** + * 管理员状态切换 + * + * @author fzr + * @param id 主键参数 + */ + void disable(Integer id); + + /** + * 缓存管理员 + */ + void cacheAdminUserByUid(Integer id); + +} diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index e69de29b..72079352 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -0,0 +1,260 @@ +package com.hxkj.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; +import com.hxkj.admin.LikeAdminThreadLocal; +import com.hxkj.admin.config.AdminConfig; +import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.ISystemRoleMenuService; +import com.hxkj.admin.service.ISystemRoleService; +import com.hxkj.admin.validate.PageParam; +import com.hxkj.admin.validate.system.SystemAdminParam; +import com.hxkj.admin.vo.system.SystemAdminVo; +import com.hxkj.admin.vo.system.SystemRoleVo; +import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.common.core.PageResult; +import com.hxkj.common.entity.system.SystemAdmin; +import com.hxkj.common.mapper.system.SystemAdminMapper; +import com.hxkj.common.mapper.system.SystemMenuMapper; +import com.hxkj.common.utils.*; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; + +/** + * 系统管理员实现类 + */ +@Service +public class SystemAdminServiceImpl implements ISystemAdminService { + + @Resource + SystemAdminMapper systemAdminMapper; + + @Resource + SystemMenuMapper systemMenuMapper; + + @Resource + ISystemRoleService iSystemRoleService; + + @Resource + ISystemRoleMenuService iSystemRoleMenuService; + + /** + * 管理员列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ + @Override + public PageResult list(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," + + "sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," + + "t.last_login_ip,t.last_login_time,t.create_time,t.update_time") + .eq("t.is_delete", 0) + .leftJoin("ls_system_role sr ON sr.id=t.role") + .leftJoin("ls_system_dept sd ON sd.id=t.dept_id") + .orderByDesc(Arrays.asList("t.id", "t.sort")); + + systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{ + "like:username:str", + "like:nickname:str", + "=:role:int" + }); + + IPage iPage = systemAdminMapper.selectJoinPage( + new Page<>(page, limit), + SystemAdminVo.class, + mpjQueryWrapper); + + for (SystemAdminVo vo : iPage.getRecords()) { + if (vo.getId() == 1) { + vo.setRole("系统管理员"); + } + + if (vo.getDept() == null) { + vo.setDept(""); + } + + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())); + vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); + vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime())); + } + + return PageResult.iPageHandle(iPage); + } + + /** + * 管理员详细 + * + * @author fzr + * @param id 主键 + * @return SysAdmin + */ + @Override + public SystemAdminVo detail(Integer id) { + SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper() + .select(SystemAdmin.class, info-> + !info.getColumn().equals("salt") && + !info.getColumn().equals("password") && + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(sysAdmin, "账号已不存在！"); + + SystemAdminVo vo = new SystemAdminVo(); + BeanUtils.copyProperties(sysAdmin, vo); + + vo.setDept(String.valueOf(vo.getDeptId())); + vo.setRole(String.valueOf(sysAdmin.getRole())); + vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); + vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); + vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); + + return vo; + } + + /** + * 管理员新增 + * + * @author fzr + * @param systemAdminParam 参数 + */ + @Override + public void add(SystemAdminParam systemAdminParam) { + String[] field = {"id", "username", "nickname"}; + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("username", systemAdminParam.getUsername()) + .last("limit 1")), "账号已存在换一个吧！"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("nickname", systemAdminParam.getNickname()) + .last("limit 1")), "昵称已存在换一个吧！"); + + SystemRoleVo roleVo = iSystemRoleService.detail(systemAdminParam.getRole()); + Assert.notNull(roleVo, "角色不存在!"); + Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!"); + + String salt = ToolsUtil.randomString(5); + String pwd = ToolsUtil.makeMd5(systemAdminParam.getPassword().trim() + salt); + String avatar = UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()); + + SystemAdmin model = new SystemAdmin(); + model.setDeptId(systemAdminParam.getDeptId()); + model.setPostId(systemAdminParam.getPostId()); + model.setUsername(systemAdminParam.getUsername()); + model.setNickname(systemAdminParam.getNickname()); + model.setRole(systemAdminParam.getRole()); + model.setAvatar(avatar); + model.setPassword(pwd); + model.setSalt(salt); + model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); + model.setIsDisable(systemAdminParam.getIsDisable()); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + systemAdminMapper.insert(model); + } + + /** + * 管理员更新 + * + * @author fzr + * @param systemAdminParam 参数 + */ + @Override + public void edit(SystemAdminParam systemAdminParam) { + String[] field = {"id", "username", "nickname"}; + Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("id", systemAdminParam.getId()) + .eq("is_delete", 0) + .last("limit 1")), "账号不存在了!"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("username", systemAdminParam.getUsername()) + .ne("id", systemAdminParam.getId()) + .last("limit 1")), "账号已存在换一个吧！"); + + Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("is_delete", 0) + .eq("nickname", systemAdminParam.getNickname()) + .ne("id", systemAdminParam.getId()) + .last("limit 1")), "昵称已存在换一个吧！"); + + Assert.notNull(iSystemRoleService.detail(systemAdminParam.getRole()), "角色不存在!"); + + SystemAdmin model = new SystemAdmin(); + model.setId(systemAdminParam.getId()); + model.setDeptId(systemAdminParam.getDeptId()); + model.setPostId(systemAdminParam.getPostId()); + model.setNickname(systemAdminParam.getNickname()); + model.setUsername(systemAdminParam.getUsername()); + model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar())); + model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole()); + model.setSort(systemAdminParam.getSort()); + model.setIsMultipoint(systemAdminParam.getIsMultipoint()); + model.setIsDisable(systemAdminParam.getIsDisable()); + model.setUpdateTime(System.currentTimeMillis() / 1000); + + if (systemAdminParam.getPassword() != null) { + String salt = ToolsUtil.randomString(5); + String pwd = ToolsUtil.makeMd5( systemAdminParam.getPassword().trim() + salt); + model.setPassword(pwd); + model.setSalt(salt); + } + + systemAdminMapper.updateById(model); + this.cacheAdminUserByUid(systemAdminParam.getId()); + } + + /** + * 管理员删除 + * + * @author fzr + * @param id 主键 + */ + @Override + public void del(Integer id) { + String[] field = {"id", "username", "nickname"}; + Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() + .select(field) + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")), "账号已不存在！"); + + Assert.isFalse(id == 1, "系统管理员不允许删除"); + + int adminId = Integer.parseInt(LikeAdminThreadLocal.getAdminId().toString()); + Assert.isFalse(id == adminId, "不能删除自己"); + + SystemAdmin model = new SystemAdmin(); + model.setId(id); + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + systemAdminMapper.updateById(model); + this.cacheAdminUserByUid(id); + } + +} From cd273a75d18182339e4c1d9adb243c2712a8ce6d Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 15 Jun 2022 14:28:37 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/GenConfig.java | 0 .../controller/GenController.java | 12 ++++----- .../{admin => generator}/entity/GenTable.java | 2 +- .../entity/GenTableColumn.java | 2 +- .../mapper/GenTableColumnMapper.java | 4 +-- .../mapper/GenTableMapper.java | 8 +++--- .../service/IGenerateService.java | 10 +++---- .../service/impl/GenerateServiceImpl.java | 26 +++++++++---------- .../{admin => generator}/util/GenUtil.java | 6 ++--- .../util/VelocityUtil.java | 6 ++--- .../validate/GenParam.java | 2 +- .../validate/PageParam.java | 2 +- .../{admin => generator}/vo/DbTableVo.java | 2 +- .../{admin => generator}/vo/GenColumnVo.java | 2 +- .../{admin => generator}/vo/GenTableVo.java | 2 +- 15 files changed, 43 insertions(+), 43 deletions(-) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/config/GenConfig.java (100%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/controller/GenController.java (92%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/entity/GenTable.java (96%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/entity/GenTableColumn.java (96%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/mapper/GenTableColumnMapper.java (71%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/mapper/GenTableMapper.java (95%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/service/IGenerateService.java (87%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/service/impl/GenerateServiceImpl.java (95%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/util/GenUtil.java (98%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/util/VelocityUtil.java (95%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/validate/GenParam.java (98%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/validate/PageParam.java (95%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/vo/DbTableVo.java (92%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/vo/GenColumnVo.java (97%) rename server/like-generator/src/main/java/com/hxkj/{admin => generator}/vo/GenTableVo.java (94%) diff --git a/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java similarity index 100% rename from server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java rename to server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java diff --git a/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java rename to server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 92df954f..815698ed 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -1,14 +1,14 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java rename to server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 137d44b9..4c848652 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.entity; +package com.hxkj.generator.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java rename to server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 7f2fac31..1b39cc4a 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.entity; +package com.hxkj.generator.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java similarity index 71% rename from server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java rename to server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java index d217a96e..218db9e2 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.mapper; +package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java rename to server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index dcfff793..52f6a924 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.mapper; +package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; -import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java similarity index 87% rename from server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java rename to server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index e34daae4..7c049ca1 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -1,10 +1,10 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import java.util.Map; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java rename to server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index b1ebaca2..e43ab672 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,18 +10,18 @@ import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; -import com.hxkj.admin.mapper.GenTableColumnMapper; -import com.hxkj.admin.mapper.GenTableMapper; -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.util.GenUtil; -import com.hxkj.admin.util.VelocityUtil; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenColumnVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.mapper.GenTableColumnMapper; +import com.hxkj.generator.mapper.GenTableMapper; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.util.GenUtil; +import com.hxkj.generator.util.VelocityUtil; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenColumnVo; +import com.hxkj.generator.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java rename to server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 2b1e7d69..8c98cadf 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -1,10 +1,10 @@ -package com.hxkj.admin.util; +package com.hxkj.generator.util; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.utils.StringUtil; import com.hxkj.admin.config.GenConfig; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java rename to server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 5d11ccef..2adde84c 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.util; +package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java rename to server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index bd6f9b45..3d5e9d29 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java rename to server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java index 405a2428..a175e6a8 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java index be8ab12a..2eaad1da 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java index 4a4a84ac..1f255b49 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java similarity index 94% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java index 08c56a84..eb1e0e42 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data; From 5ec1e82d8b050b01b5cb012f5499a8db9a19c144 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 15 Jun 2022 17:14:20 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/generator/util/VelocityUtil.java | 12 +- .../main/resources/java/controller.java.vm | 29 ++- .../src/main/resources/java/mapper.java.vm | 2 +- .../src/main/resources/java/service.java.vm | 81 +++------ .../main/resources/java/serviceImpl.java.vm | 166 ++++-------------- .../src/main/resources/java/validate.java.vm | 39 ++++ 6 files changed, 113 insertions(+), 216 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 2adde84c..57a1ac28 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -40,18 +40,14 @@ public class VelocityUtil { velocityContext.put("genTpl", table.getGenTpl()); velocityContext.put("tableName", table.getTableName()); velocityContext.put("authorName", table.getAuthorName()); - velocityContext.put("entityName", table.getEntityName()); + velocityContext.put("EntityName", table.getEntityName()); + velocityContext.put("entityName", StringUtil.uncapitalize(table.getEntityName())); velocityContext.put("moduleName", table.getModuleName()); velocityContext.put("packageName", table.getPackageName()); velocityContext.put("businessName", StringUtil.capitalize(table.getBusinessName())); velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); velocityContext.put("table", table); velocityContext.put("columns", columns); - System.out.println(table.getTableName()); - System.out.println(table.getAuthorName()); - System.out.println(table.getEntityName()); - System.out.println(table.getModuleName()); - System.out.println(table.getPackageName()); return velocityContext; } @@ -64,10 +60,10 @@ public class VelocityUtil { public static List getTemplateList(String genTpl) { List templates = new LinkedList<>(); // templates.add("java/controller.java.vm"); - templates.add("java/entity.java.vm"); +// templates.add("java/entity.java.vm"); // templates.add("java/mapper.java.vm"); // templates.add("java/service.java.vm"); -// templates.add("java/serviceImpl.java.vm"); + templates.add("java/serviceImpl.java.vm"); // templates.add("java/validate.java.vm"); return templates; } diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 4fe09ddc..db838a2c 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -2,11 +2,10 @@ package ${packageName}.controller; import com.hxkj.admin.LikeAdminThreadLocal; import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.ISystemAdminService; +import com.hxkj.admin.service.I${EntityName}Service; import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.admin.validate.system.${EntityName}Param; +import com.hxkj.admin.vo.system.${EntityName}Vo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -24,7 +23,7 @@ import java.util.Map; public class ${ClassName}Controller { @Resource - ISystemAdminService iSystemAdminService; + I${EntityName}Service i${EntityName}AdminService; /** * ${functionName}列表 @@ -35,7 +34,7 @@ public class ${ClassName}Controller { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult list = iSystemAdminService.list(pageParam, params); + PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params); return AjaxResult.success(list); } @@ -48,7 +47,7 @@ public class ${ClassName}Controller { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - SystemAdminVo vo = iSystemAdminService.detail(id); + ${EntityName}Vo vo = i${EntityName}Service.detail(id); return AjaxResult.success(vo); } @@ -56,13 +55,13 @@ public class ${ClassName}Controller { * ${functionName}新增 * * @author ${authorName} - * @param systemAdminParam 参数 + * @param ${entityName}Param 参数 * @return Object */ @Log(title = "${functionName}新增") @PostMapping("/add") - public Object add(@Validated(value = SystemAdminParam.create.class) @RequestBody SystemAdminParam systemAdminParam) { - iSystemAdminService.add(systemAdminParam); + public Object add(@Validated(value = ${EntityName}Param.create.class) @RequestBody ${EntityName}Param ${entityName}Param) { + i${EntityName}Service.add(systemAdminParam); return AjaxResult.success(); } @@ -70,13 +69,13 @@ public class ${ClassName}Controller { * ${functionName}编辑 * * @author ${authorName} - * @param systemAdminParam 参数 + * @param ${entityName}Param 参数 * @return Object */ @Log(title = "${functionName}编辑") @PostMapping("/edit") - public Object edit(@Validated(value = SystemAdminParam.update.class) @RequestBody SystemAdminParam systemAdminParam) { - iSystemAdminService.edit(systemAdminParam); + public Object edit(@Validated(value = ${EntityName}Param.update.class}) @RequestBody ${EntityName}Param} ${entityName}Param}) { + i${EntityName}Service.edit(${entityName}Param}); return AjaxResult.success(); } @@ -88,8 +87,8 @@ public class ${ClassName}Controller { */ @Log(title = "${functionName}删除") @PostMapping("/del") - public Object del(@Validated(value = SystemAdminParam.delete.class) @RequestBody SystemAdminParam systemAdminParam) { - iSystemAdminService.del(systemAdminParam.getId()); + public Object del(@Validated(value = ${EntityName}Param.delete.class) @RequestBody ${EntityName}Param ${entityName}Param) { + i${EntityName}Service.del(${entityName}Param.getId()); return AjaxResult.success(); } diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index 05add54a..59c8f9a0 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -5,7 +5,7 @@ import com.hxkj.common.entity.${entityName}; import org.apache.ibatis.annotations.Mapper; /** - * 系统管理员 + * ${functionName} */ @Mapper public interface ${entityName}Mapper extends IBaseMapper<${entityName}> { diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 8047ae2f..4647dfc5 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -1,97 +1,58 @@ package com.hxkj.admin.service; import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemSelfVo; +import com.hxkj.admin.validate.${EntityName}Param; +import com.hxkj.admin.vo.system.${EntityName}Vo; import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.system.SystemAdmin; +import com.hxkj.common.entity.${EntityName}; import java.util.Map; /** - * 系统管理员服务接口类 + * ${functionName}服务接口类 */ public interface ISystemAdminService { /** - * 根据账号查找管理员 + * ${functionName}列表 * - * @author fzr - * @param username 主键ID - * @return SysAdmin - */ - SystemAdmin findByUsername(String username); - - /** - * 管理员列表 - * - * @author fzr + * @author ${authorName} * @param pageParam 分页参数 - * @return PageResult + * @return PageResult<${EntityName}Vo}> */ - PageResult list(PageParam pageParam, Map params); + PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); /** - * 当前管理员 + * ${functionName}详情 * - * @author fzr - * @return SystemSelfVo - */ - SystemSelfVo self(Integer adminId); - - /** - * 管理员详情 - * - * @author fzr + * @author ${authorName} * @param id 主键参数 - * @return SysAdmin + * @return ${EntityName}Vo */ SystemAdminVo detail(Integer id); /** - * 管理员新增 + * ${functionName}新增 * - * @author fzr - * @param systemAdminParam 参数 + * @author ${authorName} + * @param ${entityName}Param 参数 */ - void add(SystemAdminParam systemAdminParam); + void add(${EntityName}Param ${entityName}Param); /** - * 管理员编辑 + * ${functionName}编辑 * - * @author fzr - * @param systemAdminParam 参数 + * @author ${authorName} + * @param ${entityName}Param 参数 */ - void edit(SystemAdminParam systemAdminParam); + void edit(${EntityName}Param ${entityName}Param); /** - * 当前管理员更新 + * ${functionName}删除 * - * @author fzr - * @param systemAdminParam 参数 - */ - void upInfo(SystemAdminParam systemAdminParam, Integer adminId); - - /** - * 管理员删除 - * - * @author fzr + * @author ${authorName} * @param id 主键参数 */ void del(Integer id); - /** - * 管理员状态切换 - * - * @author fzr - * @param id 主键参数 - */ - void disable(Integer id); - - /** - * 缓存管理员 - */ - void cacheAdminUserByUid(Integer id); - } diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 72079352..b95367dc 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -27,65 +27,41 @@ import javax.annotation.Resource; import java.util.*; /** - * 系统管理员实现类 + * ${functionName}实现类 */ @Service -public class SystemAdminServiceImpl implements ISystemAdminService { +public class ${EntityName}ServiceImpl implements I${EntityName}Service { @Resource - SystemAdminMapper systemAdminMapper; - - @Resource - SystemMenuMapper systemMenuMapper; - - @Resource - ISystemRoleService iSystemRoleService; - - @Resource - ISystemRoleMenuService iSystemRoleMenuService; + ${EntityName}Mapper ${entityName}Mapper; /** - * 管理员列表 + * ${functionName}列表 * - * @author fzr + * @author ${authorName} * @param pageParam 分页参数 * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Map params) { + public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); - MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); - mpjQueryWrapper.select("t.id,t.dept_id,t.post_id,t.username,t.nickname,t.avatar," + - "sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," + - "t.last_login_ip,t.last_login_time,t.create_time,t.update_time") - .eq("t.is_delete", 0) - .leftJoin("ls_system_role sr ON sr.id=t.role") - .leftJoin("ls_system_dept sd ON sd.id=t.dept_id") - .orderByDesc(Arrays.asList("t.id", "t.sort")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", 0); + queryWrapper.orderByDesc(Arrays.asList("id", "sort")); - systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{ + #if($column.isPk) + systemAdminMapper.setSearch(queryWrapper, params, new String[]{ "like:username:str", "like:nickname:str", "=:role:int" }); + #end - IPage iPage = systemAdminMapper.selectJoinPage( - new Page<>(page, limit), - SystemAdminVo.class, - mpjQueryWrapper); + IPage iPage = systemAdminMapper.selectPage(new Page<>(page, limit), queryWrapper); for (SystemAdminVo vo : iPage.getRecords()) { - if (vo.getId() == 1) { - vo.setRole("系统管理员"); - } - - if (vo.getDept() == null) { - vo.setDept(""); - } - - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime())); @@ -95,20 +71,20 @@ public class SystemAdminServiceImpl implements ISystemAdminService { } /** - * 管理员详细 + * ${functionName}详细 * - * @author fzr + * @author ${authorName} * @param id 主键 * @return SysAdmin */ @Override - public SystemAdminVo detail(Integer id) { + public ${EntityName}Vo detail(Integer id) { SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper() .select(SystemAdmin.class, info-> - !info.getColumn().equals("salt") && - !info.getColumn().equals("password") && - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + !info.getColumn().equals("salt") && + !info.getColumn().equals("password") && + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) .eq("id", id) .eq("is_delete", 0) .last("limit 1")); @@ -129,82 +105,28 @@ public class SystemAdminServiceImpl implements ISystemAdminService { } /** - * 管理员新增 + * ${functionName}新增 * - * @author fzr - * @param systemAdminParam 参数 + * @author ${authorName} + * @param ${entityName}Param 参数 */ @Override - public void add(SystemAdminParam systemAdminParam) { - String[] field = {"id", "username", "nickname"}; - Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("is_delete", 0) - .eq("username", systemAdminParam.getUsername()) - .last("limit 1")), "账号已存在换一个吧！"); - - Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("is_delete", 0) - .eq("nickname", systemAdminParam.getNickname()) - .last("limit 1")), "昵称已存在换一个吧！"); - - SystemRoleVo roleVo = iSystemRoleService.detail(systemAdminParam.getRole()); - Assert.notNull(roleVo, "角色不存在!"); - Assert.isTrue(roleVo.getIsDisable() <= 0, "当前角色已被禁用!"); - - String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5(systemAdminParam.getPassword().trim() + salt); - String avatar = UrlUtil.toRelativeUrl(systemAdminParam.getAvatar()); - + public void add(${EntityName}Param ${entityName}Param) { SystemAdmin model = new SystemAdmin(); - model.setDeptId(systemAdminParam.getDeptId()); - model.setPostId(systemAdminParam.getPostId()); - model.setUsername(systemAdminParam.getUsername()); - model.setNickname(systemAdminParam.getNickname()); - model.setRole(systemAdminParam.getRole()); - model.setAvatar(avatar); - model.setPassword(pwd); - model.setSalt(salt); - model.setSort(systemAdminParam.getSort()); - model.setIsMultipoint(systemAdminParam.getIsMultipoint()); - model.setIsDisable(systemAdminParam.getIsDisable()); - model.setCreateTime(System.currentTimeMillis() / 1000); - model.setUpdateTime(System.currentTimeMillis() / 1000); - systemAdminMapper.insert(model); + #foreach ($column in $columns) + model.set${column.javaField}(${entityName}Param.get${column.javaField.toUpperCase()}()); + #end + ${entityName}Mapper.insert(model); } /** - * 管理员更新 + * ${functionName}更新 * - * @author fzr - * @param systemAdminParam 参数 + * @author ${authorName} + * @param ${entityName}Param 参数 */ @Override - public void edit(SystemAdminParam systemAdminParam) { - String[] field = {"id", "username", "nickname"}; - Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("id", systemAdminParam.getId()) - .eq("is_delete", 0) - .last("limit 1")), "账号不存在了!"); - - Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("is_delete", 0) - .eq("username", systemAdminParam.getUsername()) - .ne("id", systemAdminParam.getId()) - .last("limit 1")), "账号已存在换一个吧！"); - - Assert.isNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("is_delete", 0) - .eq("nickname", systemAdminParam.getNickname()) - .ne("id", systemAdminParam.getId()) - .last("limit 1")), "昵称已存在换一个吧！"); - - Assert.notNull(iSystemRoleService.detail(systemAdminParam.getRole()), "角色不存在!"); - + public void edit(${EntityName}Param ${entityName}Param) { SystemAdmin model = new SystemAdmin(); model.setId(systemAdminParam.getId()); model.setDeptId(systemAdminParam.getDeptId()); @@ -218,43 +140,23 @@ public class SystemAdminServiceImpl implements ISystemAdminService { model.setIsDisable(systemAdminParam.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); - if (systemAdminParam.getPassword() != null) { - String salt = ToolsUtil.randomString(5); - String pwd = ToolsUtil.makeMd5( systemAdminParam.getPassword().trim() + salt); - model.setPassword(pwd); - model.setSalt(salt); - } - systemAdminMapper.updateById(model); this.cacheAdminUserByUid(systemAdminParam.getId()); } /** - * 管理员删除 + * ${functionName}删除 * - * @author fzr + * @author ${authorName} * @param id 主键 */ @Override public void del(Integer id) { - String[] field = {"id", "username", "nickname"}; - Assert.notNull(systemAdminMapper.selectOne(new QueryWrapper() - .select(field) - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")), "账号已不存在！"); - - Assert.isFalse(id == 1, "系统管理员不允许删除"); - - int adminId = Integer.parseInt(LikeAdminThreadLocal.getAdminId().toString()); - Assert.isFalse(id == adminId, "不能删除自己"); - SystemAdmin model = new SystemAdmin(); model.setId(id); model.setIsDelete(1); model.setDeleteTime(System.currentTimeMillis() / 1000); systemAdminMapper.updateById(model); - this.cacheAdminUserByUid(id); } } diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index e69de29b..8b92c68c 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -0,0 +1,39 @@ +package com.hxkj.admin.validate.system; + +import com.hxkj.common.validator.annotation.IDMust; +import com.hxkj.common.validator.annotation.IntegerContains; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; + +import lombok.Data; +import javax.validation.constraints.*; +import java.io.Serializable; + +/** + * ${functionName}参数 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class ${EntityName}Param implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface create{} + public interface update{} + public interface delete{} + +#foreach ($column in $columns) + #if($column.isInsert || $column.isEdit) + #if($column.isPk) + @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) + #end + #if(!$column.isPk && $column.isRequired) + @NotNull(message = "${column.javaField}参数缺失", groups = {create.class, update.class}) + #end + private ${column.javaType} ${column.javaField}; + #end + +#end +} From 253441942f8eddf600bfcd25c95a9b1887279a20 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 16 Jun 2022 15:05:11 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90-?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/config/AdminConfig.java | 3 +- server/like-common/pom.xml | 5 ++ .../com/hxkj/common/utils/StringUtil.java | 61 +++++++++++++++++++ .../generator/controller/GenController.java | 20 +++++- .../hxkj/generator/mapper/GenTableMapper.java | 12 ---- .../generator/service/IGenerateService.java | 11 +++- .../service/impl/GenerateServiceImpl.java | 58 ++++++++++++++++-- .../com/hxkj/generator/util/VelocityUtil.java | 51 ++++++++++++++-- server/pom.xml | 7 +++ 9 files changed, 201 insertions(+), 27 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index a3d19d33..77ece1e3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -17,7 +17,8 @@ public class AdminConfig { // 免登录验证 public static String[] notLoginUri = new String[]{ "system:login", // 登录接口 - "index:config" // 配置接口 + "index:config", // 配置接口 + "gen:genCode" }; // 免权限验证 diff --git a/server/like-common/pom.xml b/server/like-common/pom.xml index 225d9331..b8aa78f7 100644 --- a/server/like-common/pom.xml +++ b/server/like-common/pom.xml @@ -108,6 +108,11 @@ nl.bitwalker UserAgentUtils + + + commons-io + commons-io + com.qiniu diff --git a/server/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java b/server/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java index 4e702aca..3009ea76 100644 --- a/server/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java +++ b/server/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java @@ -474,4 +474,65 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils { return sb.toString(); } + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param strPattern 文本模板，被替换的部分用 {} 表示 + * @param argArray 参数值 + * @return 格式化后的文本 + */ + public static String format(String strPattern, Object... argArray) { + String EMPTY_JSON = "{}"; + char C_BACKSLASH = '\\'; + char C_DELIM_START = '{'; + + if (isEmpty(argArray) || isEmpty(strPattern)) { + return strPattern; + } + + final int strPatternLength = strPattern.length(); + StringBuilder sbuf = new StringBuilder(strPatternLength + 50); + int handledPosition = 0; + int delimIndex; + for (int argIndex = 0; argIndex < argArray.length; argIndex++) { + delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); + if (delimIndex == -1) { + if (handledPosition == 0) { + return strPattern; + } else { + sbuf.append(strPattern, handledPosition, strPatternLength); + return sbuf.toString(); + } + } else { + if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) { + if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) { + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(argArray[argIndex]); + handledPosition = delimIndex + 2; + } else { + // 占位符被转义 + argIndex--; + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(C_DELIM_START); + handledPosition = delimIndex + 1; + } + } else { + // 正常占位符 + sbuf.append(strPattern, handledPosition, delimIndex); + sbuf.append(argArray[argIndex]); + handledPosition = delimIndex + 2; + } + } + } + + sbuf.append(strPattern, handledPosition, strPattern.length()); + return sbuf.toString(); + } + } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 815698ed..92837e85 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -9,11 +9,16 @@ import com.hxkj.generator.validate.GenParam; import com.hxkj.generator.validate.PageParam; import com.hxkj.generator.vo.DbTableVo; import com.hxkj.generator.vo.GenTableVo; +import org.apache.commons.io.IOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.Map; +import java.util.zip.ZipOutputStream; @RestController @RequestMapping("/api/gen") @@ -130,8 +135,19 @@ public class GenController { * @author fzr * @return Object */ - @GetMapping("genCode") - public Object genCode(@Validated @IDMust() @RequestParam("id") Integer id) { + @GetMapping("/genCode") + public Object genCode(HttpServletResponse response, String tables) throws IOException { + String[] tableNames = tables.split(","); + + byte[] data = iGenerateService.downloadCode(tableNames); + + response.reset(); + response.addHeader("Access-Control-Allow-Origin", "*"); + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + IOUtils.write(data, response.getOutputStream()); return null; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index 52f6a924..c891e938 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -73,16 +73,4 @@ public interface GenTableMapper extends IBaseMapper { ""}) List selectDbTableColumnsByName(String tableName); - @Select({""}) - Map selectGenTableByName(Integer id); - } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index 7c049ca1..87e5eb4c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -27,6 +27,8 @@ public interface IGenerateService { * 生成列表 * * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 * @return Object */ PageResult list(PageParam pageParam, Map params); @@ -35,6 +37,7 @@ public interface IGenerateService { * 生成详情 * * @author fzr + * @param id 主键 * @return Object */ Map detail(Integer id); @@ -50,6 +53,7 @@ public interface IGenerateService { /** * 编辑表结构 * + * @param genParam 参数 * @author fzr */ void editTable(GenParam genParam); @@ -57,6 +61,7 @@ public interface IGenerateService { /** * 删除表结构 * + * @param id 主键 * @author fzr */ void deleteTable(Integer id); @@ -64,6 +69,7 @@ public interface IGenerateService { /** * 同步数据表 * + * @param id 主键 * @author fzr */ void syncTable(Integer id); @@ -77,11 +83,12 @@ public interface IGenerateService { Map previewCode(Integer id); /** - * 生成代码 + * 下载代码 * * @author fzr + * @param tableNames 表名集合 * @return Object */ - Object genCode(Integer id); + byte[] downloadCode(String[] tableNames); } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index e43ab672..5451145c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -22,18 +22,25 @@ import com.hxkj.generator.validate.PageParam; import com.hxkj.generator.vo.DbTableVo; import com.hxkj.generator.vo.GenColumnVo; import com.hxkj.generator.vo.GenTableVo; +import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.StringWriter; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * 代码生成器服务实现类 @@ -41,6 +48,8 @@ import java.util.stream.Collectors; @Service public class GenerateServiceImpl implements IGenerateService { + private static final Logger log = LoggerFactory.getLogger(GenerateServiceImpl.class); + @Resource GenTableMapper genTableMapper; @@ -348,15 +357,54 @@ public class GenerateServiceImpl implements IGenerateService { return map; } + @Override + public byte[] downloadCode(String[] tableNames) { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + for (String tableName : tableNames) { + genZipCode(tableName, zip); + } + IOUtils.closeQuietly(zip); + return outputStream.toByteArray(); + } + /** * 生成代码 * - * @author fzr - * @return Object + * @param tableName 表名 + * @param zip 压缩包 */ - @Override - public Object genCode(Integer id) { - return null; + public void genZipCode(String tableName, ZipOutputStream zip) { + // 查表信息 + GenTable table = genTableMapper.selectOne(new QueryWrapper() + .eq("table_name", tableName) + .last("limit 1")); + + // 查列信息 + List columns = genTableColumnMapper.selectList( + new QueryWrapper() + .orderByAsc("sort") + .eq("table_id", table.getId())); + + // 初始模板 + VelocityUtil.initVelocity(); + VelocityContext context = VelocityUtil.prepareContext(table, columns); + + // 渲染模板 + List templates = VelocityUtil.getTemplateList(table.getGenTpl()); + for (String template : templates) { + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, "UTF-8"); + tpl.merge(context, sw); + try { + zip.putNextEntry(new ZipEntry(VelocityUtil.getFileName(template, table))); + IOUtils.write(sw.toString(), zip, "UTF-8"); + zip.flush(); + zip.closeEntry(); + } catch (IOException e) { + log.error("生成渲染模板失败: " + e.getMessage()); + } + } } } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 57a1ac28..5d09d031 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -59,13 +59,54 @@ public class VelocityUtil { */ public static List getTemplateList(String genTpl) { List templates = new LinkedList<>(); -// templates.add("java/controller.java.vm"); -// templates.add("java/entity.java.vm"); -// templates.add("java/mapper.java.vm"); -// templates.add("java/service.java.vm"); + templates.add("java/controller.java.vm"); + templates.add("java/entity.java.vm"); + templates.add("java/mapper.java.vm"); + templates.add("java/service.java.vm"); templates.add("java/serviceImpl.java.vm"); -// templates.add("java/validate.java.vm"); + templates.add("java/validate.java.vm"); return templates; } + /** + * 获取文件名 + */ + public static String getFileName(String template, GenTable genTable) + { + // 文件名称 + String fileName = ""; + String entityName = genTable.getEntityName(); + String moduleName = genTable.getModuleName(); + String packageName = genTable.getPackageName(); + String businessName = genTable.getBusinessName(); + + String javaPath = StringUtil.replace(packageName, ".", "/"); + + if (template.contains("mapper.java.vm")) { + fileName = StringUtil.format("{}/mapper/{}Mapper.java", "com/hxkj/common", entityName); + } + + else if (template.contains("entity.java.vm")) { + fileName = StringUtil.format("{}/entity/{}Entity.java", "com/hxkj/common", entityName); + } + + else if (template.contains("service.java.vm")) { + fileName = StringUtil.format("{}/service/I{}Service.java", javaPath, entityName); + } + + else if (template.contains("serviceImpl.java.vm")) { + fileName = StringUtil.format("{}/service/impl/{}ServiceImpl.java", javaPath, entityName); + } + + else if (template.contains("controller.java.vm")) { + fileName = StringUtil.format("{}/controller/{}Controller.java", javaPath, entityName); + } + + else if (template.contains("validate.java.vm")) { + fileName = StringUtil.format("{}/validate/{}Param.java", javaPath, entityName); + } + + return fileName; + } + } diff --git a/server/pom.xml b/server/pom.xml index aad7aa06..f4db6d83 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -35,6 +35,7 @@ 3.12.0 2.9.0 1.2.4 + 2.11.0 7.9.5 5.6.54 3.1.411 @@ -114,6 +115,12 @@ UserAgentUtils ${bitwalker.version} + + + commons-io + commons-io + ${commons.io.version} + com.qiniu From 94fd5425f6d6cf7cc9ab03bdad769134d322d733 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 16 Jun 2022 19:01:59 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20-?= =?UTF-8?q?=20=E6=A8=A1=E6=9D=BF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxkj/common/constant/GenConstants.java | 5 +- .../com/hxkj/generator/config/GenConfig.java | 2 +- .../generator/controller/GenController.java | 25 +- .../service/impl/GenerateServiceImpl.java | 11 +- .../com/hxkj/generator/util/VelocityUtil.java | 27 +- .../main/resources/java/serviceImpl.java.vm | 116 +---- .../src/main/resources/vue/index.vue.vm | 395 +++++++++++++++++- 7 files changed, 466 insertions(+), 115 deletions(-) diff --git a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java index 7601fac6..89f8633e 100644 --- a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java +++ b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java @@ -1,5 +1,8 @@ package com.hxkj.common.constant; +import java.util.LinkedHashMap; +import java.util.Map; + public class GenConstants { /** 单表（增删改查） */ @@ -89,7 +92,7 @@ public class GenConstants { public static final String QUERY_LIKE = "LIKE"; /** 相等查询 */ - public static final String QUERY_EQ = "EQ"; + public static final String QUERY_EQ = "="; /** 需要 */ public static final Integer REQUIRE = 1; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java index f3e2be36..e171a0a6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.config; +package com.hxkj.generator.config; public class GenConfig { diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 92837e85..db8bf518 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Map; -import java.util.zip.ZipOutputStream; @RestController @RequestMapping("/api/gen") @@ -46,11 +44,13 @@ public class GenController { * 生成列表 * * @author fzr + * @param pageParam 分页参数 + * @param params 搜索参数 * @return Object */ @GetMapping("/list") public Object list(@Validated PageParam pageParam, - @RequestParam Map params) { + @RequestParam Map params) { PageResult list = iGenerateService.list(pageParam, params); return AjaxResult.success(list); } @@ -59,6 +59,7 @@ public class GenController { * 生成详情 * * @author fzr + * @param id 主键 * @return Object */ @GetMapping("/detail") @@ -75,7 +76,7 @@ public class GenController { */ @PostMapping("/importTable") public Object importTable(String tables) { - Assert.notNull(tables, "tables参数缺失"); + Assert.notNull(tables, "请选择要导出的表"); String[] tableNames = tables.split(","); iGenerateService.importTable(tableNames); return AjaxResult.success(); @@ -85,6 +86,7 @@ public class GenController { * 编辑表结构 * * @author fzr + * @param genParam 参数 * @return Object */ @PostMapping("/editTable") @@ -97,6 +99,7 @@ public class GenController { * 删除表结构 * * @author fzr + * @param id 主键 * @return Object */ @PostMapping("/deleteTable") @@ -109,6 +112,7 @@ public class GenController { * 同步表结构 * * @author fzr + * @param id 主键 * @return Object */ @PostMapping("/syncTable") @@ -121,6 +125,7 @@ public class GenController { * 预览代码 * * @author fzr + * @param id 主键 * @return Object */ @GetMapping("/previewCode") @@ -132,23 +137,23 @@ public class GenController { /** * 生成代码 * - * @author fzr - * @return Object + * @param response 响应对象 + * @param tables 表名 + * @throws IOException 异常 */ @GetMapping("/genCode") - public Object genCode(HttpServletResponse response, String tables) throws IOException { + public void genCode(HttpServletResponse response, String tables) throws IOException { + Assert.notNull(tables, "请选择要生成的表"); String[] tableNames = tables.split(","); - byte[] data = iGenerateService.downloadCode(tableNames); response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"like.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); - return null; } } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 5451145c..29c02079 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -127,6 +127,7 @@ public class GenerateServiceImpl implements IGenerateService { public Map detail(Integer id) { Map maps = new LinkedHashMap<>(); GenTable genTable = genTableMapper.selectById(id); + Assert.notNull(genTable, "查询的数据不存在"); // 基本信息 Map base = new LinkedHashMap<>(); @@ -329,6 +330,7 @@ public class GenerateServiceImpl implements IGenerateService { * 预览代码 * * @author fzr + * @param id 主键 * @return Map */ @Override @@ -357,6 +359,13 @@ public class GenerateServiceImpl implements IGenerateService { return map; } + /** + * 下载代码 + * + * @author fzr + * @param tableNames 表名集合 + * @return byte[] + */ @Override public byte[] downloadCode(String[] tableNames) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); @@ -374,7 +383,7 @@ public class GenerateServiceImpl implements IGenerateService { * @param tableName 表名 * @param zip 压缩包 */ - public void genZipCode(String tableName, ZipOutputStream zip) { + private void genZipCode(String tableName, ZipOutputStream zip) { // 查表信息 GenTable table = genTableMapper.selectOne(new QueryWrapper() .eq("table_name", tableName) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 5d09d031..ff85ba29 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -10,7 +10,10 @@ import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Properties; +import java.util.function.Function; +import java.util.stream.Collectors; public class VelocityUtil { @@ -36,6 +39,17 @@ public class VelocityUtil { * @return VelocityContext */ public static VelocityContext prepareContext(GenTable table, List columns) { + // 处理变量字段 + boolean isSearch = false; + List fields = new LinkedList<>(); + for (GenTableColumn column : columns) { + fields.add(column.getColumnName()); + if (column.getIsQuery() == 1) { + isSearch = true; + } + } + + // 设置模板变量 VelocityContext velocityContext = new VelocityContext(); velocityContext.put("genTpl", table.getGenTpl()); velocityContext.put("tableName", table.getTableName()); @@ -48,6 +62,9 @@ public class VelocityUtil { velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); velocityContext.put("table", table); velocityContext.put("columns", columns); + velocityContext.put("fields", fields); + velocityContext.put("isSearch", isSearch); + return velocityContext; } @@ -59,12 +76,12 @@ public class VelocityUtil { */ public static List getTemplateList(String genTpl) { List templates = new LinkedList<>(); - templates.add("java/controller.java.vm"); - templates.add("java/entity.java.vm"); - templates.add("java/mapper.java.vm"); - templates.add("java/service.java.vm"); +// templates.add("java/controller.java.vm"); +// templates.add("java/entity.java.vm"); +// templates.add("java/mapper.java.vm"); +// templates.add("java/service.java.vm"); templates.add("java/serviceImpl.java.vm"); - templates.add("java/validate.java.vm"); +// templates.add("java/validate.java.vm"); return templates; } diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index b95367dc..d6801523 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -51,16 +51,31 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { queryWrapper.eq("is_delete", 0); queryWrapper.orderByDesc(Arrays.asList("id", "sort")); - #if($column.isPk) - systemAdminMapper.setSearch(queryWrapper, params, new String[]{ - "like:username:str", - "like:nickname:str", - "=:role:int" + #if($isSearch) + ${entityName}Mapper.setSearch(queryWrapper, params, new String[]{ + #foreach ($column in $columns) + #if($column.isQuery) + #if($column.queryType=="EQ") + #if($column.javaType=="String") + #if($column.javaField.equals($column.columnName)) + "=:${column.javaField}:str", + #else + "=:${column.javaField}@${column.columnName}:str", + #end + #elseif($column.javaType=="Integer") + #if($column.javaField.equals($column.columnName)) + "=:${column.javaField}:int", + #else + "=:${column.javaField}@${column.columnName}:int", + #end + #end + #end + #end + #end }); #end IPage iPage = systemAdminMapper.selectPage(new Page<>(page, limit), queryWrapper); - for (SystemAdminVo vo : iPage.getRecords()) { vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); @@ -70,93 +85,4 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { return PageResult.iPageHandle(iPage); } - /** - * ${functionName}详细 - * - * @author ${authorName} - * @param id 主键 - * @return SysAdmin - */ - @Override - public ${EntityName}Vo detail(Integer id) { - SystemAdmin sysAdmin = systemAdminMapper.selectOne(new QueryWrapper() - .select(SystemAdmin.class, info-> - !info.getColumn().equals("salt") && - !info.getColumn().equals("password") && - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(sysAdmin, "账号已不存在！"); - - SystemAdminVo vo = new SystemAdminVo(); - BeanUtils.copyProperties(sysAdmin, vo); - - vo.setDept(String.valueOf(vo.getDeptId())); - vo.setRole(String.valueOf(sysAdmin.getRole())); - vo.setAvatar(UrlUtil.toAbsoluteUrl(sysAdmin.getAvatar())); - vo.setCreateTime(TimeUtil.timestampToDate(sysAdmin.getCreateTime())); - vo.setUpdateTime(TimeUtil.timestampToDate(sysAdmin.getUpdateTime())); - vo.setLastLoginTime(TimeUtil.timestampToDate(sysAdmin.getLastLoginTime())); - - return vo; - } - - /** - * ${functionName}新增 - * - * @author ${authorName} - * @param ${entityName}Param 参数 - */ - @Override - public void add(${EntityName}Param ${entityName}Param) { - SystemAdmin model = new SystemAdmin(); - #foreach ($column in $columns) - model.set${column.javaField}(${entityName}Param.get${column.javaField.toUpperCase()}()); - #end - ${entityName}Mapper.insert(model); - } - - /** - * ${functionName}更新 - * - * @author ${authorName} - * @param ${entityName}Param 参数 - */ - @Override - public void edit(${EntityName}Param ${entityName}Param) { - SystemAdmin model = new SystemAdmin(); - model.setId(systemAdminParam.getId()); - model.setDeptId(systemAdminParam.getDeptId()); - model.setPostId(systemAdminParam.getPostId()); - model.setNickname(systemAdminParam.getNickname()); - model.setUsername(systemAdminParam.getUsername()); - model.setAvatar( UrlUtil.toRelativeUrl(systemAdminParam.getAvatar())); - model.setRole(systemAdminParam.getId() == 1 ? 0 : systemAdminParam.getRole()); - model.setSort(systemAdminParam.getSort()); - model.setIsMultipoint(systemAdminParam.getIsMultipoint()); - model.setIsDisable(systemAdminParam.getIsDisable()); - model.setUpdateTime(System.currentTimeMillis() / 1000); - - systemAdminMapper.updateById(model); - this.cacheAdminUserByUid(systemAdminParam.getId()); - } - - /** - * ${functionName}删除 - * - * @author ${authorName} - * @param id 主键 - */ - @Override - public void del(Integer id) { - SystemAdmin model = new SystemAdmin(); - model.setId(id); - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - systemAdminMapper.updateById(model); - } - } diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm index 51cf1e95..72fde9cb 100644 --- a/server/like-generator/src/main/resources/vue/index.vue.vm +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -1,2 +1,393 @@ -$hello -ffff \ No newline at end of file + + + From 917fb785f9d692f979f27e120c93b78b3396ef61 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 17 Jun 2022 19:03:18 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/SystemPostService.java | 1 + .../hxkj/common/constant/GenConstants.java | 100 ---- .../com/hxkj/generator/config/GenConfig.java | 8 +- .../hxkj/generator/constant/GenConstants.java | 23 + .../generator/constant/HtmlConstants.java | 29 ++ .../generator/constant/JavaConstants.java | 20 + .../hxkj/generator/constant/SqlConstants.java | 29 ++ .../generator/controller/GenController.java | 14 +- .../com/hxkj/generator/entity/GenTable.java | 2 + .../generator/service/IGenerateService.java | 8 + .../service/impl/GenerateServiceImpl.java | 61 ++- .../java/com/hxkj/generator/util/GenUtil.java | 83 ++-- .../com/hxkj/generator/util/VelocityUtil.java | 69 ++- .../com/hxkj/generator/validate/GenParam.java | 9 +- .../src/main/resources/java/mapper.java.vm | 4 +- .../src/main/resources/java/service.java.vm | 24 +- .../main/resources/java/serviceImpl.java.vm | 465 +++++++++++++++++- .../src/main/resources/java/vo.java.vm | 25 + .../src/main/resources/vue/index-tree.vue.vm | 0 19 files changed, 782 insertions(+), 192 deletions(-) delete mode 100644 server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/constant/GenConstants.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/constant/HtmlConstants.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/constant/JavaConstants.java create mode 100644 server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java create mode 100644 server/like-generator/src/main/resources/java/vo.java.vm create mode 100644 server/like-generator/src/main/resources/vue/index-tree.vue.vm diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java index b9770414..8f300049 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java @@ -14,6 +14,7 @@ import com.hxkj.common.entity.system.SystemPost; import com.hxkj.common.mapper.system.SystemAdminMapper; import com.hxkj.common.mapper.system.SystemPostMapper; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.common.utils.UrlUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java b/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java deleted file mode 100644 index 89f8633e..00000000 --- a/server/like-common/src/main/java/com/hxkj/common/constant/GenConstants.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hxkj.common.constant; - -import java.util.LinkedHashMap; -import java.util.Map; - -public class GenConstants { - - /** 单表（增删改查） */ - public static final String TPL_CRUD = "crud"; - - /** 树表（增删改查） */ - public static final String TPL_TREE = "tree"; - - /** 主子表（增删改查） */ - public static final String TPL_SUB = "sub"; - - /** 树编码字段 */ - public static final String TREE_CODE = "treeCode"; - - /** 树父编码字段 */ - public static final String TREE_PARENT_CODE = "treeParentCode"; - - /** 树名称字段 */ - public static final String TREE_NAME = "treeName"; - - /** 数据库字符串类型 */ - public static final String[] COLUMN_TYPE_STR = {"char", "varchar", "nvarchar", "varchar2"}; - - /** 数据库文本类型 */ - public static final String[] COLUMN_TYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"}; - - /** 数据库时间类型 */ - public static final String[] COLUMN_TYPE_TIME = {"datetime", "time", "date", "timestamp"}; - - /** 数据库数字类型 */ - public static final String[] COLUMN_TYPE_NUMBER = { - "tinyint", "smallint", "mediumint", "int", "number", - "integer", "bit", "bigint", "float", "double", "decimal"}; - - /** 页面不需要编辑字段 */ - public static final String[] COLUMN_NAME_NOT_EDIT = {"id", "create_time", "update_time", "delete_time"}; - - /** 页面不需要列表字段 */ - public static final String[] COLUMN_NAME_NOT_LIST = {"id", "create_time", "update_time", "delete_time"}; - - /** 页面不需要查询字段 */ - public static final String[] COLUMN_NAME_NOT_QUERY = {"id", "create_time", "update_time", "delete_time"}; - - /** 文本框 */ - public static final String HTML_INPUT = "input"; - - /** 文本域 */ - public static final String HTML_TEXTAREA = "textarea"; - - /** 下拉框 */ - public static final String HTML_SELECT = "select"; - - /** 单选框 */ - public static final String HTML_RADIO = "radio"; - - /** 复选框 */ - public static final String HTML_CHECKBOX = "checkbox"; - - /** 日期控件 */ - public static final String HTML_DATETIME = "datetime"; - - /** 图片上传控件 */ - public static final String HTML_IMAGE_UPLOAD = "imageUpload"; - - /** 文件上传控件 */ - public static final String HTML_FILE_UPLOAD = "fileUpload"; - - /** 富文本控件 */ - public static final String HTML_EDITOR = "editor"; - - /** 字符串类型 */ - public static final String TYPE_STRING = "String"; - - /** 整型 */ - public static final String TYPE_INTEGER = "Integer"; - - /** 长整型 */ - public static final String TYPE_LONG = "Long"; - - /** 高精度计算类型 */ - public static final String TYPE_BIG_DECIMAL = "BigDecimal"; - - /** 时间类型 */ - public static final String TYPE_DATE = "Date"; - - /** 模糊查询 */ - public static final String QUERY_LIKE = "LIKE"; - - /** 相等查询 */ - public static final String QUERY_EQ = "="; - - /** 需要 */ - public static final Integer REQUIRE = 1; - -} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java index e171a0a6..b4b35a2f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -6,7 +6,13 @@ public class GenConfig { public static String authorName = "LikeAdmin"; // 生成包名 - public static String packageName = "com.hxkj.like-admin"; + public static String packageName = "com.hxkj.admin"; + + // 主要应用 + public static String mainApp = "like-{}/src/main/java/"; + + // 公共应用 + public static String commonApp = "like-common/src/main/java/"; // 表前缀名 public static String tablePrefix = "ls_"; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/constant/GenConstants.java b/server/like-generator/src/main/java/com/hxkj/generator/constant/GenConstants.java new file mode 100644 index 00000000..c65ed73d --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/constant/GenConstants.java @@ -0,0 +1,23 @@ +package com.hxkj.generator.constant; + +public class GenConstants { + + /** UTF-8 字符集 */ + public static final String UTF8 = "UTF-8"; + + /** 单表 (增删改查) */ + public static final String TPL_CRUD = "crud"; + + /** 树表 (增删改查) */ + public static final String TPL_TREE = "tree"; + + /** 模糊查询 */ + public static final String QUERY_LIKE = "LIKE"; + + /** 相等查询 */ + public static final String QUERY_EQ = "="; + + /** 需要的 */ + public static final Integer REQUIRE = 1; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/constant/HtmlConstants.java b/server/like-generator/src/main/java/com/hxkj/generator/constant/HtmlConstants.java new file mode 100644 index 00000000..cd7380be --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/constant/HtmlConstants.java @@ -0,0 +1,29 @@ +package com.hxkj.generator.constant; + +public class HtmlConstants { + + /** 文本框 */ + public static final String HTML_INPUT = "input"; + + /** 文本域 */ + public static final String HTML_TEXTAREA = "textarea"; + + /** 下拉框 */ + public static final String HTML_SELECT = "select"; + + /** 单选框 */ + public static final String HTML_RADIO = "radio"; + + /** 日期控件 */ + public static final String HTML_DATETIME = "datetime"; + + /** 图片上传控件 */ + public static final String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** 文件上传控件 */ + public static final String HTML_FILE_UPLOAD = "fileUpload"; + + /** 富文本控件 */ + public static final String HTML_EDITOR = "editor"; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/constant/JavaConstants.java b/server/like-generator/src/main/java/com/hxkj/generator/constant/JavaConstants.java new file mode 100644 index 00000000..f8d136f0 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/constant/JavaConstants.java @@ -0,0 +1,20 @@ +package com.hxkj.generator.constant; + +public class JavaConstants { + + /** 字符串类型 */ + public static final String TYPE_STRING = "String"; + + /** 整型 */ + public static final String TYPE_INTEGER = "Integer"; + + /** 长整型 */ + public static final String TYPE_LONG = "Long"; + + /** 高精度计算类型 */ + public static final String TYPE_BIG_DECIMAL = "BigDecimal"; + + /** 时间类型 */ + public static final String TYPE_DATE = "Date"; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java b/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java new file mode 100644 index 00000000..b2ea0457 --- /dev/null +++ b/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java @@ -0,0 +1,29 @@ +package com.hxkj.generator.constant; + +public class SqlConstants { + + /** 数据库字符串类型 */ + public static final String[] COLUMN_TYPE_STR = {"char", "varchar", "nvarchar", "varchar2"}; + + /** 数据库文本类型 */ + public static final String[] COLUMN_TYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"}; + + /** 数据库时间类型 */ + public static final String[] COLUMN_TYPE_TIME = {"datetime", "time", "date", "timestamp"}; + + /** 数据库数字类型 */ + public static final String[] COLUMN_TYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer", "bit", "bigint", "float", "double", "decimal"}; + + /** 时间日期字段名 */ + public static final String[] COLUMN_TIME_NAME = {"create_time", "update_time", "delete_time", "start_time", "end_time"}; + + /** 页面不需要编辑字段 */ + public static final String[] COLUMN_NAME_NOT_EDIT = {"id", "create_time", "update_time", "delete_time"}; + + /** 页面不需要列表字段 */ + public static final String[] COLUMN_NAME_NOT_LIST = {"id", "intro", "content", "is_delete", "delete_time"}; + + /** 页面不需要查询字段 */ + public static final String[] COLUMN_NAME_NOT_QUERY = {"id", "image", "intro", "content", "sort", "is_delete", "create_time", "update_time", "delete_time"}; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index db8bf518..b5717b7d 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -137,11 +137,23 @@ public class GenController { /** * 生成代码 * + * @author fzr + * @param tableName 表名 + */ + @GetMapping("/genCode") + public void genCode(String tableName) { + Assert.notNull(tableName, "请选择要生成的表"); + iGenerateService.genCode(tableName); + } + + /** + * 下载代码 + * * @param response 响应对象 * @param tables 表名 * @throws IOException 异常 */ - @GetMapping("/genCode") + @GetMapping("/downloadCode") public void genCode(HttpServletResponse response, String tables) throws IOException { Assert.notNull(tables, "请选择要生成的表"); String[] tableNames = tables.split(","); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 4c848652..82cfc8b4 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -26,6 +26,8 @@ public class GenTable implements Serializable { private String moduleName; private String businessName; private String functionName; + private String treePrimary; + private String treeParent; private String genTpl; private Integer genType; private String genPath; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index 87e5eb4c..4857fd86 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -82,6 +82,14 @@ public interface IGenerateService { */ Map previewCode(Integer id); + /** + * 生成代码 + * + * @author fzr + * @param tableName 表名 + */ + void genCode(String tableName); + /** * 下载代码 * diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 29c02079..ae710f24 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -10,6 +10,7 @@ import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; +import com.hxkj.generator.constant.GenConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import com.hxkj.generator.mapper.GenTableColumnMapper; @@ -22,6 +23,7 @@ import com.hxkj.generator.validate.PageParam; import com.hxkj.generator.vo.DbTableVo; import com.hxkj.generator.vo.GenColumnVo; import com.hxkj.generator.vo.GenTableVo; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -34,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.IOException; import java.io.StringWriter; import java.util.*; @@ -211,6 +214,11 @@ public class GenerateServiceImpl implements IGenerateService { @Override @Transactional public void editTable(GenParam genParam) { + if (genParam.getGenTpl().equals(GenConstants.TPL_TREE)) { + Assert.isFalse(genParam.getTreePrimary().equals(""), "树主ID不能为空"); + Assert.isFalse(genParam.getTreeParent().equals(""), "树父ID不能为空"); + } + GenTable model = genTableMapper.selectById(genParam.getId()); Assert.notNull(model, "数据已丢失"); @@ -222,6 +230,8 @@ public class GenerateServiceImpl implements IGenerateService { model.setPackageName(genParam.getPackageName()); model.setBusinessName(genParam.getBusinessName()); model.setFunctionName(genParam.getFunctionName()); + model.setTreePrimary(genParam.getTreePrimary()); + model.setTreeParent(genParam.getTreeParent()); model.setRemarks(genParam.getRemarks()); model.setGenTpl(genParam.getGenTpl()); model.setGenType(genParam.getGenType()); @@ -347,10 +357,10 @@ public class GenerateServiceImpl implements IGenerateService { // 渲染模板 Map map = new LinkedHashMap<>(); - List templates = VelocityUtil.getTemplateList("curd"); + List templates = VelocityUtil.getTemplateList(table.getGenTpl()); for (String template : templates) { StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, "UTF-8"); + Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); tpl.merge(context, sw); map.put(template, sw.toString()); System.out.println(sw); @@ -378,8 +388,49 @@ public class GenerateServiceImpl implements IGenerateService { } /** - * 生成代码 + * 生成代码 (自定义路径) * + * @author fzr + * @param tableName 表名 + */ + @Override + public void genCode(String tableName) { + // 查表信息 + GenTable table = genTableMapper.selectOne(new QueryWrapper() + .eq("table_name", tableName) + .last("limit 1")); + + // 查列信息 + Integer tableId = table.getId(); + List columns = genTableColumnMapper.selectList( + new QueryWrapper() + .orderByAsc("sort") + .eq("table_id", tableId)); + + // 初始模板 + VelocityUtil.initVelocity(); + VelocityContext context = VelocityUtil.prepareContext(table, columns); + + // 渲染模板 + List templates = VelocityUtil.getTemplateList(table.getGenTpl()); + for (String template : templates) { + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); + tpl.merge(context, sw); + try { + String basePath = VelocityUtil.getGenPath(table); + String filePath = basePath + VelocityUtil.getFileName(template, table); + FileUtils.writeStringToFile(new File(filePath), sw.toString(), GenConstants.UTF8); + } catch (IOException e) { + log.error("生成渲染模板失败: " + e.getMessage()); + } + } + } + + /** + * 生成代码 (压缩包下载) + * + * @author fzr * @param tableName 表名 * @param zip 压缩包 */ @@ -403,11 +454,11 @@ public class GenerateServiceImpl implements IGenerateService { List templates = VelocityUtil.getTemplateList(table.getGenTpl()); for (String template : templates) { StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, "UTF-8"); + Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); tpl.merge(context, sw); try { zip.putNextEntry(new ZipEntry(VelocityUtil.getFileName(template, table))); - IOUtils.write(sw.toString(), zip, "UTF-8"); + IOUtils.write(sw.toString(), zip, GenConstants.UTF8); zip.flush(); zip.closeEntry(); } catch (IOException e) { diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 8c98cadf..6b1b5b54 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -1,8 +1,11 @@ package com.hxkj.generator.util; -import com.hxkj.common.constant.GenConstants; +import com.hxkj.generator.constant.GenConstants; import com.hxkj.common.utils.StringUtil; -import com.hxkj.admin.config.GenConfig; +import com.hxkj.generator.config.GenConfig; +import com.hxkj.generator.constant.HtmlConstants; +import com.hxkj.generator.constant.JavaConstants; +import com.hxkj.generator.constant.SqlConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; @@ -46,78 +49,90 @@ public class GenUtil { String columnType = GenUtil.getDbType(column.getColumnType()); column.setTableId(table.getId()); column.setJavaField(StringUtil.toCamelCase(columnName)); - column.setJavaType(GenConstants.TYPE_STRING); + column.setJavaType(JavaConstants.TYPE_STRING); column.setQueryType(GenConstants.QUERY_EQ); column.setIsInsert(GenConstants.REQUIRE); column.setUpdateTime(table.getUpdateTime()); column.setCreateTime(table.getCreateTime()); // 文本域组 - if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_STR, columnType) || - GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType)) { + if (GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_STR, columnType) || + GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_TEXT, columnType)) { Integer columnLength = GenUtil.getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TEXT, columnType) - ? GenConstants.HTML_TEXTAREA - : GenConstants.HTML_INPUT; + String htmlType = columnLength >= 500 || GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_TEXT, columnType) + ? HtmlConstants.HTML_TEXTAREA + : HtmlConstants.HTML_INPUT; column.setHtmlType(htmlType); } - // 日期组件 - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_TIME, columnType)) { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); + // 日期字段 + else if (GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_TIME, columnType)) { + column.setJavaType(JavaConstants.TYPE_DATE); + column.setHtmlType(HtmlConstants.HTML_DATETIME); } - // 数字组件 - else if (GenUtil.isArraysContains(GenConstants.COLUMN_TYPE_NUMBER, columnType)) { - column.setHtmlType(GenConstants.HTML_INPUT); + // 时间字段 + else if (GenUtil.isArraysContains(SqlConstants.COLUMN_TIME_NAME, columnName)) { + column.setJavaType(JavaConstants.TYPE_LONG); + column.setHtmlType(HtmlConstants.HTML_DATETIME); + } + + // 数字字段 + else if (GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_NUMBER, columnType)) { + column.setHtmlType(HtmlConstants.HTML_INPUT); // 输入框 String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { - column.setJavaType(GenConstants.TYPE_BIG_DECIMAL); // 浮点形 + column.setJavaType(JavaConstants.TYPE_BIG_DECIMAL); // 浮点形 } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { - column.setJavaType(GenConstants.TYPE_INTEGER); // 整数形 + column.setJavaType(JavaConstants.TYPE_INTEGER); // 整数形 } else { - column.setJavaType(GenConstants.TYPE_LONG); // 长整形 + column.setJavaType(JavaConstants.TYPE_LONG); // 长整形 } } - // 编辑字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + // 需编辑字段 + if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { column.setIsEdit(GenConstants.REQUIRE); } - // 列表字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { + // 需列表字段 + if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_LIST, columnName) && column.getIsPk() == 0) { column.setIsList(GenConstants.REQUIRE); } - // 查询字段 - if (!GenUtil.isArraysContains(GenConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { + // 需查询字段 + if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { column.setIsQuery(GenConstants.REQUIRE); } - // 查询字段类型 - if (StringUtil.endsWithIgnoreCase(columnName, "name")) { + // 模糊查字段 + if (StringUtil.endsWithIgnoreCase(columnName, "name") || + columnName.equals("nickname") || + columnName.equals("username") || + columnName.equals("title") || + columnName.equals("mobile")) { column.setQueryType(GenConstants.QUERY_LIKE); } // 根据字段设置 - if (StringUtil.endsWithIgnoreCase(columnName, "status")) { + if (StringUtil.endsWithIgnoreCase(columnName, "status") + || columnName.equals("isShow") + || columnName.equals("isDisable")) { // 状态字段设置单选框 - column.setHtmlType(GenConstants.HTML_RADIO); + column.setHtmlType(HtmlConstants.HTML_RADIO); } else if (StringUtil.endsWithIgnoreCase(columnName, "type") || StringUtil.endsWithIgnoreCase(columnName, "sex")) { // 类型&性别字段设置下拉框 - column.setHtmlType(GenConstants.HTML_SELECT); + column.setHtmlType(HtmlConstants.HTML_SELECT); } else if (StringUtil.endsWithIgnoreCase(columnName, "image")) { // 图片字段设置图片上传控件 - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + column.setHtmlType(HtmlConstants.HTML_IMAGE_UPLOAD); } else if (StringUtil.endsWithIgnoreCase(columnName, "file")) { // 文件字段设置文件上传控件 - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + column.setHtmlType(HtmlConstants.HTML_FILE_UPLOAD); } else if (StringUtil.endsWithIgnoreCase(columnName, "content")) { // 内容字段的设置富文本控件 - column.setHtmlType(GenConstants.HTML_EDITOR); + column.setHtmlType(HtmlConstants.HTML_EDITOR); } } @@ -155,8 +170,8 @@ public class GenUtil { * @return 类名 */ public static String toClassName(String tableName) { - String tablePrefix = "ls_"; - if (StringUtil.isNotEmpty(tablePrefix)) { + String tablePrefix = GenConfig.tablePrefix; + if (GenConfig.isRemoveTablePrefix && StringUtil.isNotEmpty(tablePrefix)) { String[] searchList = StringUtil.split(tablePrefix, ","); tableName = replaceFirst(tableName, searchList); } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index ff85ba29..0f0a18ac 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -1,6 +1,9 @@ package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; +import com.hxkj.common.utils.UrlUtil; +import com.hxkj.generator.config.GenConfig; +import com.hxkj.generator.constant.GenConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import org.apache.velocity.VelocityContext; @@ -8,6 +11,7 @@ import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import java.io.File; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -68,6 +72,21 @@ public class VelocityUtil { return velocityContext; } + /** + * 获取生成路径 + * + * @author fzr + * @param table 表 + * @return String + */ + public static String getGenPath(GenTable table) { + String genPath = table.getGenPath(); + if (StringUtil.equals(genPath, "/")) { + return System.getProperty("user.dir") + File.separator + "src" + File.separator; + } + return genPath + File.separator; + } + /** * 获取模板列表 * @@ -76,51 +95,65 @@ public class VelocityUtil { */ public static List getTemplateList(String genTpl) { List templates = new LinkedList<>(); -// templates.add("java/controller.java.vm"); -// templates.add("java/entity.java.vm"); -// templates.add("java/mapper.java.vm"); -// templates.add("java/service.java.vm"); + templates.add("java/controller.java.vm"); + templates.add("java/entity.java.vm"); + templates.add("java/mapper.java.vm"); + templates.add("java/service.java.vm"); templates.add("java/serviceImpl.java.vm"); -// templates.add("java/validate.java.vm"); + templates.add("java/validate.java.vm"); + templates.add("java/vo.java.vm"); +// if (GenConstants.TPL_CRUD.equals(genTpl)) { +// templates.add("vue/index.vue.vm"); +// } +// else if (GenConstants.TPL_TREE.equals(genTpl)) { +// templates.add("vue/index-tree.vue.vm"); +// } return templates; } /** * 获取文件名 */ - public static String getFileName(String template, GenTable genTable) - { - // 文件名称 + public static String getFileName(String template, GenTable genTable) { String fileName = ""; - String entityName = genTable.getEntityName(); - String moduleName = genTable.getModuleName(); + String entityName = genTable.getEntityName(); String packageName = genTable.getPackageName(); - String businessName = genTable.getBusinessName(); + String moduleName = genTable.getModuleName(); + String[] arrPackage = packageName.split("\\."); - String javaPath = StringUtil.replace(packageName, ".", "/"); + // 生成路径 + String javaPath = StringUtil.replace(packageName, ".", "/"); + String basePackage = arrPackage[0] + "/" + arrPackage[1]+"/"; + String commonPackage = GenConfig.commonApp + basePackage + "common"; + String mainPackage = StringUtil.format(GenConfig.mainApp, arrPackage.length>=3?arrPackage[2]:"admin")+javaPath; + String subPackage = !moduleName.equals("") ? StringUtil.replace(moduleName, ".", "/") + "/" : ""; if (template.contains("mapper.java.vm")) { - fileName = StringUtil.format("{}/mapper/{}Mapper.java", "com/hxkj/common", entityName); + fileName = StringUtil.format("{}/mapper/{}{}Mapper.java", commonPackage, subPackage, entityName); } else if (template.contains("entity.java.vm")) { - fileName = StringUtil.format("{}/entity/{}Entity.java", "com/hxkj/common", entityName); + fileName = StringUtil.format("{}/entity/{}{}Entity.java", commonPackage, subPackage, entityName); } else if (template.contains("service.java.vm")) { - fileName = StringUtil.format("{}/service/I{}Service.java", javaPath, entityName); + fileName = StringUtil.format("{}/service/I{}Service.java", mainPackage, entityName); } else if (template.contains("serviceImpl.java.vm")) { - fileName = StringUtil.format("{}/service/impl/{}ServiceImpl.java", javaPath, entityName); + fileName = StringUtil.format("{}/service/impl/{}ServiceImpl.java", mainPackage, entityName); } else if (template.contains("controller.java.vm")) { - fileName = StringUtil.format("{}/controller/{}Controller.java", javaPath, entityName); + fileName = StringUtil.format("{}/controller/{}{}Controller.java", mainPackage, subPackage, entityName); } else if (template.contains("validate.java.vm")) { - fileName = StringUtil.format("{}/validate/{}Param.java", javaPath, entityName); + fileName = StringUtil.format("{}/validate/{}{}Param.java", mainPackage, subPackage, entityName); + } + + else if (template.contains("vo.java.vm")) { + fileName = StringUtil.format("{}/vo/{}{}Vo.java", mainPackage, subPackage, entityName); } return fileName; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index 3d5e9d29..825c69af 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -11,6 +11,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -78,8 +79,12 @@ public class GenParam implements Serializable { private Integer genType; @Length(max = 200, message = "生成代码路径不能大于200个字符") - private String genPath; + private String genPath = "/"; - private List> columns; + private List> columns = new ArrayList<>(); + + private String treePrimary = ""; + + private String treeParent = ""; } diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index 59c8f9a0..0c8d41c6 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -1,12 +1,12 @@ package com.hxkj.common.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.${entityName}; +import com.hxkj.common.entity.${EntityName}; import org.apache.ibatis.annotations.Mapper; /** * ${functionName} */ @Mapper -public interface ${entityName}Mapper extends IBaseMapper<${entityName}> { +public interface ${EntityName}Mapper extends IBaseMapper<${EntityName}> { } diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 4647dfc5..35c4fb22 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -2,7 +2,9 @@ package com.hxkj.admin.service; import com.hxkj.admin.validate.PageParam; import com.hxkj.admin.validate.${EntityName}Param; +#if($table.genTpl=="curd") import com.hxkj.admin.vo.system.${EntityName}Vo; +#end import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.${EntityName}; @@ -11,25 +13,37 @@ import java.util.Map; /** * ${functionName}服务接口类 */ -public interface ISystemAdminService { +public interface I${EntityName}Service { + #if($table.genTpl=="curd") /** * ${functionName}列表 * * @author ${authorName} * @param pageParam 分页参数 + * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); +#elseif($table.genTpl=="tree") + /** + * ${functionName}列表 + * + * @author ${authorName} + * @param params 搜索参数 + * @return JSONArray + */ + JSONArray list(Map params); + #end /** * ${functionName}详情 * * @author ${authorName} - * @param id 主键参数 - * @return ${EntityName}Vo + * @param id 主键ID + * @return ${EntityName} */ - SystemAdminVo detail(Integer id); + ${EntityName} detail(Integer id); /** * ${functionName}新增 @@ -51,7 +65,7 @@ public interface ISystemAdminService { * ${functionName}删除 * * @author ${authorName} - * @param id 主键参数 + * @param id 主键ID */ void del(Integer id); diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index d6801523..fe9e7614 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -35,54 +35,471 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { @Resource ${EntityName}Mapper ${entityName}Mapper; +#if($table.sub_table_name.equals("")) +#if($table.genTpl=="curd") /** * ${functionName}列表 * * @author ${authorName} * @param pageParam 分页参数 - * @return PageResult + * @param params 搜索参数 + * @return PageResult<${EntityName}Vo> */ @Override public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>(); + #if($isSearch) + #if($fields.contains("is_delete")) queryWrapper.eq("is_delete", 0); - queryWrapper.orderByDesc(Arrays.asList("id", "sort")); + #end + #if($fields.contains("sort")) + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + #else + queryWrapper.orderByDesc("id"); + #end + #end #if($isSearch) ${entityName}Mapper.setSearch(queryWrapper, params, new String[]{ #foreach ($column in $columns) - #if($column.isQuery) - #if($column.queryType=="EQ") - #if($column.javaType=="String") - #if($column.javaField.equals($column.columnName)) - "=:${column.javaField}:str", - #else - "=:${column.javaField}@${column.columnName}:str", - #end - #elseif($column.javaType=="Integer") - #if($column.javaField.equals($column.columnName)) - "=:${column.javaField}:int", - #else - "=:${column.javaField}@${column.columnName}:int", - #end - #end - #end + #if($column.isQuery) + #if($column.queryType=="datetime") + "datetime:startTime-endTime@${column.columnName}:str" + #else + #if($column.javaType=="Integer") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:int", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:int", + #end + #elseif($column.javaType=="Long") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:long", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:long", + #end + #else + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:str", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:str", + #end #end + #end + #end #end }); #end - IPage iPage = systemAdminMapper.selectPage(new Page<>(page, limit), queryWrapper); - for (SystemAdminVo vo : iPage.getRecords()) { - vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); - vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); - vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime())); + IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + + #if($fields.contains("create_time") || $fields.contains("update_time")) + List<${EntityName}Vo> list = new ArrayList<>(); + for (${EntityName} item : iPage.getRecords()) { + ${EntityName}Vo vo = new ${EntityName}Vo(); + BeanUtils.copyProperties(item, vo); + #if($fields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + #end + #if($fields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + #end + #if($fields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + #end + #if($fields.contains("create_time")) + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + #end + #if($fields.contains("update_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + #end + list.add(vo); + } + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + #else + return PageResult.iPageHandle(iPage); + #end + } +#elseif($table.genTpl=="tree") + /** + * ${functionName}列表 + * + * @author ${authorName} + * @param params 搜索参数 + * @return PageResult<${EntityName}Vo> + */ + @Override + public JSONArray list(Map params) { + QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>(); + #if($isSearch) + #if($fields.contains("is_delete")) + queryWrapper.eq("is_delete", 0); + #end + #if($fields.contains("sort")) + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); + #else + queryWrapper.orderByDesc("id"); + #end + #end + + #if($isSearch) + ${entityName}Mapper.setSearch(queryWrapper, params, new String[]{ + #foreach ($column in $columns) + #if($column.isQuery) + #if($column.queryType=="datetime") + "datetime:startTime-endTime@${column.columnName}:str" + #else + #if($column.javaType=="Integer") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:int", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:int", + #end + #elseif($column.javaType=="Long") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:long", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:long", + #end + #else + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:str", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:str", + #end + #end + #end + #end + #end + }); + #end + + List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper); + + #if($fields.contains("create_time") || $fields.contains("update_time")) + List<${EntityName}Vo> list = new ArrayList<>(); + for (${EntityName} item : arrayData) { + ${EntityName}Vo vo = new ${EntityName}Vo(); + BeanUtils.copyProperties(item, vo); + #if($fields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + #end + #if($fields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + #end + #if($fields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + #end + #if($fields.contains("create_time")) + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + #end + #if($fields.contains("update_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + #end + list.add(vo); + } + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list)); + return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); + #else + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(arrayData)); + return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); + #end + } +#end +#else +#if($table.genTpl=="curd") + /** + * ${functionName}列表 + * + * @author ${authorName} + * @param pageParam 分页参数 + * @param params 搜索参数 + * @return PageResult<${EntityName}Vo> + */ + @Override + public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); + + MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.join("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id") + #if($isSearch) + #if($fields.contains("is_delete")) + mpjQueryWrapper.eq("is_delete", 0); + #end + #if($fields.contains("sort")) + mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id")); + #else + mpjQueryWrapper.orderByDesc("id"); + #end + #end + + #if($isSearch) + ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{ + #foreach ($column in $columns) + #if($column.isQuery) + #if($column.queryType=="datetime") + "datetime:startTime-endTime@${column.columnName}:str" + #else + #if($column.javaType=="Integer") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:int", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:int", + #end + #elseif($column.javaType=="Long") + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:long", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:long", + #end + #else + #if($column.javaField.equals($column.columnName)) + "${column.queryType}:${column.javaField}:str", + #else + "${column.queryType}:${column.javaField}@${column.columnName}:str", + #end + #end + #end + #end + #end + }); + #end + + IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectJoinPage( + new Page<>(page, limit), + ${EntityName}Vo.class, + mpjQueryWrapper); + + #if($fields.contains("create_time") || $fields.contains("update_time")) + for (${EntityName} item : iPage.getRecords()) { + ${EntityName}Vo vo = new ${EntityName}Vo(); + BeanUtils.copyProperties(item, vo); + #if($fields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + #end + #if($fields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + #end + #if($fields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + #end + #if($fields.contains("create_time")) + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + #end + #if($fields.contains("update_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + #end } + #end return PageResult.iPageHandle(iPage); + } +#elseif($table.genTpl=="tree") + /** + * ${functionName}列表 + * + * @author ${authorName} + * @param params 搜索参数 + * @return PageResult<${EntityName}Vo> + */ + @Override + public JSONArray list(Map params) { + MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); + #if($isSearch) + #if($fields.contains("is_delete")) + mpjQueryWrapper.eq("t.is_delete", 0); + #end + #if($fields.contains("sort")) + mpjQueryWrapper.orderByDesc(Arrays.asList("t.sort", "t.id")); + #else + mpjQueryWrapper.orderByDesc("t.id"); + #end + #end + + #if($isSearch) + ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{ + #foreach ($column in $columns) + #if($column.isQuery) + #if($column.queryType=="datetime") + "datetime:startTime-endTime@t.${column.columnName}:str" + #else + #if($column.javaType=="Integer") + "${column.queryType}:${column.javaField}@t.${column.columnName}:int", + #elseif($column.javaType=="Long") + "${column.queryType}:${column.javaField}@t.${column.columnName}:long", + #else + "${column.queryType}:${column.javaField}@t.${column.columnName}:str", + #end + #end + #end + #end + }); + #end + + List<${EntityName}> arrayData = ${entityName}Mapper.selectJoinList( + ${EntityName}Vo.class, + mpjQueryWrapper); + + #if($fields.contains("create_time") || $fields.contains("update_time")) + for (${EntityName} item : arrayData) { + ${EntityName}Vo vo = new ${EntityName}Vo(); + BeanUtils.copyProperties(item, vo); + #if($fields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + #end + #if($fields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + #end + #if($fields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + #end + #if($fields.contains("create_time")) + vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + #end + #if($fields.contains("update_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + #end + list.add(vo); + } + + #end + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(arrayData)); + return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); + } + #end +#end + + /** + * ${functionName}详情 + * + * @author ${authorName} + * @param id 主键参数 + * @return ${EntityName} + */ + @Override + public ${EntityName} detail(Integer id) { + Article model = ${entityName}Mapper.selectOne( + #if($field.contains("is_delete")) + new QueryWrapper<${EntityName}>() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + #else + new QueryWrapper<${EntityName}>() + .eq("id", id) + .last("limit 1")); + #end + + Assert.notNull(model, "${functionName}不存在}"); + + #if($field.contains("image")) + model.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); + #end + #if($field.contains("avatar")) + model.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); + #end + #if($field.contains("logo")) + model.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); + #end + return model; + } + + /** + * ${functionName}新增 + * + * @author ${authorName} + * @param ${entityName}Param 参数 + */ + @Override + public void add(${EntityName}Param ${entityName}Param) { + ${EntityName} model = new ${EntityName}(); + #foreach ($column in $columns) + #if(!$column.isIncrement) + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) + model.set${AttrName}(UrlUtil.toRelativeUrl(Param.get${AttrName}())) + #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) + model.set${AttrName}(${entityName}Param.get${AttrName}()); + #elseif($column.javaField.equals("createTime") || $column.javaField.equals("updateTime")) + model.set${AttrName}(System.currentTimeMillis() / 1000); + #end + #end + #end + ${entityName}Mapper.insert(model); + } + + /** + * ${functionName}编辑 + * + * @author ${authorName} + * @param ${entityName}Param 参数 + */ + @Override + public void edit(${EntityName}Param ${entityName}Param) { + ${EntityName} model = ${entityName}Mapper.selectOne( + #if($field.contains("is_delete")) + new QueryWrapper<${EntityName}>() + .eq("id", ${entityName}Param.getId()) + .eq("is_delete", 0) + .last("limit 1")); + #else + new QueryWrapper<${EntityName}>() + .eq("id", ${entityName}Param.getId()) + .last("limit 1")); + #end + + Assert.notNull(model, "${functionName}不存在!"); + + #foreach ($column in $columns) + #if(!$column.isIncrement) + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) + model.set${AttrName}(UrlUtil.toRelativeUrl(Param.get${AttrName}())) + #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) + model.set${AttrName}(${entityName}Param.get${AttrName}()); + #elseif($column.javaField.equals("updateTime")) + model.set${AttrName}(System.currentTimeMillis() / 1000); + #end + #end + #end + ${entityName}Mapper.updateById(model); + } + + /** + * ${functionName}删除 + * + * @author ${authorName} + * @param id 主键ID + */ + @Override + public void del(Integer id) { + ${EntityName} model = ${entityName}Mapper.selectOne( + #if($fields.contains("is_delete")) + new QueryWrapper<${EntityName}>() + .eq("id", id) + .eq("is_delete", 0) + .last("limit 1")); + #else + new QueryWrapper<${EntityName}>() + .eq("id", id) + .last("limit 1")); + #end + + Assert.notNull(model, "${functionName}不存在!"); + + #if($fields.contains("is_delete")) + model.setIsDelete(1); + #if($fields.contains("delete_time")) + model.setDeleteTime(System.currentTimeMillis() / 1000); + #end + ${entityName}Mapper.updateById(article); + #else + ${entityName}Mapper.delete(new QueryWrapper<${EntityName}>().eq("id", id)); + #end } } diff --git a/server/like-generator/src/main/resources/java/vo.java.vm b/server/like-generator/src/main/resources/java/vo.java.vm new file mode 100644 index 00000000..fea1568b --- /dev/null +++ b/server/like-generator/src/main/resources/java/vo.java.vm @@ -0,0 +1,25 @@ +package com.hxkj.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** +* ${EntityName}Vo +*/ +@Data +public class ${EntityName}Vo implements Serializable { + + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if($column.isList==1) + #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) + private String ${column.javaField}; + #else + private ${column.javaType} ${column.javaField}; + #end +#end +#end + +} diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm new file mode 100644 index 00000000..e69de29b From d03c911ebc45805a450a120633e12c3ed6d7f5fb Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 16:44:55 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/admin/config/AdminConfig.java | 4 +- .../main/resources/vm/java/controller.java.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../validator/IntArrayEmptyValidator.java | 27 ++++++++ .../validator/annotation/IntArrayEmpty.java | 20 ++++++ .../com/hxkj/generator/config/GenConfig.java | 13 ++-- .../hxkj/generator/constant/SqlConstants.java | 7 +- .../generator/controller/GenController.java | 4 +- .../hxkj/generator/entity/GenTableColumn.java | 1 + .../service/impl/GenerateServiceImpl.java | 10 +-- .../java/com/hxkj/generator/util/GenUtil.java | 14 ++-- .../com/hxkj/generator/util/VelocityUtil.java | 67 ++++++++++++------- .../com/hxkj/generator/vo/GenColumnVo.java | 3 +- .../com/hxkj/generator/vo/GenTableVo.java | 3 +- .../main/resources/java/controller.java.vm | 53 ++++++++++----- .../src/main/resources/java/entity.java.vm | 2 +- .../src/main/resources/java/mapper.java.vm | 4 +- .../src/main/resources/java/service.java.vm | 20 ++++-- .../src/main/resources/java/validate.java.vm | 13 +++- .../src/main/resources/java/vo.java.vm | 2 +- .../src/main/resources/java/voDetail.java.vm | 25 +++++++ .../src/main/resources/java/voList.java.vm | 25 +++++++ 22 files changed, 240 insertions(+), 77 deletions(-) delete mode 100644 server/like-admin/src/main/resources/vm/java/controller.java.vm delete mode 100644 server/like-admin/src/main/resources/vm/vue/index.vue.vm create mode 100644 server/like-common/src/main/java/com/hxkj/common/validator/IntArrayEmptyValidator.java create mode 100644 server/like-common/src/main/java/com/hxkj/common/validator/annotation/IntArrayEmpty.java create mode 100644 server/like-generator/src/main/resources/java/voDetail.java.vm create mode 100644 server/like-generator/src/main/resources/java/voList.java.vm diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index 1bf31ed2..7a1504b7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -18,7 +18,9 @@ public class AdminConfig { public static String[] notLoginUri = new String[]{ "system:login", // 登录接口 "common:index:config", // 配置接口 - "common:index:config" // 配置接口 + "common:index:config", // 配置接口 + "gen:genCode", // 配置接口 + "gen:downloadCode" // 配置接口 }; // 免权限验证 diff --git a/server/like-admin/src/main/resources/vm/java/controller.java.vm b/server/like-admin/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index e69de29b..00000000 diff --git a/server/like-admin/src/main/resources/vm/vue/index.vue.vm b/server/like-admin/src/main/resources/vm/vue/index.vue.vm deleted file mode 100644 index e69de29b..00000000 diff --git a/server/like-common/src/main/java/com/hxkj/common/validator/IntArrayEmptyValidator.java b/server/like-common/src/main/java/com/hxkj/common/validator/IntArrayEmptyValidator.java new file mode 100644 index 00000000..d40c81e3 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/validator/IntArrayEmptyValidator.java @@ -0,0 +1,27 @@ +package com.hxkj.common.validator; + +import com.hxkj.common.validator.annotation.IntArrayEmpty; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + + +/** + * 验证整数数组是否为空 + */ +public class IntArrayEmptyValidator implements ConstraintValidator { + + @Override + public void initialize(IntArrayEmpty constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(int[] value, ConstraintValidatorContext context) { + if (value == null) { + return false; + } + + return value.length > 0; + } + +} diff --git a/server/like-common/src/main/java/com/hxkj/common/validator/annotation/IntArrayEmpty.java b/server/like-common/src/main/java/com/hxkj/common/validator/annotation/IntArrayEmpty.java new file mode 100644 index 00000000..9b17a083 --- /dev/null +++ b/server/like-common/src/main/java/com/hxkj/common/validator/annotation/IntArrayEmpty.java @@ -0,0 +1,20 @@ +package com.hxkj.common.validator.annotation; + +import com.hxkj.common.validator.IntArrayEmptyValidator; +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = IntArrayEmptyValidator.class) +@Target({ ElementType.PARAMETER,ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface IntArrayEmpty { + + String message() default "数组不允许为空"; + + Class[] groups() default {}; + + Class[] payload() default { }; + +} diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java index b4b35a2f..538b27d5 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -2,17 +2,14 @@ package com.hxkj.generator.config; public class GenConfig { - // 作者姓名 - public static String authorName = "LikeAdmin"; + // 基础包名 + public static String packageName = "com.hxkj"; - // 生成包名 - public static String packageName = "com.hxkj.admin"; - - // 主要应用 - public static String mainApp = "like-{}/src/main/java/"; + // 后台应用 + public static String adminPackage = "like-admin/src/main/java/com/hxkj/admin"; // 公共应用 - public static String commonApp = "like-common/src/main/java/"; + public static String commonPackage = "like-common/src/main/java/com/hxkj/common"; // 表前缀名 public static String tablePrefix = "ls_"; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java b/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java index b2ea0457..c1bb2a9f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/constant/SqlConstants.java @@ -17,13 +17,16 @@ public class SqlConstants { /** 时间日期字段名 */ public static final String[] COLUMN_TIME_NAME = {"create_time", "update_time", "delete_time", "start_time", "end_time"}; + /** 页面不需要插入字段 */ + public static final String[] COLUMN_NAME_NOT_ADD = {"id", "is_delete", "create_time", "update_time", "delete_time"}; + /** 页面不需要编辑字段 */ - public static final String[] COLUMN_NAME_NOT_EDIT = {"id", "create_time", "update_time", "delete_time"}; + public static final String[] COLUMN_NAME_NOT_EDIT = {"is_delete", "create_time", "update_time", "delete_time"}; /** 页面不需要列表字段 */ public static final String[] COLUMN_NAME_NOT_LIST = {"id", "intro", "content", "is_delete", "delete_time"}; /** 页面不需要查询字段 */ - public static final String[] COLUMN_NAME_NOT_QUERY = {"id", "image", "intro", "content", "sort", "is_delete", "create_time", "update_time", "delete_time"}; + public static final String[] COLUMN_NAME_NOT_QUERY = {"is_delete", "create_time", "update_time", "delete_time"}; } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index b5717b7d..4eb73a97 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -76,7 +76,7 @@ public class GenController { */ @PostMapping("/importTable") public Object importTable(String tables) { - Assert.notNull(tables, "请选择要导出的表"); + Assert.notNull(tables, "请选择要导入的表"); String[] tableNames = tables.split(","); iGenerateService.importTable(tableNames); return AjaxResult.success(); @@ -162,7 +162,7 @@ public class GenController { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"like.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"likeadmin-curd.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 1b39cc4a..0db9edf6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -19,6 +19,7 @@ public class GenTableColumn implements Serializable { private Integer tableId; private String columnName; private String columnComment; + private Integer columnLength; private String columnType; private String javaType; private String javaField; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index ae710f24..51b2bfc9 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -98,7 +98,7 @@ public class GenerateServiceImpl implements IGenerateService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("id"); - queryWrapper.select("id,gen_tpl,entity_name,table_name,table_comment,create_time,update_time"); + queryWrapper.select("id,table_name,table_comment,create_time,update_time"); genTableMapper.setSearch(queryWrapper, params, new String[]{ "like:tableName@table_name:str", @@ -346,6 +346,8 @@ public class GenerateServiceImpl implements IGenerateService { @Override public Map previewCode(Integer id) { GenTable table = genTableMapper.selectById(id); + Assert.notNull(table, "记录丢失！"); + List columns = genTableColumnMapper.selectList( new QueryWrapper() .eq("table_id", id) @@ -357,7 +359,7 @@ public class GenerateServiceImpl implements IGenerateService { // 渲染模板 Map map = new LinkedHashMap<>(); - List templates = VelocityUtil.getTemplateList(table.getGenTpl()); + List templates = VelocityUtil.getTemplateList(table.getGenTpl(), columns); for (String template : templates) { StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); @@ -412,7 +414,7 @@ public class GenerateServiceImpl implements IGenerateService { VelocityContext context = VelocityUtil.prepareContext(table, columns); // 渲染模板 - List templates = VelocityUtil.getTemplateList(table.getGenTpl()); + List templates = VelocityUtil.getTemplateList(table.getGenTpl(), columns); for (String template : templates) { StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); @@ -451,7 +453,7 @@ public class GenerateServiceImpl implements IGenerateService { VelocityContext context = VelocityUtil.prepareContext(table, columns); // 渲染模板 - List templates = VelocityUtil.getTemplateList(table.getGenTpl()); + List templates = VelocityUtil.getTemplateList(table.getGenTpl(), columns); for (String template : templates) { StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 6b1b5b54..08cd7551 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -27,9 +27,9 @@ public class GenUtil { String tableDesc = map.get("table_comment"); table.setTableName(tableName); table.setTableComment(tableDesc); - table.setAuthorName(GenConfig.authorName); + table.setAuthorName(map.getOrDefault("author_name", "")); table.setEntityName(GenUtil.toClassName(tableName)); - table.setModuleName(GenUtil.toModuleName(GenConfig.packageName)); + table.setModuleName(GenUtil.toBusinessName(tableName)); table.setPackageName(GenConfig.packageName); table.setBusinessName(GenUtil.toBusinessName(tableName)); table.setFunctionName(GenUtil.replaceText(tableDesc)); @@ -48,10 +48,10 @@ public class GenUtil { String columnName = column.getColumnName(); String columnType = GenUtil.getDbType(column.getColumnType()); column.setTableId(table.getId()); + column.setColumnLength(GenUtil.getColumnLength(column.getColumnType())); column.setJavaField(StringUtil.toCamelCase(columnName)); column.setJavaType(JavaConstants.TYPE_STRING); column.setQueryType(GenConstants.QUERY_EQ); - column.setIsInsert(GenConstants.REQUIRE); column.setUpdateTime(table.getUpdateTime()); column.setCreateTime(table.getCreateTime()); @@ -90,9 +90,15 @@ public class GenUtil { } } + // 需插入字段 + if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_ADD, columnName)) { + column.setIsInsert(GenConstants.REQUIRE); + } + // 需编辑字段 - if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_EDIT, columnName) && column.getIsPk() == 0) { + if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_EDIT, columnName)) { column.setIsEdit(GenConstants.REQUIRE); + column.setIsRequired(GenConstants.REQUIRE); } // 需列表字段 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 0f0a18ac..90fb7e34 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -58,16 +58,16 @@ public class VelocityUtil { velocityContext.put("genTpl", table.getGenTpl()); velocityContext.put("tableName", table.getTableName()); velocityContext.put("authorName", table.getAuthorName()); + velocityContext.put("packageName", GenConfig.packageName); velocityContext.put("EntityName", table.getEntityName()); velocityContext.put("entityName", StringUtil.uncapitalize(table.getEntityName())); velocityContext.put("moduleName", table.getModuleName()); - velocityContext.put("packageName", table.getPackageName()); - velocityContext.put("businessName", StringUtil.capitalize(table.getBusinessName())); velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); velocityContext.put("table", table); velocityContext.put("columns", columns); velocityContext.put("fields", fields); velocityContext.put("isSearch", isSearch); + velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns)); return velocityContext; } @@ -87,21 +87,47 @@ public class VelocityUtil { return genPath + File.separator; } + /** + * 判断需列表字段和查询字段是否一致 + * + * @author fzr + * @param columns 字段列表 + * @return Boolean + */ + public static Boolean getIsEqually(List columns) { + StringBuilder listStr = new StringBuilder(); + StringBuilder queryStr = new StringBuilder(); + for (GenTableColumn col : columns) { + if (col.getIsList() == 1) { + listStr.append(",").append(col.getColumnName()); + } + if (col.getIsQuery() == 1) { + queryStr.append(",").append(col.getColumnName()); + } + } + return listStr.toString().equals(queryStr.toString()); + } + /** * 获取模板列表 * * @author fzr * @return List */ - public static List getTemplateList(String genTpl) { + public static List getTemplateList(String genTpl, List columns) { List templates = new LinkedList<>(); templates.add("java/controller.java.vm"); - templates.add("java/entity.java.vm"); - templates.add("java/mapper.java.vm"); - templates.add("java/service.java.vm"); - templates.add("java/serviceImpl.java.vm"); - templates.add("java/validate.java.vm"); - templates.add("java/vo.java.vm"); +// templates.add("java/entity.java.vm"); +// templates.add("java/mapper.java.vm"); +// templates.add("java/service.java.vm"); +// templates.add("java/serviceImpl.java.vm"); +// templates.add("java/validate.java.vm"); +// if (VelocityUtil.getIsEqually(columns)) { +// templates.add("java/vo.java.vm"); +// } else { +// templates.add("java/voList.java.vm"); +// templates.add("java/voDetail.java.vm"); +// } // if (GenConstants.TPL_CRUD.equals(genTpl)) { // templates.add("vue/index.vue.vm"); // } @@ -117,43 +143,34 @@ public class VelocityUtil { public static String getFileName(String template, GenTable genTable) { String fileName = ""; String entityName = genTable.getEntityName(); - String packageName = genTable.getPackageName(); String moduleName = genTable.getModuleName(); - String[] arrPackage = packageName.split("\\."); - - // 生成路径 - String javaPath = StringUtil.replace(packageName, ".", "/"); - String basePackage = arrPackage[0] + "/" + arrPackage[1]+"/"; - String commonPackage = GenConfig.commonApp + basePackage + "common"; - String mainPackage = StringUtil.format(GenConfig.mainApp, arrPackage.length>=3?arrPackage[2]:"admin")+javaPath; - String subPackage = !moduleName.equals("") ? StringUtil.replace(moduleName, ".", "/") + "/" : ""; if (template.contains("mapper.java.vm")) { - fileName = StringUtil.format("{}/mapper/{}{}Mapper.java", commonPackage, subPackage, entityName); + fileName = StringUtil.format("{}/mapper/{}/{}Mapper.java", GenConfig.commonPackage, moduleName, entityName); } else if (template.contains("entity.java.vm")) { - fileName = StringUtil.format("{}/entity/{}{}Entity.java", commonPackage, subPackage, entityName); + fileName = StringUtil.format("{}/entity/{}/{}Entity.java", GenConfig.commonPackage, moduleName, entityName); } else if (template.contains("service.java.vm")) { - fileName = StringUtil.format("{}/service/I{}Service.java", mainPackage, entityName); + fileName = StringUtil.format("{}/service/{}/I{}Service.java", GenConfig.adminPackage, moduleName, entityName); } else if (template.contains("serviceImpl.java.vm")) { - fileName = StringUtil.format("{}/service/impl/{}ServiceImpl.java", mainPackage, entityName); + fileName = StringUtil.format("{}/service/{}/impl/{}ServiceImpl.java", GenConfig.adminPackage, moduleName, entityName); } else if (template.contains("controller.java.vm")) { - fileName = StringUtil.format("{}/controller/{}{}Controller.java", mainPackage, subPackage, entityName); + fileName = StringUtil.format("{}/controller/{}/{}Controller.java", GenConfig.adminPackage, moduleName, entityName); } else if (template.contains("validate.java.vm")) { - fileName = StringUtil.format("{}/validate/{}{}Param.java", mainPackage, subPackage, entityName); + fileName = StringUtil.format("{}/validate/{}/{}Param.java", GenConfig.adminPackage, moduleName, entityName); } else if (template.contains("vo.java.vm")) { - fileName = StringUtil.format("{}/vo/{}{}Vo.java", mainPackage, subPackage, entityName); + fileName = StringUtil.format("{}/vo/{}/{}Vo.java", GenConfig.adminPackage, moduleName, entityName); } return fileName; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java index 1f255b49..b139345c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java @@ -12,9 +12,10 @@ public class GenColumnVo implements Serializable { private static final long serialVersionUID = 1L; - private Integer id; // 主键 + private Integer id; // 字段主键 private String columnName; // 字段名称 private String columnComment; // 字段描述 + private Integer columnLength; // 字段长度 private String columnType; // 字段类型 private String javaType; // JAVA类型 private String javaField; // JAVA字段 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java index eb1e0e42..f3cc69c8 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * 生成表实体 + * 生成列表Vo */ @Data public class GenTableVo implements Serializable { @@ -13,7 +13,6 @@ public class GenTableVo implements Serializable { private static final long serialVersionUID = 1L; private Integer id; // 生成主键 - private String genTpl; // 生成模板 private String tableName; // 表的名称 private String tableComment; // 表的描述 private String createTime; // 创建时间 diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index db838a2c..2cc133cb 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -1,14 +1,18 @@ -package ${packageName}.controller; +package ${packageName}.admin.controller.${moduleName}; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.aop.Log; -import com.hxkj.admin.service.I${EntityName}Service; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.${EntityName}Param; -import com.hxkj.admin.vo.system.${EntityName}Vo; -import com.hxkj.common.core.AjaxResult; -import com.hxkj.common.core.PageResult; -import com.hxkj.common.validator.annotation.IDMust; +import ${packageName}.admin.config.aop.Log; +import ${packageName}.admin.service.${moduleName}.I${EntityName}Service; +import ${packageName}.admin.validate.PageParam; +import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; +#if($isEqually) +import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; +#else +import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; +import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; +#end +import ${packageName}.common.core.AjaxResult; +import ${packageName}.common.core.PageResult; +import ${packageName}.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,8 +23,8 @@ import java.util.Map; * ${functionName}管理 */ @RestController -@RequestMapping("api/${moduleName}/${businessName}") -public class ${ClassName}Controller { +@RequestMapping("api/${moduleName}") +public class ${EntityName}Controller { @Resource I${EntityName}Service i${EntityName}AdminService; @@ -28,61 +32,74 @@ public class ${ClassName}Controller { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end + * @param pageParam 分页参数 + * @param params 搜索参数 * @return Object */ @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params); + PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params); return AjaxResult.success(list); } /** * ${functionName}详情 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param id 主键ID * @return Object */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - ${EntityName}Vo vo = i${EntityName}Service.detail(id); - return AjaxResult.success(vo); + ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); + return AjaxResult.success(detail); } /** * ${functionName}新增 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 * @return Object */ @Log(title = "${functionName}新增") @PostMapping("/add") public Object add(@Validated(value = ${EntityName}Param.create.class) @RequestBody ${EntityName}Param ${entityName}Param) { - i${EntityName}Service.add(systemAdminParam); + i${EntityName}Service.add(${entityName}Param); return AjaxResult.success(); } /** * ${functionName}编辑 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 * @return Object */ @Log(title = "${functionName}编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ${EntityName}Param.update.class}) @RequestBody ${EntityName}Param} ${entityName}Param}) { - i${EntityName}Service.edit(${entityName}Param}); + public Object edit(@Validated(value = ${EntityName}Param.update.class}) @RequestBody ${EntityName}Param ${entityName}Param}) { + i${EntityName}Service.edit(${entityName}Param); return AjaxResult.success(); } /** * ${functionName}删除 * + #if(!$authorName.equals("")) * @author ${authorName} + #end + * @param ${entityName}Param 参数 * @return Object */ @Log(title = "${functionName}删除") diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index 882b9ade..079da9b5 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -12,7 +12,7 @@ public class ${entityName} implements Serializable { #if($column.isPk) @TableId(value="${column.columnName}", type= IdType.AUTO) #end - private ${column.javaType} ${column.javaField}; + private ${column.javaType} ${column.javaField}; // ${column.columnComment} #end } \ No newline at end of file diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index 0c8d41c6..01a229d7 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -1,11 +1,11 @@ package com.hxkj.common.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.${EntityName}; +import com.hxkj.common.entity.${entityName}.${EntityName}; import org.apache.ibatis.annotations.Mapper; /** - * ${functionName} + * ${functionName}Mapper */ @Mapper public interface ${EntityName}Mapper extends IBaseMapper<${EntityName}> { diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 35c4fb22..afe33116 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -1,9 +1,9 @@ package com.hxkj.admin.service; import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.${EntityName}Param; +import com.hxkj.admin.validate.${entityName}.${EntityName}Param; #if($table.genTpl=="curd") -import com.hxkj.admin.vo.system.${EntityName}Vo; +import com.hxkj.admin.vo.${entityName}.${EntityName}Vo; #end import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.${EntityName}; @@ -19,18 +19,22 @@ public interface I${EntityName}Service { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param pageParam 分页参数 * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ - PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); + PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); #elseif($table.genTpl=="tree") /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} - * @param params 搜索参数 + #end + * @param params 搜索参数 * @return JSONArray */ JSONArray list(Map params); @@ -39,7 +43,9 @@ public interface I${EntityName}Service { /** * ${functionName}详情 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param id 主键ID * @return ${EntityName} */ @@ -48,7 +54,9 @@ public interface I${EntityName}Service { /** * ${functionName}新增 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 */ void add(${EntityName}Param ${entityName}Param); @@ -56,7 +64,9 @@ public interface I${EntityName}Service { /** * ${functionName}编辑 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 */ void edit(${EntityName}Param ${entityName}Param); @@ -64,7 +74,9 @@ public interface I${EntityName}Service { /** * ${functionName}删除 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param id 主键ID */ void del(Integer id); diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index 8b92c68c..32593df8 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -30,10 +30,19 @@ public class ${EntityName}Param implements Serializable { @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) #end #if(!$column.isPk && $column.isRequired) - @NotNull(message = "${column.javaField}参数缺失", groups = {create.class, update.class}) + @NotNull(message = "${column.javaField}参数缺失", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) + #end + #if(!$column.isPk && $column.javaType.equals("String")) + @Length(max = ${column.columnLength}, message = "${column.javaField}参数不能超出${column.columnLength}个字符", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) + #end + #if(!$column.isPk && $column.javaField.substring(0,2)!="is" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long"))) + @DecimalMin(value = 0, message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) + #end + #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer")) + @IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end private ${column.javaType} ${column.javaField}; - #end + #end #end } diff --git a/server/like-generator/src/main/resources/java/vo.java.vm b/server/like-generator/src/main/resources/java/vo.java.vm index fea1568b..4267a141 100644 --- a/server/like-generator/src/main/resources/java/vo.java.vm +++ b/server/like-generator/src/main/resources/java/vo.java.vm @@ -13,7 +13,7 @@ public class ${EntityName}Vo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isList==1) +#if($column.isList==1 || $column.isQuery==1) #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) private String ${column.javaField}; #else diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm new file mode 100644 index 00000000..14caa103 --- /dev/null +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -0,0 +1,25 @@ +package com.hxkj.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * ${EntityName}Vo + */ +@Data +public class ${EntityName}DetailVo implements Serializable { + + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if($column.isQuery==1) + #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) + private String ${column.javaField}; + #else + private ${column.javaType} ${column.javaField}; + #end +#end +#end + +} diff --git a/server/like-generator/src/main/resources/java/voList.java.vm b/server/like-generator/src/main/resources/java/voList.java.vm new file mode 100644 index 00000000..86a20d88 --- /dev/null +++ b/server/like-generator/src/main/resources/java/voList.java.vm @@ -0,0 +1,25 @@ +package com.hxkj.admin.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * ${EntityName}Vo + */ +@Data +public class ${EntityName}ListVo implements Serializable { + + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if($column.isList==1) + #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) + private String ${column.javaField}; + #else + private ${column.javaType} ${column.javaField}; + #end +#end +#end + +} From 2b252d0b16df25cf13d4f397be7eb5693c09a0e5 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 16:51:06 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/generator/util/VelocityUtil.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 90fb7e34..b1165147 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -117,17 +117,17 @@ public class VelocityUtil { public static List getTemplateList(String genTpl, List columns) { List templates = new LinkedList<>(); templates.add("java/controller.java.vm"); -// templates.add("java/entity.java.vm"); -// templates.add("java/mapper.java.vm"); -// templates.add("java/service.java.vm"); -// templates.add("java/serviceImpl.java.vm"); -// templates.add("java/validate.java.vm"); -// if (VelocityUtil.getIsEqually(columns)) { -// templates.add("java/vo.java.vm"); -// } else { -// templates.add("java/voList.java.vm"); -// templates.add("java/voDetail.java.vm"); -// } + templates.add("java/entity.java.vm"); + templates.add("java/mapper.java.vm"); + templates.add("java/service.java.vm"); + templates.add("java/serviceImpl.java.vm"); + templates.add("java/validate.java.vm"); + if (VelocityUtil.getIsEqually(columns)) { + templates.add("java/vo.java.vm"); + } else { + templates.add("java/voList.java.vm"); + templates.add("java/voDetail.java.vm"); + } // if (GenConstants.TPL_CRUD.equals(genTpl)) { // templates.add("vue/index.vue.vm"); // } @@ -173,6 +173,14 @@ public class VelocityUtil { fileName = StringUtil.format("{}/vo/{}/{}Vo.java", GenConfig.adminPackage, moduleName, entityName); } + else if (template.contains("voList.java.vm")) { + fileName = StringUtil.format("{}/vo/{}/{}ListVo.java", GenConfig.adminPackage, moduleName, entityName); + } + + else if (template.contains("voDetail.java.vm")) { + fileName = StringUtil.format("{}/vo/{}/{}DetailVo.java", GenConfig.adminPackage, moduleName, entityName); + } + return fileName; } From 895c1ef99431e5515847c675be7d10e3f9c3cbed Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:04:05 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-generator/src/main/resources/java/entity.java.vm | 2 +- server/like-generator/src/main/resources/java/mapper.java.vm | 2 +- server/like-generator/src/main/resources/java/service.java.vm | 2 +- .../like-generator/src/main/resources/java/serviceImpl.java.vm | 2 +- server/like-generator/src/main/resources/java/validate.java.vm | 2 +- server/like-generator/src/main/resources/java/vo.java.vm | 2 +- server/like-generator/src/main/resources/java/voDetail.java.vm | 2 +- server/like-generator/src/main/resources/java/voList.java.vm | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index 079da9b5..b607818b 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.common.entity; +package ${packageName}.common.entity.${moduleName}; /** * ${functionName}实体 diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index 01a229d7..deb76662 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.common.mapper; +package ${packageName}.common.mapper.${moduleName}; import com.hxkj.common.core.basics.IBaseMapper; import com.hxkj.common.entity.${entityName}.${EntityName}; diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index afe33116..087a2705 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.service; +package ${packageName}.admin.service.${moduleName}; import com.hxkj.admin.validate.PageParam; import com.hxkj.admin.validate.${entityName}.${EntityName}Param; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index fe9e7614..73bc7d9f 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.service.impl; +package ${packageName}.admin.service.${moduleName}.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index 32593df8..d67fa710 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate.system; +package ${packageName}.admin.validate.${moduleName}; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-generator/src/main/resources/java/vo.java.vm b/server/like-generator/src/main/resources/java/vo.java.vm index 4267a141..5575488e 100644 --- a/server/like-generator/src/main/resources/java/vo.java.vm +++ b/server/like-generator/src/main/resources/java/vo.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package ${packageName}.admin.vo.${moduleName}; import lombok.Data; diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index 14caa103..0d3bf248 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package ${packageName}.admin.vo.${moduleName}; import lombok.Data; diff --git a/server/like-generator/src/main/resources/java/voList.java.vm b/server/like-generator/src/main/resources/java/voList.java.vm index 86a20d88..9b6bcf8c 100644 --- a/server/like-generator/src/main/resources/java/voList.java.vm +++ b/server/like-generator/src/main/resources/java/voList.java.vm @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package ${packageName}.admin.vo.${moduleName}; import lombok.Data; From 5fc6c0ad996b52d07f39984847248f8021791f5d Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:06:08 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../like-generator/src/main/resources/java/controller.java.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 2cc133cb..d2fd0922 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -2,7 +2,7 @@ package ${packageName}.admin.controller.${moduleName}; import ${packageName}.admin.config.aop.Log; import ${packageName}.admin.service.${moduleName}.I${EntityName}Service; -import ${packageName}.admin.validate.PageParam; +import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; #if($isEqually) import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; @@ -27,7 +27,7 @@ import java.util.Map; public class ${EntityName}Controller { @Resource - I${EntityName}Service i${EntityName}AdminService; + I${EntityName}Service i${EntityName}Service; /** * ${functionName}列表 From 5b544da8f74274c9093f2c1fe03f2b892890c6a2 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:17:10 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/java/service.java.vm | 10 ++-- .../main/resources/java/serviceImpl.java.vm | 48 ++++++++++++------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 087a2705..1626ed61 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -1,12 +1,12 @@ package ${packageName}.admin.service.${moduleName}; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.${entityName}.${EntityName}Param; +import ${packageName}.admin.validate.common.PageParam; +import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; #if($table.genTpl=="curd") -import com.hxkj.admin.vo.${entityName}.${EntityName}Vo; +import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; #end -import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.${EntityName}; +import ${packageName}.common.core.PageResult; +import ${packageName}.common.entity.${moduleName}.${EntityName}; import java.util.Map; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 73bc7d9f..9a3c9cfc 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -2,26 +2,26 @@ package ${packageName}.admin.service.${moduleName}.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.hxkj.admin.LikeAdminThreadLocal; -import com.hxkj.admin.config.AdminConfig; -import com.hxkj.admin.service.ISystemAdminService; -import com.hxkj.admin.service.ISystemRoleMenuService; -import com.hxkj.admin.service.ISystemRoleService; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.validate.system.SystemAdminParam; -import com.hxkj.admin.vo.system.SystemAdminVo; -import com.hxkj.admin.vo.system.SystemRoleVo; -import com.hxkj.admin.vo.system.SystemSelfVo; -import com.hxkj.common.core.PageResult; -import com.hxkj.common.entity.system.SystemAdmin; -import com.hxkj.common.mapper.system.SystemAdminMapper; -import com.hxkj.common.mapper.system.SystemMenuMapper; -import com.hxkj.common.utils.*; +import ${packageName}.admin.service.common.IArticleService; +import ${packageName}.admin.validate.common.PageParam; +import ${packageName}.admin.validate.${moduleName}.CategoryParam; +import ${packageName}.admin.validate.${moduleName}.ArticleParam; +import ${packageName}.admin.vo.common.${moduleName}.ArticleDetailVo; +import ${packageName}.admin.vo.common.${moduleName}.ArticleListVo; +import ${packageName}.admin.vo.common.${moduleName}.CategoryVo; +import ${packageName}.common.core.PageResult; +import ${packageName}.common.entity.${moduleName}.Article; +import ${packageName}.common.entity.${moduleName}.ArticleCategory; +import ${packageName}.common.mapper.${moduleName}.ArticleCategoryMapper; +import ${packageName}.common.mapper.${moduleName}.ArticleMapper; +import ${packageName}.common.utils.StringUtil; +import ${packageName}.common.utils.TimeUtil; +import ${packageName}.common.utils.UrlUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import javax.annotation.Resource; import java.util.*; @@ -40,7 +40,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param pageParam 分页参数 * @param params 搜索参数 * @return PageResult<${EntityName}Vo> @@ -127,7 +129,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param params 搜索参数 * @return PageResult<${EntityName}Vo> */ @@ -214,7 +218,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param pageParam 分页参数 * @param params 搜索参数 * @return PageResult<${EntityName}Vo> @@ -302,7 +308,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}列表 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param params 搜索参数 * @return PageResult<${EntityName}Vo> */ @@ -376,7 +384,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}详情 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param id 主键参数 * @return ${EntityName} */ @@ -411,7 +421,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}新增 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 */ @Override @@ -435,7 +447,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}编辑 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param ${entityName}Param 参数 */ @Override @@ -472,7 +486,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}删除 * + #if(!$authorName.equals("")) * @author ${authorName} + #end * @param id 主键ID */ @Override From fbabeb46a849385ac084f83ff7d916f8ceeb1dfc Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:40:21 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/java/controller.java.vm | 10 ++- .../src/main/resources/java/service.java.vm | 12 +++- .../main/resources/java/serviceImpl.java.vm | 63 +++++++++++++++---- 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index d2fd0922..1775c22f 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -42,7 +42,11 @@ public class ${EntityName}Controller { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { + #if($isEqually) + PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params); + #else PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params); + #end return AjaxResult.success(list); } @@ -57,7 +61,11 @@ public class ${EntityName}Controller { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + #if($isEqually) ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); + #else + ${EntityName}Vo detail = i${EntityName}Service.detail(id); + #end return AjaxResult.success(detail); } @@ -88,7 +96,7 @@ public class ${EntityName}Controller { */ @Log(title = "${functionName}编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ${EntityName}Param.update.class}) @RequestBody ${EntityName}Param ${entityName}Param}) { + public Object edit(@Validated(value = ${EntityName}Param.update.class) @RequestBody ${EntityName}Param ${entityName}Param) { i${EntityName}Service.edit(${entityName}Param); return AjaxResult.success(); } diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 1626ed61..69867497 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -26,7 +26,11 @@ public interface I${EntityName}Service { * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ - PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); + #if($isEqually) + PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); + #else + PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); + #end #elseif($table.genTpl=="tree") /** * ${functionName}列表 @@ -49,7 +53,11 @@ public interface I${EntityName}Service { * @param id 主键ID * @return ${EntityName} */ - ${EntityName} detail(Integer id); + #if($isEqually) + ${EntityName}Vo detail(Integer id); + #else + ${EntityName}DetailVo detail(Integer id); + #end /** * ${functionName}新增 diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 9a3c9cfc..b561bf7a 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -48,7 +48,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return PageResult<${EntityName}Vo> */ @Override - public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { + public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -96,12 +96,24 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + #else + IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) + #if($isEqually) List<${EntityName}Vo> list = new ArrayList<>(); + #else + List<${EntityName}ListVo> list = new ArrayList<>(); + #end for (${EntityName} item : iPage.getRecords()) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}ListVo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -184,9 +196,17 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper); #if($fields.contains("create_time") || $fields.contains("update_time")) + #if($isEqually) List<${EntityName}Vo> list = new ArrayList<>(); + #else + List<${EntityName}ListVo> list = new ArrayList<>(); + #end for (${EntityName} item : arrayData) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}ListVo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -226,7 +246,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return PageResult<${EntityName}Vo> */ @Override - public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { + public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -275,15 +295,20 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), ${EntityName}Vo.class, mpjQueryWrapper); + #else + IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( + new Page<>(page, limit), + ${EntityName}ListVo.class, + mpjQueryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) - for (${EntityName} item : iPage.getRecords()) { - ${EntityName}Vo vo = new ${EntityName}Vo(); - BeanUtils.copyProperties(item, vo); + for (${EntityName} vo : iPage.getRecords()) { #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) #end @@ -348,13 +373,23 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) List<${EntityName}> arrayData = ${entityName}Mapper.selectJoinList( ${EntityName}Vo.class, mpjQueryWrapper); + #else + List<${EntityNameList}> arrayData = ${entityName}Mapper.selectJoinList( + ${EntityName}ListVo.class, + mpjQueryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) for (${EntityName} item : arrayData) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}Vo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -391,7 +426,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return ${EntityName} */ @Override - public ${EntityName} detail(Integer id) { + public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) { Article model = ${entityName}Mapper.selectOne( #if($field.contains("is_delete")) new QueryWrapper<${EntityName}>() @@ -406,16 +441,22 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { Assert.notNull(model, "${functionName}不存在}"); + #if($isEqually) + ArticleVo vo = new ArticleVo(); + #else + ArticleDetailVo vo = new ArticleDetailVo(); + #end + #if($field.contains("image")) - model.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); + vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); #end #if($field.contains("avatar")) - model.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); + vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); #end #if($field.contains("logo")) - model.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); + vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); #end - return model; + return vo; } /** @@ -454,7 +495,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { */ @Override public void edit(${EntityName}Param ${entityName}Param) { - ${EntityName} model = ${entityName}Mapper.selectOne( + ${EntityName} model = ${entityName}Mapper.selectOne( #if($field.contains("is_delete")) new QueryWrapper<${EntityName}>() .eq("id", ${entityName}Param.getId()) From 56a1af3ecd1e9a9edc7fbc53ff55df8bba3c4718 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:42:53 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/java/service.java.vm | 5 +++++ .../src/main/resources/java/serviceImpl.java.vm | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 69867497..2e892c57 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -3,7 +3,12 @@ package ${packageName}.admin.service.${moduleName}; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; #if($table.genTpl=="curd") +#if($isEqually) import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; +#else +import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; +import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; +#end #end import ${packageName}.common.core.PageResult; import ${packageName}.common.entity.${moduleName}.${EntityName}; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index b561bf7a..edc6dc4d 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -8,8 +8,12 @@ import ${packageName}.admin.service.common.IArticleService; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.CategoryParam; import ${packageName}.admin.validate.${moduleName}.ArticleParam; -import ${packageName}.admin.vo.common.${moduleName}.ArticleDetailVo; -import ${packageName}.admin.vo.common.${moduleName}.ArticleListVo; +#if($isEqually) +import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; +#else +import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; +import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; +#end import ${packageName}.admin.vo.common.${moduleName}.CategoryVo; import ${packageName}.common.core.PageResult; import ${packageName}.common.entity.${moduleName}.Article; From 1031098831c43c7a8b7616672b18b8090902188f Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:43:59 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../like-generator/src/main/resources/java/controller.java.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 1775c22f..4c55ad54 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -62,9 +62,9 @@ public class ${EntityName}Controller { @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { #if($isEqually) - ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); - #else ${EntityName}Vo detail = i${EntityName}Service.detail(id); + #else + ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); #end return AjaxResult.success(detail); } From b338f259acfdf2aec2c0d0c7ecd3fc1563b7533e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:45:59 +0800 Subject: [PATCH 23/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hxkj/generator/util/VelocityUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index b1165147..3bab10f0 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -150,7 +150,7 @@ public class VelocityUtil { } else if (template.contains("entity.java.vm")) { - fileName = StringUtil.format("{}/entity/{}/{}Entity.java", GenConfig.commonPackage, moduleName, entityName); + fileName = StringUtil.format("{}/entity/{}/{}.java", GenConfig.commonPackage, moduleName, entityName); } else if (template.contains("service.java.vm")) { From a859e4ace819906a0a53a2ad1e1048d1b321c079 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:48:48 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-generator/src/main/resources/java/entity.java.vm | 2 +- .../src/main/resources/java/serviceImpl.java.vm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index b607818b..3b9ba86c 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -4,7 +4,7 @@ package ${packageName}.common.entity.${moduleName}; * ${functionName}实体 */ @Data -public class ${entityName} implements Serializable { +public class ${EntityName} implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index edc6dc4d..bd64010b 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; import ${packageName}.admin.service.common.IArticleService; import ${packageName}.admin.validate.common.PageParam; -import ${packageName}.admin.validate.${moduleName}.CategoryParam; import ${packageName}.admin.validate.${moduleName}.ArticleParam; #if($isEqually) import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; @@ -14,11 +13,8 @@ import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; #end -import ${packageName}.admin.vo.common.${moduleName}.CategoryVo; import ${packageName}.common.core.PageResult; import ${packageName}.common.entity.${moduleName}.Article; -import ${packageName}.common.entity.${moduleName}.ArticleCategory; -import ${packageName}.common.mapper.${moduleName}.ArticleCategoryMapper; import ${packageName}.common.mapper.${moduleName}.ArticleMapper; import ${packageName}.common.utils.StringUtil; import ${packageName}.common.utils.TimeUtil; From 9c3ebdf0dbbfdd632b8328a9bf71fb9e2b4ce4c2 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:00:59 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/java/entity.java.vm | 6 ++++++ .../src/main/resources/java/service.java.vm | 1 - .../src/main/resources/java/serviceImpl.java.vm | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/server/like-generator/src/main/resources/java/entity.java.vm b/server/like-generator/src/main/resources/java/entity.java.vm index 3b9ba86c..f535a7cc 100644 --- a/server/like-generator/src/main/resources/java/entity.java.vm +++ b/server/like-generator/src/main/resources/java/entity.java.vm @@ -1,5 +1,11 @@ package ${packageName}.common.entity.${moduleName}; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + /** * ${functionName}实体 */ diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 2e892c57..5a283c2c 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -11,7 +11,6 @@ import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; #end #end import ${packageName}.common.core.PageResult; -import ${packageName}.common.entity.${moduleName}.${EntityName}; import java.util.Map; diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index bd64010b..461b9341 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -456,6 +456,15 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($field.contains("logo")) vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); #end + #if($field.contains("create_time")) + vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime())); + #end + #if($field.contains("update_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime())); + #end + #if($field.contains("delete_time")) + vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime())); + #end return vo; } From 5bb748ee77205813f890cd8fc3a9d9067f761dd8 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:07:52 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/java/mapper.java.vm | 2 +- .../src/main/resources/java/service.java.vm | 20 +++++++++---------- .../main/resources/java/serviceImpl.java.vm | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index deb76662..577c8fec 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -1,7 +1,7 @@ package ${packageName}.common.mapper.${moduleName}; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.common.entity.${entityName}.${EntityName}; +import com.hxkj.common.entity.${moduleName}.${EntityName}; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 5a283c2c..8318e2a0 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -30,11 +30,11 @@ public interface I${EntityName}Service { * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ - #if($isEqually) - PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); - #else - PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); - #end + #if($isEqually) + PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); + #else + PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); + #end #elseif($table.genTpl=="tree") /** * ${functionName}列表 @@ -57,11 +57,11 @@ public interface I${EntityName}Service { * @param id 主键ID * @return ${EntityName} */ - #if($isEqually) - ${EntityName}Vo detail(Integer id); - #else - ${EntityName}DetailVo detail(Integer id); - #end + #if($isEqually) + ${EntityName}Vo detail(Integer id); + #else + ${EntityName}DetailVo detail(Integer id); + #end /** * ${functionName}新增 diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 461b9341..6897c691 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -426,7 +426,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return ${EntityName} */ @Override - public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) { + public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) { Article model = ${entityName}Mapper.selectOne( #if($field.contains("is_delete")) new QueryWrapper<${EntityName}>() From fe39b4b2fa5e981a2ba53adf93f48bb5b12281b2 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:15:04 +0800 Subject: [PATCH 27/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/java/serviceImpl.java.vm | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 6897c691..364eb440 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -105,10 +105,11 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($fields.contains("create_time") || $fields.contains("update_time")) #if($isEqually) List<${EntityName}Vo> list = new ArrayList<>(); + for (${EntityName}Vo item : iPage.getRecords()) { #else List<${EntityName}ListVo> list = new ArrayList<>(); + for (${EntityName}ListVo item : iPage.getRecords()) { #end - for (${EntityName} item : iPage.getRecords()) { #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); #else @@ -116,7 +117,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)); #end #if($fields.contains("avatar")) vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) @@ -300,15 +301,16 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { new Page<>(page, limit), ${EntityName}Vo.class, mpjQueryWrapper); + + for (${EntityName}Vo vo : iPage.getRecords()) { #else IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), - ${EntityName}ListVo.class, + ${EntityName}ListVo.class, mpjQueryWrapper); - #end - #if($fields.contains("create_time") || $fields.contains("update_time")) - for (${EntityName} vo : iPage.getRecords()) { + for (${EntityName}ListVo vo : iPage.getRecords()) { + #end #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) #end @@ -326,7 +328,6 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end } - #end return PageResult.iPageHandle(iPage); } #elseif($table.genTpl=="tree") @@ -483,7 +484,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if(!$column.isIncrement) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) - model.set${AttrName}(UrlUtil.toRelativeUrl(Param.get${AttrName}())) + model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); #elseif($column.javaField.equals("createTime") || $column.javaField.equals("updateTime")) @@ -522,7 +523,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if(!$column.isIncrement) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) - model.set${AttrName}(UrlUtil.toRelativeUrl(Param.get${AttrName}())) + model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); #elseif($column.javaField.equals("updateTime")) @@ -546,11 +547,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { ${EntityName} model = ${entityName}Mapper.selectOne( #if($fields.contains("is_delete")) new QueryWrapper<${EntityName}>() + .select("id") .eq("id", id) .eq("is_delete", 0) .last("limit 1")); #else new QueryWrapper<${EntityName}>() + .select("id") .eq("id", id) .last("limit 1")); #end @@ -562,7 +565,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($fields.contains("delete_time")) model.setDeleteTime(System.currentTimeMillis() / 1000); #end - ${entityName}Mapper.updateById(article); + ${entityName}Mapper.updateById(model); #else ${entityName}Mapper.delete(new QueryWrapper<${EntityName}>().eq("id", id)); #end From da3af0611c00508cae879ca5ce42162fff60ef32 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:20:36 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/java/serviceImpl.java.vm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 364eb440..6abdef42 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import ${packageName}.admin.service.common.IArticleService; +import ${packageName}.admin.service.common.${moduleName}.IArticleService; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.ArticleParam; #if($isEqually) @@ -16,10 +16,8 @@ import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; import ${packageName}.common.core.PageResult; import ${packageName}.common.entity.${moduleName}.Article; import ${packageName}.common.mapper.${moduleName}.ArticleMapper; -import ${packageName}.common.utils.StringUtil; import ${packageName}.common.utils.TimeUtil; import ${packageName}.common.utils.UrlUtil; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -252,7 +250,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { Integer limit = pageParam.getPageSize(); MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); - mpjQueryWrapper.join("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id") + mpjQueryWrapper.leftJoin("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id") #if($isSearch) #if($fields.contains("is_delete")) mpjQueryWrapper.eq("is_delete", 0); @@ -312,7 +310,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { for (${EntityName}ListVo vo : iPage.getRecords()) { #end #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)); #end #if($fields.contains("avatar")) vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) @@ -321,10 +319,10 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) #end #if($fields.contains("create_time")) - vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); #end #if($fields.contains("update_time")) - vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); #end } From 43e1a5fd407d491b41183997be146b36d620a937 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:22:03 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../like-generator/src/main/resources/java/serviceImpl.java.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 6abdef42..2110335e 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import ${packageName}.admin.service.common.${moduleName}.IArticleService; +import ${packageName}.admin.service.${moduleName}.IArticleService; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.ArticleParam; #if($isEqually) From 859397ea7cc3880beef90862cc37e45e85a51815 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:25:46 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/java/serviceImpl.java.vm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 2110335e..c37ea3ca 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -115,13 +115,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)); + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); #end #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) #end #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) #end #if($fields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); @@ -208,13 +208,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())) #end #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) #end #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) #end #if($fields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); @@ -310,13 +310,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { for (${EntityName}ListVo vo : iPage.getRecords()) { #end #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)); + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); #end #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) #end #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) #end #if($fields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); @@ -391,13 +391,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) + vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())) #end #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar)) + vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) #end #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo)) + vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) #end #if($fields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); From 49496b852e6606b53a5713a48be41380dc3de7f3 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 18:58:38 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/generator/util/VelocityUtil.java | 3 ++- .../src/main/resources/java/serviceImpl.java.vm | 8 ++++---- .../src/main/resources/java/validate.java.vm | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 3bab10f0..5f578c2e 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -47,8 +47,8 @@ public class VelocityUtil { boolean isSearch = false; List fields = new LinkedList<>(); for (GenTableColumn column : columns) { - fields.add(column.getColumnName()); if (column.getIsQuery() == 1) { + fields.add(column.getColumnName()); isSearch = true; } } @@ -68,6 +68,7 @@ public class VelocityUtil { velocityContext.put("fields", fields); velocityContext.put("isSearch", isSearch); velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns)); + System.out.println(fields); return velocityContext; } diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index c37ea3ca..25a2f3d6 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -85,7 +85,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($column.javaField.equals($column.columnName)) "${column.queryType}:${column.javaField}:str", #else - "${column.queryType}:${column.javaField}@${column.columnName}:str", + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", #end #end #end @@ -183,7 +183,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($column.javaField.equals($column.columnName)) "${column.queryType}:${column.javaField}:str", #else - "${column.queryType}:${column.javaField}@${column.columnName}:str", + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", #end #end #end @@ -250,7 +250,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { Integer limit = pageParam.getPageSize(); MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); - mpjQueryWrapper.leftJoin("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id") + mpjQueryWrapper.leftJoin("{$table.sub_table_name} f ON f.{$table.sub_table_fk}=t.id"); #if($isSearch) #if($fields.contains("is_delete")) mpjQueryWrapper.eq("is_delete", 0); @@ -285,7 +285,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($column.javaField.equals($column.columnName)) "${column.queryType}:${column.javaField}:str", #else - "${column.queryType}:${column.javaField}@${column.columnName}:str", + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", #end #end #end diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index d67fa710..9070f898 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -29,14 +29,14 @@ public class ${EntityName}Param implements Serializable { #if($column.isPk) @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) #end - #if(!$column.isPk && $column.isRequired) + #if(!$column.isPk && $column.isRequired && !$column.columnType.equals('text')) @NotNull(message = "${column.javaField}参数缺失", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end - #if(!$column.isPk && $column.javaType.equals("String")) + #if(!$column.isPk && $column.javaType.equals("String") && !$column.columnType.equals('text')) @Length(max = ${column.columnLength}, message = "${column.javaField}参数不能超出${column.columnLength}个字符", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end #if(!$column.isPk && $column.javaField.substring(0,2)!="is" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long"))) - @DecimalMin(value = 0, message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) + @DecimalMin(value = "0", message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer")) @IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) From 446700884959053ea5fd7e66c6ca9af710175d73 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 14 Jul 2022 09:25:35 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/generator/util/VelocityUtil.java | 38 ++------------ .../main/resources/java/controller.java.vm | 12 ----- .../src/main/resources/java/service.java.vm | 16 +----- .../main/resources/java/serviceImpl.java.vm | 50 ++----------------- .../src/main/resources/java/voDetail.java.vm | 2 - 5 files changed, 7 insertions(+), 111 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 5f578c2e..4936bf96 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -1,9 +1,7 @@ package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; -import com.hxkj.common.utils.UrlUtil; import com.hxkj.generator.config.GenConfig; -import com.hxkj.generator.constant.GenConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import org.apache.velocity.VelocityContext; @@ -14,10 +12,7 @@ import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import java.io.File; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Properties; -import java.util.function.Function; -import java.util.stream.Collectors; public class VelocityUtil { @@ -67,9 +62,6 @@ public class VelocityUtil { velocityContext.put("columns", columns); velocityContext.put("fields", fields); velocityContext.put("isSearch", isSearch); - velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns)); - System.out.println(fields); - return velocityContext; } @@ -88,27 +80,6 @@ public class VelocityUtil { return genPath + File.separator; } - /** - * 判断需列表字段和查询字段是否一致 - * - * @author fzr - * @param columns 字段列表 - * @return Boolean - */ - public static Boolean getIsEqually(List columns) { - StringBuilder listStr = new StringBuilder(); - StringBuilder queryStr = new StringBuilder(); - for (GenTableColumn col : columns) { - if (col.getIsList() == 1) { - listStr.append(",").append(col.getColumnName()); - } - if (col.getIsQuery() == 1) { - queryStr.append(",").append(col.getColumnName()); - } - } - return listStr.toString().equals(queryStr.toString()); - } - /** * 获取模板列表 * @@ -123,12 +94,9 @@ public class VelocityUtil { templates.add("java/service.java.vm"); templates.add("java/serviceImpl.java.vm"); templates.add("java/validate.java.vm"); - if (VelocityUtil.getIsEqually(columns)) { - templates.add("java/vo.java.vm"); - } else { - templates.add("java/voList.java.vm"); - templates.add("java/voDetail.java.vm"); - } + templates.add("java/voList.java.vm"); + templates.add("java/voDetail.java.vm"); + // if (GenConstants.TPL_CRUD.equals(genTpl)) { // templates.add("vue/index.vue.vm"); // } diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index 4c55ad54..b3cccecd 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -4,12 +4,8 @@ import ${packageName}.admin.config.aop.Log; import ${packageName}.admin.service.${moduleName}.I${EntityName}Service; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; -#if($isEqually) -import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; -#else import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; -#end import ${packageName}.common.core.AjaxResult; import ${packageName}.common.core.PageResult; import ${packageName}.common.validator.annotation.IDMust; @@ -42,11 +38,7 @@ public class ${EntityName}Controller { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { - #if($isEqually) - PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params); - #else PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params); - #end return AjaxResult.success(list); } @@ -61,11 +53,7 @@ public class ${EntityName}Controller { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { - #if($isEqually) - ${EntityName}Vo detail = i${EntityName}Service.detail(id); - #else ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); - #end return AjaxResult.success(detail); } diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index 8318e2a0..38763fc5 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -2,14 +2,8 @@ package ${packageName}.admin.service.${moduleName}; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; -#if($table.genTpl=="curd") -#if($isEqually) -import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; -#else import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; -#end -#end import ${packageName}.common.core.PageResult; import java.util.Map; @@ -20,7 +14,7 @@ import java.util.Map; public interface I${EntityName}Service { #if($table.genTpl=="curd") - /** + /**、 * ${functionName}列表 * #if(!$authorName.equals("")) @@ -30,11 +24,7 @@ public interface I${EntityName}Service { * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ - #if($isEqually) - PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); - #else PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); - #end #elseif($table.genTpl=="tree") /** * ${functionName}列表 @@ -57,11 +47,7 @@ public interface I${EntityName}Service { * @param id 主键ID * @return ${EntityName} */ - #if($isEqually) - ${EntityName}Vo detail(Integer id); - #else ${EntityName}DetailVo detail(Integer id); - #end /** * ${functionName}新增 diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 25a2f3d6..bbb1d587 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -7,12 +7,8 @@ import com.github.yulichang.query.MPJQueryWrapper; import ${packageName}.admin.service.${moduleName}.IArticleService; import ${packageName}.admin.validate.common.PageParam; import ${packageName}.admin.validate.${moduleName}.ArticleParam; -#if($isEqually) -import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo; -#else import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; -#end import ${packageName}.common.core.PageResult; import ${packageName}.common.entity.${moduleName}.Article; import ${packageName}.common.mapper.${moduleName}.ArticleMapper; @@ -46,7 +42,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return PageResult<${EntityName}Vo> */ @Override - public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { + public PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -94,25 +90,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end - #if($isEqually) - IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); - #else IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); - #end #if($fields.contains("create_time") || $fields.contains("update_time")) - #if($isEqually) - List<${EntityName}Vo> list = new ArrayList<>(); - for (${EntityName}Vo item : iPage.getRecords()) { - #else List<${EntityName}ListVo> list = new ArrayList<>(); - for (${EntityName}ListVo item : iPage.getRecords()) { #end - #if($isEqually) - ${EntityName}Vo vo = new ${EntityName}Vo(); - #else - ${EntityName}ListVo vo = new ${EntityName}ListVo(); - #end + for (${EntityName}ListVo item : iPage.getRecords()) { + ${EntityName}ListVo vo = new ${EntityName}ListVo(); BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); @@ -195,17 +179,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper); #if($fields.contains("create_time") || $fields.contains("update_time")) - #if($isEqually) - List<${EntityName}Vo> list = new ArrayList<>(); - #else List<${EntityName}ListVo> list = new ArrayList<>(); - #end for (${EntityName} item : arrayData) { - #if($isEqually) - ${EntityName}Vo vo = new ${EntityName}Vo(); - #else ${EntityName}ListVo vo = new ${EntityName}ListVo(); - #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())) @@ -294,21 +270,12 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end - #if($isEqually) - IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectJoinPage( - new Page<>(page, limit), - ${EntityName}Vo.class, - mpjQueryWrapper); - - for (${EntityName}Vo vo : iPage.getRecords()) { - #else IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), ${EntityName}ListVo.class, mpjQueryWrapper); for (${EntityName}ListVo vo : iPage.getRecords()) { - #end #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); #end @@ -372,15 +339,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end - #if($isEqually) - List<${EntityName}> arrayData = ${entityName}Mapper.selectJoinList( - ${EntityName}Vo.class, - mpjQueryWrapper); - #else List<${EntityNameList}> arrayData = ${entityName}Mapper.selectJoinList( ${EntityName}ListVo.class, mpjQueryWrapper); - #end #if($fields.contains("create_time") || $fields.contains("update_time")) for (${EntityName} item : arrayData) { @@ -440,12 +401,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { Assert.notNull(model, "${functionName}不存在}"); - #if($isEqually) - ArticleVo vo = new ArticleVo(); - #else ArticleDetailVo vo = new ArticleDetailVo(); - #end - #if($field.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); #end diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index 0d3bf248..383a1592 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -13,13 +13,11 @@ public class ${EntityName}DetailVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isQuery==1) #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) private String ${column.javaField}; #else private ${column.javaType} ${column.javaField}; #end #end -#end } From 526bff448d19390ee147756f5c14b87bcf387ec2 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 14 Jul 2022 15:11:04 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxkj/common/config/GlobalConfig.java | 3 + .../com/hxkj/generator/entity/GenTable.java | 2 - .../hxkj/generator/entity/GenTableColumn.java | 1 + .../service/impl/GenerateServiceImpl.java | 4 - .../java/com/hxkj/generator/util/GenUtil.java | 19 +- .../com/hxkj/generator/util/VelocityUtil.java | 21 +- .../main/resources/java/serviceImpl.java.vm | 587 +++++++----------- .../src/main/resources/java/vo.java.vm | 25 - .../src/main/resources/java/voDetail.java.vm | 8 +- .../src/main/resources/java/voList.java.vm | 6 +- 10 files changed, 239 insertions(+), 437 deletions(-) delete mode 100644 server/like-generator/src/main/resources/java/vo.java.vm diff --git a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java index c5fbaeec..e9eb48e6 100644 --- a/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java @@ -17,6 +17,9 @@ public class GlobalConfig { // 系统加密字符 public static String secret = "UVTIyzCy"; + // Mysql表前缀 + public static String tablePrefix = "ls_"; + // Redis键前缀 public static String redisPrefix = "Like:"; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 82cfc8b4..11d5bbc1 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -22,9 +22,7 @@ public class GenTable implements Serializable { private String subTableFk; private String authorName; private String entityName; - private String packageName; private String moduleName; - private String businessName; private String functionName; private String treePrimary; private String treeParent; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 0db9edf6..0d80c28e 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -29,6 +29,7 @@ public class GenTableColumn implements Serializable { private Integer isInsert; private Integer isEdit; private Integer isList; + private Integer isDetail; private Integer isQuery; private String queryType; private String htmlType; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 51b2bfc9..9bd0eae6 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -150,8 +150,6 @@ public class GenerateServiceImpl implements IGenerateService { gen.put("genType", genTable.getGenType()); gen.put("genPath", genTable.getGenPath()); gen.put("moduleName", genTable.getModuleName()); - gen.put("packageName", genTable.getPackageName()); - gen.put("businessName", genTable.getBusinessName()); gen.put("functionName", genTable.getFunctionName()); maps.put("gen", gen); @@ -227,8 +225,6 @@ public class GenerateServiceImpl implements IGenerateService { model.setAuthorName(genParam.getAuthorName()); model.setEntityName(genParam.getEntityName()); model.setModuleName(genParam.getModuleName()); - model.setPackageName(genParam.getPackageName()); - model.setBusinessName(genParam.getBusinessName()); model.setFunctionName(genParam.getFunctionName()); model.setTreePrimary(genParam.getTreePrimary()); model.setTreeParent(genParam.getTreeParent()); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 08cd7551..07fd1978 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -29,9 +29,7 @@ public class GenUtil { table.setTableComment(tableDesc); table.setAuthorName(map.getOrDefault("author_name", "")); table.setEntityName(GenUtil.toClassName(tableName)); - table.setModuleName(GenUtil.toBusinessName(tableName)); - table.setPackageName(GenConfig.packageName); - table.setBusinessName(GenUtil.toBusinessName(tableName)); + table.setModuleName(GenUtil.toModuleName(tableName)); table.setFunctionName(GenUtil.replaceText(tableDesc)); table.setCreateTime(System.currentTimeMillis() / 1000); table.setUpdateTime(System.currentTimeMillis() / 1000); @@ -142,19 +140,6 @@ public class GenUtil { } } - /** - * 转模块名 - * - * @author fzr - * @param packageName 包名 - * @return 模块名 - */ - public static String toModuleName(String packageName) { - int lastIndex = packageName.lastIndexOf("."); - int nameLength = packageName.length(); - return StringUtil.substring(packageName, lastIndex + 1, nameLength); - } - /** * 转业务名 * @@ -162,7 +147,7 @@ public class GenUtil { * @param tableName 表名 * @return 业务名 */ - public static String toBusinessName(String tableName) { + public static String toModuleName(String tableName) { int lastIndex = tableName.lastIndexOf("_"); int nameLength = tableName.length(); return StringUtil.substring(tableName, lastIndex + 1, nameLength); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 4936bf96..02ecefd5 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -2,6 +2,7 @@ package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; import com.hxkj.generator.config.GenConfig; +import com.hxkj.generator.constant.SqlConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; import org.apache.velocity.VelocityContext; @@ -38,12 +39,19 @@ public class VelocityUtil { * @return VelocityContext */ public static VelocityContext prepareContext(GenTable table, List columns) { - // 处理变量字段 - boolean isSearch = false; - List fields = new LinkedList<>(); + boolean isSearch = false; // 是否需要搜索 + List allFields = new LinkedList<>(); // 所有字段 + List listFields = new LinkedList<>(); // 列表字段 + List detailFields = new LinkedList<>(); // 详情字段 for (GenTableColumn column : columns) { + allFields.add(column.getColumnName()); + if (column.getIsList() == 1) { + listFields.add(column.getColumnName()); + } + if (column.getIsDetail() == 1) { + detailFields.add(column.getColumnName()); + } if (column.getIsQuery() == 1) { - fields.add(column.getColumnName()); isSearch = true; } } @@ -60,7 +68,10 @@ public class VelocityUtil { velocityContext.put("functionName", StringUtil.isNotEmpty(table.getFunctionName()) ? table.getFunctionName() : "【请填写功能名称】"); velocityContext.put("table", table); velocityContext.put("columns", columns); - velocityContext.put("fields", fields); + velocityContext.put("dateFields", SqlConstants.COLUMN_TIME_NAME); + velocityContext.put("allFields", allFields); + velocityContext.put("listFields", listFields); + velocityContext.put("detailFields", detailFields); velocityContext.put("isSearch", isSearch); return velocityContext; } diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index bbb1d587..f63a79f9 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -4,16 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import ${packageName}.admin.service.${moduleName}.IArticleService; +import ${packageName}.admin.service.${moduleName}.I${EntityName}Service; import ${packageName}.admin.validate.common.PageParam; -import ${packageName}.admin.validate.${moduleName}.ArticleParam; +import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; import ${packageName}.common.core.PageResult; -import ${packageName}.common.entity.${moduleName}.Article; -import ${packageName}.common.mapper.${moduleName}.ArticleMapper; +import ${packageName}.common.entity.${moduleName}.${EntityName}; +import ${packageName}.common.mapper.${moduleName}.${EntityName}Mapper; import ${packageName}.common.utils.TimeUtil; import ${packageName}.common.utils.UrlUtil; +import com.hxkj.common.config.GlobalConfig; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -25,408 +26,250 @@ import java.util.*; */ @Service public class ${EntityName}ServiceImpl implements I${EntityName}Service { + ## 设置模板方式的变量 + #if($table.genTpl.equals("curd")) + #set($genTpl = "PageResult<${EntityName}ListVo>") + #if($isSearch) + #set($isSearchParam = true) + #set($genParam = "PageParam pageParam, Map params") + #else + #set($isSearchParam = false) + #set($genParam = "PageParam pageParam") + #end + #else + #set($genTpl = "JSONArray") + #if($isSearch) + #set($isSearchParam = true) + #set($genParam = "Map params") + #else + #set($isSearchParam = false) + #set($genParam = "") + #end + #end + ## 设置基本的参数变量 + #set($isAuthor = !$authorName.equals("")) + #set($pageParam = "@param pageParam 分页参数") + #set($searchparams = "@param params 搜索参数") @Resource ${EntityName}Mapper ${entityName}Mapper; -#if($table.sub_table_name.equals("")) -#if($table.genTpl=="curd") /** * ${functionName}列表 * - #if(!$authorName.equals("")) + #if($isAuthor) * @author ${authorName} #end - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return PageResult<${EntityName}Vo> + * ${pageParam} + #if($isSearchParam) + * ${searchparams} + #end + * @return $genTpl */ @Override - public PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); + public $genTpl list($genParam) { + #if($table.genTpl.equals("curd")) + Integer pageNo = pageParam.getPageNo(); + Integer pageSize = pageParam.getPageSize(); + #end + #if(!$table.subTableName.equals("") && !$table.subTableFk.equals("")) + MPJQueryWrapper<${EntityName}> queryWrapper = new MPJQueryWrapper<>(); + queryWrapper.innerJoin("?_$table.subTableName f ON f.$table.SubTableFk=t.id".replace("?_", GlobalConfig.tablePrefix)); + #else QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>(); - #if($isSearch) - #if($fields.contains("is_delete")) - queryWrapper.eq("is_delete", 0); - #end - #if($fields.contains("sort")) - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - #else - queryWrapper.orderByDesc("id"); - #end - #end - - #if($isSearch) - ${entityName}Mapper.setSearch(queryWrapper, params, new String[]{ - #foreach ($column in $columns) - #if($column.isQuery) - #if($column.queryType=="datetime") - "datetime:startTime-endTime@${column.columnName}:str" - #else - #if($column.javaType=="Integer") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:int", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:int", - #end - #elseif($column.javaType=="Long") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:long", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:long", - #end - #else - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:str", - #else - "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", - #end - #end - #end - #end - #end - }); - #end - - IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); - - #if($fields.contains("create_time") || $fields.contains("update_time")) - List<${EntityName}ListVo> list = new ArrayList<>(); - #end - for (${EntityName}ListVo item : iPage.getRecords()) { - ${EntityName}ListVo vo = new ${EntityName}ListVo(); - BeanUtils.copyProperties(item, vo); - #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); - #end - #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) - #end - #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) - #end - #if($fields.contains("create_time")) - vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); - #end - #if($fields.contains("update_time")) - vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); - #end - list.add(vo); - } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); - #else - return PageResult.iPageHandle(iPage); - #end - } -#elseif($table.genTpl=="tree") - /** - * ${functionName}列表 - * - #if(!$authorName.equals("")) - * @author ${authorName} - #end - * @param params 搜索参数 - * @return PageResult<${EntityName}Vo> - */ - @Override - public JSONArray list(Map params) { - QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>(); - #if($isSearch) - #if($fields.contains("is_delete")) - queryWrapper.eq("is_delete", 0); - #end - #if($fields.contains("sort")) - queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - #else - queryWrapper.orderByDesc("id"); - #end - #end - - #if($isSearch) - ${entityName}Mapper.setSearch(queryWrapper, params, new String[]{ - #foreach ($column in $columns) - #if($column.isQuery) - #if($column.queryType=="datetime") - "datetime:startTime-endTime@${column.columnName}:str" - #else - #if($column.javaType=="Integer") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:int", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:int", - #end - #elseif($column.javaType=="Long") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:long", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:long", - #end - #else - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:str", - #else - "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", - #end - #end - #end - #end - #end - }); - #end - - List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper); - - #if($fields.contains("create_time") || $fields.contains("update_time")) - List<${EntityName}ListVo> list = new ArrayList<>(); - for (${EntityName} item : arrayData) { - ${EntityName}ListVo vo = new ${EntityName}ListVo(); - BeanUtils.copyProperties(item, vo); - #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())) - #end - #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) - #end - #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) - #end - #if($fields.contains("create_time")) - vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); - #end - #if($fields.contains("update_time")) - vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); - #end - list.add(vo); - } - JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list)); - return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); - #else - JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(arrayData)); - return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); - #end - } -#end -#else -#if($table.genTpl=="curd") - /** - * ${functionName}列表 - * - #if(!$authorName.equals("")) - * @author ${authorName} - #end - * @param pageParam 分页参数 - * @param params 搜索参数 - * @return PageResult<${EntityName}Vo> - */ - @Override - public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { - Integer page = pageParam.getPageNo(); - Integer limit = pageParam.getPageSize(); - - MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); - mpjQueryWrapper.leftJoin("{$table.sub_table_name} f ON f.{$table.sub_table_fk}=t.id"); - #if($isSearch) + #end #if($fields.contains("is_delete")) - mpjQueryWrapper.eq("is_delete", 0); + queryWrapper.eq("is_delete", 0); #end #if($fields.contains("sort")) - mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id")); + queryWrapper.orderByDesc(Arrays.asList("sort", "id")); #else - mpjQueryWrapper.orderByDesc("id"); - #end + queryWrapper.orderByDesc("id"); #end - #if($isSearch) + #if($isSearch) ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{ - #foreach ($column in $columns) - #if($column.isQuery) - #if($column.queryType=="datetime") - "datetime:startTime-endTime@${column.columnName}:str" + #foreach ($column in $columns) + #if($column.isQuery) + #if($dateFields.contains($column.columnName)) + "datetime:startTime-endTime@${column.columnName}:str" + #elseif($column.javaType=="Integer") + #if($column.javaField.equals($column.columnName)) + "${column.queryType.toLowerCase()}:${column.javaField}:int", #else - #if($column.javaType=="Integer") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:int", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:int", - #end - #elseif($column.javaType=="Long") - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:long", - #else - "${column.queryType}:${column.javaField}@${column.columnName}:long", - #end - #else - #if($column.javaField.equals($column.columnName)) - "${column.queryType}:${column.javaField}:str", - #else - "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", - #end - #end + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:int", + #end + #elseif($column.javaType=="Long") + #if($column.javaField.equals($column.columnName)) + "${column.queryType.toLowerCase()}:${column.javaField}:long", + #else + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:long", + #end + #else + #if($column.javaField.equals($column.columnName)) + "${column.queryType.toLowerCase()}:${column.javaField}:str", + #else + "${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str", #end #end - #end - }); - #end + #end + #end + } + #end + #if(!$table.subTableName.equals("") && !$table.subTableFk.equals("")) + #set($isJoin = true) + #set($joinCurdList = "${EntityName}ListVo") + #set($joinCurdName = "iPage.getRecords()") + #if($table.genTpl.equals("curd")) IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), ${EntityName}ListVo.class, mpjQueryWrapper); - - for (${EntityName}ListVo vo : iPage.getRecords()) { - #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())); - #end - #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) - #end - #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) - #end - #if($fields.contains("create_time")) - vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); - #end - #if($fields.contains("update_time")) - vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); - #end - } - - return PageResult.iPageHandle(iPage); - } -#elseif($table.genTpl=="tree") - /** - * ${functionName}列表 - * - #if(!$authorName.equals("")) - * @author ${authorName} - #end - * @param params 搜索参数 - * @return PageResult<${EntityName}Vo> - */ - @Override - public JSONArray list(Map params) { - MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); - #if($isSearch) - #if($fields.contains("is_delete")) - mpjQueryWrapper.eq("t.is_delete", 0); - #end - #if($fields.contains("sort")) - mpjQueryWrapper.orderByDesc(Arrays.asList("t.sort", "t.id")); + #else + List<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinList( + ${EntityName}ListVo.class, + mpjQueryWrapper); + #end #else - mpjQueryWrapper.orderByDesc("t.id"); - #end + #set($isJoin = false) + #set($joinCurdList = "${EntityName}") + #if($table.genTpl.equals("curd")) + #set($joinCurdName = "iPage.getRecords()") + IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + #else + #set($joinCurdName = "array") + List<${EntityName}> array = ${entityName}Mapper.selectList(queryWrapper); + #end #end - #if($isSearch) - ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{ - #foreach ($column in $columns) - #if($column.isQuery) - #if($column.queryType=="datetime") - "datetime:startTime-endTime@t.${column.columnName}:str" - #else - #if($column.javaType=="Integer") - "${column.queryType}:${column.javaField}@t.${column.columnName}:int", - #elseif($column.javaType=="Long") - "${column.queryType}:${column.javaField}@t.${column.columnName}:long", - #else - "${column.queryType}:${column.javaField}@t.${column.columnName}:str", - #end - #end + #set($filter = false) + #if($listFields.contains("create_time") || $listFields.contains("update_time") || + $listFields.contains("delete_time") || $listFields.contains("start_time") || + $listFields.contains("end_time") || $listFields.contains("image") || + $listFields.contains("avatar") || $listFields.contains("logo") || + $listFields.contains("img")) + #set($filter = true) + #if(!$isJoin) + List<${EntityName}ListVo> list = new LinkedList<>(); #end - #end - }); - #end - - List<${EntityNameList}> arrayData = ${entityName}Mapper.selectJoinList( - ${EntityName}ListVo.class, - mpjQueryWrapper); - - #if($fields.contains("create_time") || $fields.contains("update_time")) - for (${EntityName} item : arrayData) { - #if($isEqually) - ${EntityName}Vo vo = new ${EntityName}Vo(); - #else + for($joinCurdList item : $joinCurdName) { + #if(!$isJoin) ${EntityName}ListVo vo = new ${EntityName}Vo(); - #end BeanUtils.copyProperties(item, vo); - #if($fields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage())) #end - #if($fields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(vo.getAvatar())) + #if($listFields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(item.getImage())) #end - #if($fields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(vo.getLogo())) + #if($listFields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar())) #end - #if($fields.contains("create_time")) + #if($listFields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo())) + #end + #if($listFields.contains("img")) + vo.setImg(UrlUtil.toAbsoluteUrl(item.getImg())) + #end + #if($listFields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); #end - #if($fields.contains("update_time")) + #if($listFields.contains("update_time")) vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); #end - list.add(vo); + #if($listFields.contains("delete_time")) + vo.setDeleteTime(TimeUtil.timestampToDate(item.getDeleteTime())); + #end + #if($listFields.contains("start_time")) + vo.setStartTime(TimeUtil.timestampToDate(item.getStartTime())); + #end + #if($listFields.contains("end_time")) + vo.setEndTime(TimeUtil.timestampToDate(item.getEndTime())); + #end + #if(!$isJoin) + list.add(vo) + #end } - - #end - JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(arrayData)); - return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); - } #end -#end + + #if($table.genTpl.equals("curd")) + #if($isJoin) + return PageResult.iPageHandle(iPage); + #else + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + #end + #else + #if($filter) + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(list)); + #else + JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(array)); + #end + return ArrayUtil.listToTree(jsonArray, "${table.treePrimary}", "${table.treeParent}", "children"); + #end + } /** * ${functionName}详情 * - #if(!$authorName.equals("")) + #if($isAuthor) * @author ${authorName} #end * @param id 主键参数 * @return ${EntityName} */ @Override - public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) { - Article model = ${entityName}Mapper.selectOne( - #if($field.contains("is_delete")) - new QueryWrapper<${EntityName}>() - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - #else - new QueryWrapper<${EntityName}>() - .eq("id", id) - .last("limit 1")); - #end + public ${EntityName}DetailVo detail(Integer id) { + ${EntityName} model = new QueryWrapper<${EntityName}>() + .eq("id", id) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); - Assert.notNull(model, "${functionName}不存在}"); + Assert.notNull(model, "数据不存在"); - ArticleDetailVo vo = new ArticleDetailVo(); - #if($field.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); + ${EntityName}DetailVo vo = new ${EntityName}DetailVo(); + BeanUtils.copyProperties(model, vo); + #if($detailFields.contains("create_time") || $detailFields.contains("update_time") || + $detailFields.contains("delete_time") || $detailFields.contains("start_time") || + $detailFields.contains("end_time") || $detailFields.contains("image") || + $detailFields.contains("avatar") || $detailFields.contains("logo") || + $detailFields.contains("img")) + #if($detailFields.contains("image")) + vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())) #end - #if($field.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); + #if($detailFields.contains("avatar")) + vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())) #end - #if($field.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); + #if($detailFields.contains("logo")) + vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())) #end - #if($field.contains("create_time")) + #if($detailFields.contains("img")) + vo.setImg(UrlUtil.toAbsoluteUrl(model.getImg())) + #end + #if($detailFields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime())); #end - #if($field.contains("update_time")) + #if($detailFields.contains("update_time")) vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime())); #end - #if($field.contains("delete_time")) - vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime())); + #if($detailFields.contains("delete_time")) + vo.setDeleteTime(TimeUtil.timestampToDate(model.getDeleteTime())); #end + #if($detailFields.contains("start_time")) + vo.setStartTime(TimeUtil.timestampToDate(model.getStartTime())); + #end + #if($detailFields.contains("end_time")) + vo.setEndTime(TimeUtil.timestampToDate(model.getEndTime())); + #end + #end return vo; } /** * ${functionName}新增 * - #if(!$authorName.equals("")) + #if($isAuthor) * @author ${authorName} #end * @param ${entityName}Param 参数 @@ -435,13 +278,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { public void add(${EntityName}Param ${entityName}Param) { ${EntityName} model = new ${EntityName}(); #foreach ($column in $columns) - #if(!$column.isIncrement) + #if($column.isInsert) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) - #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) + #if($column.javaField.equals("image") || $column.javaField.equals("avatar") || $column.javaField.equals("logo") || $column.javaField.equals("img")) model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); - #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) + #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); - #elseif($column.javaField.equals("createTime") || $column.javaField.equals("updateTime")) + #elseif($dateFields.contains($column.columnName)) model.set${AttrName}(System.currentTimeMillis() / 1000); #end #end @@ -452,35 +295,30 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}编辑 * - #if(!$authorName.equals("")) + #if($isAuthor) * @author ${authorName} #end * @param ${entityName}Param 参数 */ @Override public void edit(${EntityName}Param ${entityName}Param) { - ${EntityName} model = ${entityName}Mapper.selectOne( - #if($field.contains("is_delete")) - new QueryWrapper<${EntityName}>() - .eq("id", ${entityName}Param.getId()) - .eq("is_delete", 0) - .last("limit 1")); - #else - new QueryWrapper<${EntityName}>() - .eq("id", ${entityName}Param.getId()) - .last("limit 1")); - #end + ${EntityName} model = new QueryWrapper<${EntityName}>() + .eq("id", id) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); - Assert.notNull(model, "${functionName}不存在!"); + Assert.notNull(model, "数据不存在!"); #foreach ($column in $columns) - #if(!$column.isIncrement) + #if($column.isEdit==1) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) - #if($column.javaField.equals("image") || $colum.javaField.equals("avatar") || $colum.javaField.equals("logo")) + #if($column.javaField.equals("image") || $column.javaField.equals("avatar") || $column.javaField.equals("logo") || $column.javaField.equals("img")) model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); - #elseif(!$column.javaField.equals("createTime") and !$column.javaField.equals("deleteTime") and !$column.javaField.equals("updateTime") and !$column.javaField.equals("isDelete")) + #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); - #elseif($column.javaField.equals("updateTime")) + #elseif($dateFields.contains($column.columnName)) model.set${AttrName}(System.currentTimeMillis() / 1000); #end #end @@ -491,38 +329,31 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { /** * ${functionName}删除 * - #if(!$authorName.equals("")) + #if($isAuthor) * @author ${authorName} #end * @param id 主键ID */ @Override public void del(Integer id) { - ${EntityName} model = ${entityName}Mapper.selectOne( - #if($fields.contains("is_delete")) - new QueryWrapper<${EntityName}>() - .select("id") - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - #else - new QueryWrapper<${EntityName}>() - .select("id") - .eq("id", id) - .last("limit 1")); - #end + ${EntityName} model = new QueryWrapper<${EntityName}>() + .eq("id", id) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); - Assert.notNull(model, "${functionName}不存在!"); + Assert.notNull(model, "数据不存在!"); - #if($fields.contains("is_delete")) + #if($allFields.contains("is_delete")) model.setIsDelete(1); - #if($fields.contains("delete_time")) + #if($allFields.contains("delete_time")) model.setDeleteTime(System.currentTimeMillis() / 1000); #end ${entityName}Mapper.updateById(model); - #else - ${entityName}Mapper.delete(new QueryWrapper<${EntityName}>().eq("id", id)); - #end + #else + ${entityName}Mapper.delete(new QueryWrapper<${EntityName}>().eq("id", id)); + #end } } diff --git a/server/like-generator/src/main/resources/java/vo.java.vm b/server/like-generator/src/main/resources/java/vo.java.vm deleted file mode 100644 index 5575488e..00000000 --- a/server/like-generator/src/main/resources/java/vo.java.vm +++ /dev/null @@ -1,25 +0,0 @@ -package ${packageName}.admin.vo.${moduleName}; - -import lombok.Data; - -import java.io.Serializable; - -/** -* ${EntityName}Vo -*/ -@Data -public class ${EntityName}Vo implements Serializable { - - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if($column.isList==1 || $column.isQuery==1) - #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) - private String ${column.javaField}; - #else - private ${column.javaType} ${column.javaField}; - #end -#end -#end - -} diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index 383a1592..a8ff435c 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -13,11 +13,13 @@ public class ${EntityName}DetailVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) - #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) - private String ${column.javaField}; +#if($column.isDetail==1) + #if($dateFields.contains($column.columnName)) + private String ${column.javaField}; // ${column.columnComment} #else - private ${column.javaType} ${column.javaField}; + private ${column.javaType} ${column.javaField}; // ${column.columnComment} #end #end +#end } diff --git a/server/like-generator/src/main/resources/java/voList.java.vm b/server/like-generator/src/main/resources/java/voList.java.vm index 9b6bcf8c..718284ca 100644 --- a/server/like-generator/src/main/resources/java/voList.java.vm +++ b/server/like-generator/src/main/resources/java/voList.java.vm @@ -14,10 +14,10 @@ public class ${EntityName}ListVo implements Serializable { #foreach ($column in $columns) #if($column.isList==1) - #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime")) - private String ${column.javaField}; + #if($dateFields.contains($column.columnName)) + private String ${column.javaField}; // ${column.columnComment} #else - private ${column.javaType} ${column.javaField}; + private ${column.javaType} ${column.javaField}; // ${column.columnComment} #end #end #end From c1154ee82b4669c369657d9506e14f1717a69b6f Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 14 Jul 2022 15:42:28 +0800 Subject: [PATCH 34/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateServiceImpl.java | 1 + .../java/com/hxkj/generator/util/GenUtil.java | 5 + .../com/hxkj/generator/util/VelocityUtil.java | 15 +- .../main/resources/java/serviceImpl.java.vm | 132 ++++++++++++------ .../src/main/resources/vue/index-tree.vue.vm | 1 + 5 files changed, 102 insertions(+), 52 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 9bd0eae6..c152536a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -245,6 +245,7 @@ public class GenerateServiceImpl implements IGenerateService { column.setIsInsert(Integer.parseInt(item.get("isInsert"))); column.setIsEdit(Integer.parseInt(item.get("isEdit"))); column.setIsList(Integer.parseInt(item.get("isList"))); + column.setIsDetail(Integer.parseInt(item.get("isDetail"))); column.setIsQuery(Integer.parseInt(item.get("isQuery"))); column.setQueryType(item.get("queryType")); column.setHtmlType(item.get("htmlType")); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 07fd1978..dc695bbd 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -104,6 +104,11 @@ public class GenUtil { column.setIsList(GenConstants.REQUIRE); } + // 需详情的字段 + if (!GenUtil.isArraysContains(new String[]{"is_delete", "delete_time"}, columnName)) { + column.setIsDetail(GenConstants.REQUIRE); + } + // 需查询字段 if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) { column.setIsQuery(GenConstants.REQUIRE); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 02ecefd5..9acf94a8 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -2,6 +2,7 @@ package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; import com.hxkj.generator.config.GenConfig; +import com.hxkj.generator.constant.GenConstants; import com.hxkj.generator.constant.SqlConstants; import com.hxkj.generator.entity.GenTable; import com.hxkj.generator.entity.GenTableColumn; @@ -108,12 +109,14 @@ public class VelocityUtil { templates.add("java/voList.java.vm"); templates.add("java/voDetail.java.vm"); -// if (GenConstants.TPL_CRUD.equals(genTpl)) { -// templates.add("vue/index.vue.vm"); -// } -// else if (GenConstants.TPL_TREE.equals(genTpl)) { -// templates.add("vue/index-tree.vue.vm"); -// } + if (GenConstants.TPL_CRUD.equals(genTpl)) { + templates.add("vue/index.vue.vm"); + } + + else if (GenConstants.TPL_TREE.equals(genTpl)) { + templates.add("vue/index-tree.vue.vm"); + } + return templates; } diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index f63a79f9..0d0ca85a 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -15,6 +15,7 @@ import ${packageName}.common.mapper.${moduleName}.${EntityName}Mapper; import ${packageName}.common.utils.TimeUtil; import ${packageName}.common.utils.UrlUtil; import com.hxkj.common.config.GlobalConfig; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -69,27 +70,37 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { @Override public $genTpl list($genParam) { #if($table.genTpl.equals("curd")) - Integer pageNo = pageParam.getPageNo(); - Integer pageSize = pageParam.getPageSize(); + Integer page = pageParam.getPageNo(); + Integer limit = pageParam.getPageSize(); #end #if(!$table.subTableName.equals("") && !$table.subTableFk.equals("")) - MPJQueryWrapper<${EntityName}> queryWrapper = new MPJQueryWrapper<>(); - queryWrapper.innerJoin("?_$table.subTableName f ON f.$table.SubTableFk=t.id".replace("?_", GlobalConfig.tablePrefix)); + #set($queryWrapper = "mpjQueryWrapper") + MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>(); + mpjQueryWrapper.innerJoin("?_$table.subTableName f ON f.$table.SubTableFk=t.id".replace("?_", GlobalConfig.tablePrefix)); + #if($fields.contains("is_delete")) + mpjQueryWrapper.eq("is_delete", 0); + #end + #if($fields.contains("sort")) + mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id")); + #else + mpjQueryWrapper.orderByDesc("id"); + #end #else + #set($queryWrapper = "queryWrapper") QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>(); - #end - #if($fields.contains("is_delete")) + #if($fields.contains("is_delete")) queryWrapper.eq("is_delete", 0); - #end - #if($fields.contains("sort")) + #end + #if($fields.contains("sort")) queryWrapper.orderByDesc(Arrays.asList("sort", "id")); - #else + #else queryWrapper.orderByDesc("id"); + #end #end #if($isSearch) - ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{ + ${entityName}Mapper.setSearch($queryWrapper, params, new String[]{ #foreach ($column in $columns) #if($column.isQuery) #if($dateFields.contains($column.columnName)) @@ -115,7 +126,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end #end #end - } + }); #end #if(!$table.subTableName.equals("") && !$table.subTableFk.equals("")) @@ -126,21 +137,21 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), ${EntityName}ListVo.class, - mpjQueryWrapper); + $queryWrapper); #else List<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinList( ${EntityName}ListVo.class, - mpjQueryWrapper); + $queryWrapper); #end #else #set($isJoin = false) #set($joinCurdList = "${EntityName}") #if($table.genTpl.equals("curd")) #set($joinCurdName = "iPage.getRecords()") - IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), $queryWrapper); #else #set($joinCurdName = "array") - List<${EntityName}> array = ${entityName}Mapper.selectList(queryWrapper); + List<${EntityName}> array = ${entityName}Mapper.selectList($queryWrapper); #end #end @@ -155,21 +166,20 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { List<${EntityName}ListVo> list = new LinkedList<>(); #end for($joinCurdList item : $joinCurdName) { - #if(!$isJoin) - ${EntityName}ListVo vo = new ${EntityName}Vo(); + #if(!$isJoin) + ${EntityName}ListVo vo = new ${EntityName}ListVo(); BeanUtils.copyProperties(item, vo); - #end #if($listFields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(item.getImage())) + vo.setImage(UrlUtil.toAbsoluteUrl(item.getImage())); #end #if($listFields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar())) + vo.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar())); #end #if($listFields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo())) + vo.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo())); #end #if($listFields.contains("img")) - vo.setImg(UrlUtil.toAbsoluteUrl(item.getImg())) + vo.setImg(UrlUtil.toAbsoluteUrl(item.getImg())); #end #if($listFields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); @@ -186,9 +196,36 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #if($listFields.contains("end_time")) vo.setEndTime(TimeUtil.timestampToDate(item.getEndTime())); #end - #if(!$isJoin) - list.add(vo) + list.add(vo); + #else + #if($listFields.contains("image")) + item.setImage(UrlUtil.toAbsoluteUrl(item.getImage())); #end + #if($listFields.contains("avatar")) + item.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar())); + #end + #if($listFields.contains("logo")) + item.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo())); + #end + #if($listFields.contains("img")) + item.setImg(UrlUtil.toAbsoluteUrl(item.getImg())); + #end + #if($listFields.contains("create_time")) + item.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime())); + #end + #if($listFields.contains("update_time")) + item.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime())); + #end + #if($listFields.contains("delete_time")) + item.setDeleteTime(TimeUtil.timestampToDate(item.getDeleteTime())); + #end + #if($listFields.contains("start_time")) + item.setStartTime(TimeUtil.timestampToDate(item.getStartTime())); + #end + #if($listFields.contains("end_time")) + item.setEndTime(TimeUtil.timestampToDate(item.getEndTime())); + #end + #end } #end @@ -219,12 +256,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { */ @Override public ${EntityName}DetailVo detail(Integer id) { - ${EntityName} model = new QueryWrapper<${EntityName}>() - .eq("id", id) - #if($allFields.contains("is_delete")) - .eq("is_delete", 0) - #end - .last("limit 1")); + ${EntityName} model = ${entityName}Mapper.selectOne( + new QueryWrapper<${EntityName}>() + .eq("id", id) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); Assert.notNull(model, "数据不存在"); @@ -236,16 +274,16 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { $detailFields.contains("avatar") || $detailFields.contains("logo") || $detailFields.contains("img")) #if($detailFields.contains("image")) - vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())) + vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); #end #if($detailFields.contains("avatar")) - vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())) + vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); #end #if($detailFields.contains("logo")) - vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())) + vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); #end #if($detailFields.contains("img")) - vo.setImg(UrlUtil.toAbsoluteUrl(model.getImg())) + vo.setImg(UrlUtil.toAbsoluteUrl(model.getImg())); #end #if($detailFields.contains("create_time")) vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime())); @@ -302,12 +340,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { */ @Override public void edit(${EntityName}Param ${entityName}Param) { - ${EntityName} model = new QueryWrapper<${EntityName}>() - .eq("id", id) - #if($allFields.contains("is_delete")) - .eq("is_delete", 0) - #end - .last("limit 1")); + ${EntityName} model = ${entityName}Mapper.selectOne( + new QueryWrapper<${EntityName}>() + .eq("id", ${entityName}Param.getId()) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); Assert.notNull(model, "数据不存在!"); @@ -336,12 +375,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { */ @Override public void del(Integer id) { - ${EntityName} model = new QueryWrapper<${EntityName}>() - .eq("id", id) - #if($allFields.contains("is_delete")) - .eq("is_delete", 0) - #end - .last("limit 1")); + ${EntityName} model = ${entityName}Mapper.selectOne( + new QueryWrapper<${EntityName}>() + .eq("id", id) + #if($allFields.contains("is_delete")) + .eq("is_delete", 0) + #end + .last("limit 1")); Assert.notNull(model, "数据不存在!"); diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm index e69de29b..a8b23e47 100644 --- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm +++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm @@ -0,0 +1 @@ +未定的内容 \ No newline at end of file