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