From d4c3cf487032edbb062abaf86d1fc7f8fbf2e224 Mon Sep 17 00:00:00 2001 From: xiang Date: Fri, 30 Jan 2026 22:53:16 +0800 Subject: [PATCH] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CodeGenController.java | 2 +- .../controller/TemplateController.java | 2 +- .../entity/{dto => domain}/ClassInfo.java | 4 +- .../entity/{dto => domain}/FieldInfo.java | 4 +- .../entity/{dto => domain}/ParamInfo.java | 4 +- .../entity/{dto => domain}/Template.java | 2 +- .../entity/{dto => domain}/TemplateList.java | 2 +- .../generator/entity/vo/ResultVo.java | 49 ------------------- .../{entity => }/enums/ParserTypeEnum.java | 2 +- .../generator/service/CodeGenService.java | 2 +- .../generator/service/TemplateService.java | 2 +- .../service/impl/CodeGenServiceImpl.java | 12 ++--- .../service/impl/TemplateServiceImpl.java | 2 +- .../impl/parser/JsonParserServiceImpl.java | 6 +-- .../impl/parser/SqlParserServiceImpl.java | 6 +-- .../service/parser/JsonParserService.java | 4 +- .../service/parser/SqlParserService.java | 4 +- 17 files changed, 30 insertions(+), 79 deletions(-) rename script/src/main/java/com/xiang/xservice/application/generator/entity/{dto => domain}/ClassInfo.java (74%) rename script/src/main/java/com/xiang/xservice/application/generator/entity/{dto => domain}/FieldInfo.java (71%) rename script/src/main/java/com/xiang/xservice/application/generator/entity/{dto => domain}/ParamInfo.java (82%) rename script/src/main/java/com/xiang/xservice/application/generator/entity/{dto => domain}/Template.java (68%) rename script/src/main/java/com/xiang/xservice/application/generator/entity/{dto => domain}/TemplateList.java (69%) delete mode 100644 script/src/main/java/com/xiang/xservice/application/generator/entity/vo/ResultVo.java rename script/src/main/java/com/xiang/xservice/application/generator/{entity => }/enums/ParserTypeEnum.java (96%) diff --git a/script/src/main/java/com/xiang/xservice/application/generator/controller/CodeGenController.java b/script/src/main/java/com/xiang/xservice/application/generator/controller/CodeGenController.java index d3ff7d9..7825a81 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/controller/CodeGenController.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/controller/CodeGenController.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.generator.controller; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; import com.xiang.xservice.application.generator.service.CodeGenService; import com.xiang.xservice.basic.common.resp.Result; import lombok.RequiredArgsConstructor; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java b/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java index db3b7fe..84ac70b 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/controller/TemplateController.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.generator.controller; -import com.xiang.xservice.application.generator.entity.dto.TemplateList; +import com.xiang.xservice.application.generator.entity.domain.TemplateList; import com.xiang.xservice.application.generator.service.TemplateService; import com.xiang.xservice.basic.common.resp.Result; import lombok.RequiredArgsConstructor; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ClassInfo.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ClassInfo.java similarity index 74% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ClassInfo.java rename to script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ClassInfo.java index a7a3d3e..173d08e 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ClassInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ClassInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.application.generator.entity.dto; +package com.xiang.xservice.application.generator.entity.domain; import lombok.Data; @@ -7,7 +7,7 @@ import java.util.List; /** * 类信息 * - * @author zhengkai.blog.csdn.net + * @author xiang */ @Data public class ClassInfo { diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/FieldInfo.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/FieldInfo.java similarity index 71% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/dto/FieldInfo.java rename to script/src/main/java/com/xiang/xservice/application/generator/entity/domain/FieldInfo.java index 089cce7..67d206d 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/FieldInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/FieldInfo.java @@ -1,11 +1,11 @@ -package com.xiang.xservice.application.generator.entity.dto; +package com.xiang.xservice.application.generator.entity.domain; import lombok.Data; /** * 字段信息 * - * @author zhengkai.blog.csdn.net + * @author xiang */ @Data public class FieldInfo { diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ParamInfo.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ParamInfo.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ParamInfo.java rename to script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ParamInfo.java index 5868823..9121f89 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/ParamInfo.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/ParamInfo.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.application.generator.entity.dto; +package com.xiang.xservice.application.generator.entity.domain; import lombok.Data; @@ -7,7 +7,7 @@ import java.util.Map; /** * 请求参数信息 * - * @author zhengkai.blog.csdn.net + * @author xiang */ @Data public class ParamInfo { diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/Template.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/Template.java similarity index 68% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/dto/Template.java rename to script/src/main/java/com/xiang/xservice/application/generator/entity/domain/Template.java index f34aafb..e16019d 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/Template.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/Template.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.application.generator.entity.dto; +package com.xiang.xservice.application.generator.entity.domain; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/TemplateList.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/TemplateList.java similarity index 69% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/dto/TemplateList.java rename to script/src/main/java/com/xiang/xservice/application/generator/entity/domain/TemplateList.java index 65ef9db..0ebacde 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/dto/TemplateList.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/entity/domain/TemplateList.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.application.generator.entity.dto; +package com.xiang.xservice.application.generator.entity.domain; import lombok.Data; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/vo/ResultVo.java b/script/src/main/java/com/xiang/xservice/application/generator/entity/vo/ResultVo.java deleted file mode 100644 index 7ff228e..0000000 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/vo/ResultVo.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.xiang.xservice.application.generator.entity.vo; - -import lombok.Data; - -import java.util.HashMap; - -/** - * 统一返回结果VO - * - * @author zhengkai.blog.csdn.net - */ -@Data -public class ResultVo extends HashMap { - - public ResultVo() { - put("code", 200); - put("msg", "success"); - } - - public static ResultVo ok() { - return new ResultVo(); - } - - public static ResultVo ok(Object data) { - ResultVo resultVo = new ResultVo(); - resultVo.put("data", data); - return resultVo; - } - - public static ResultVo error(String msg) { - ResultVo resultVo = new ResultVo(); - resultVo.put("code", 500); - resultVo.put("msg", msg); - return resultVo; - } - - public static ResultVo error(int code, String msg) { - ResultVo resultVo = new ResultVo(); - resultVo.put("code", code); - resultVo.put("msg", msg); - return resultVo; - } - - @Override - public ResultVo put(String key, Object value) { - super.put(key, value); - return this; - } -} \ No newline at end of file diff --git a/script/src/main/java/com/xiang/xservice/application/generator/entity/enums/ParserTypeEnum.java b/script/src/main/java/com/xiang/xservice/application/generator/enums/ParserTypeEnum.java similarity index 96% rename from script/src/main/java/com/xiang/xservice/application/generator/entity/enums/ParserTypeEnum.java rename to script/src/main/java/com/xiang/xservice/application/generator/enums/ParserTypeEnum.java index 39f294e..4502816 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/entity/enums/ParserTypeEnum.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/enums/ParserTypeEnum.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.application.generator.entity.enums; +package com.xiang.xservice.application.generator.enums; import lombok.Getter; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/CodeGenService.java b/script/src/main/java/com/xiang/xservice/application/generator/service/CodeGenService.java index 5d78340..b21df61 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/CodeGenService.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/CodeGenService.java @@ -1,7 +1,7 @@ package com.xiang.xservice.application.generator.service; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; import com.xiang.xservice.basic.common.resp.Result; import java.util.Map; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/TemplateService.java b/script/src/main/java/com/xiang/xservice/application/generator/service/TemplateService.java index b9f1608..4e3597c 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/TemplateService.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/TemplateService.java @@ -1,6 +1,6 @@ package com.xiang.xservice.application.generator.service; -import com.xiang.xservice.application.generator.entity.dto.TemplateList; +import com.xiang.xservice.application.generator.entity.domain.TemplateList; import java.io.IOException; import java.util.List; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java index b78e6d8..01a4a51 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/CodeGenServiceImpl.java @@ -1,9 +1,9 @@ package com.xiang.xservice.application.generator.service.impl; -import com.xiang.xservice.application.generator.entity.dto.ClassInfo; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; -import com.xiang.xservice.application.generator.entity.dto.TemplateList; -import com.xiang.xservice.application.generator.entity.enums.ParserTypeEnum; +import com.xiang.xservice.application.generator.entity.domain.ClassInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.TemplateList; +import com.xiang.xservice.application.generator.enums.ParserTypeEnum; import com.xiang.xservice.application.generator.service.CodeGenService; import com.xiang.xservice.application.generator.service.TemplateService; import com.xiang.xservice.application.generator.service.parser.JsonParserService; @@ -66,10 +66,10 @@ public class CodeGenServiceImpl implements CodeGenService { // 解析模板配置并生成代码 List parentTemplates = templateService.getAllTemplates(); for (TemplateList parentTemplateObj : parentTemplates) { - List childTemplates = parentTemplateObj.getTemplates(); + List childTemplates = parentTemplateObj.getTemplates(); if (childTemplates != null) { for (int x = 0; x < childTemplates.size(); x++) { - com.xiang.xservice.application.generator.entity.dto.Template childTemplate = childTemplates.get(x); + com.xiang.xservice.application.generator.entity.domain.Template childTemplate = childTemplates.get(x); String templatePath = parentTemplateObj.getGroup() + "/" + childTemplate.getName() + ".ftl"; String generatedCode = FreemarkerUtil.processString(templatePath, params); result.put(childTemplate.getName(), generatedCode); diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/TemplateServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/TemplateServiceImpl.java index 8ae59c1..dca4951 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/TemplateServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/TemplateServiceImpl.java @@ -1,7 +1,7 @@ package com.xiang.xservice.application.generator.service.impl; import com.alibaba.fastjson2.JSONArray; -import com.xiang.xservice.application.generator.entity.dto.TemplateList; +import com.xiang.xservice.application.generator.entity.domain.TemplateList; import com.xiang.xservice.application.generator.service.TemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ClassPathResource; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/JsonParserServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/JsonParserServiceImpl.java index 77f1328..3367701 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/JsonParserServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/JsonParserServiceImpl.java @@ -2,9 +2,9 @@ package com.xiang.xservice.application.generator.service.impl.parser; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.xiang.xservice.application.generator.entity.dto.ClassInfo; -import com.xiang.xservice.application.generator.entity.dto.FieldInfo; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ClassInfo; +import com.xiang.xservice.application.generator.entity.domain.FieldInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; import com.xiang.xservice.application.generator.service.parser.JsonParserService; import com.xiang.xservice.basic.exception.BusinessException; import org.springframework.stereotype.Service; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/SqlParserServiceImpl.java b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/SqlParserServiceImpl.java index 78bb53a..3429748 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/SqlParserServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/impl/parser/SqlParserServiceImpl.java @@ -1,9 +1,9 @@ package com.xiang.xservice.application.generator.service.impl.parser; import com.alibaba.fastjson2.JSON; -import com.xiang.xservice.application.generator.entity.dto.ClassInfo; -import com.xiang.xservice.application.generator.entity.dto.FieldInfo; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ClassInfo; +import com.xiang.xservice.application.generator.entity.domain.FieldInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; import com.xiang.xservice.application.generator.service.parser.SqlParserService; import com.xiang.xservice.application.generator.util.MapUtil; import com.xiang.xservice.application.generator.util.StringUtilsPlus; diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/parser/JsonParserService.java b/script/src/main/java/com/xiang/xservice/application/generator/service/parser/JsonParserService.java index 00dd2ee..e730577 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/parser/JsonParserService.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/parser/JsonParserService.java @@ -1,8 +1,8 @@ package com.xiang.xservice.application.generator.service.parser; -import com.xiang.xservice.application.generator.entity.dto.ClassInfo; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ClassInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; /** * JSON解析服务接口 diff --git a/script/src/main/java/com/xiang/xservice/application/generator/service/parser/SqlParserService.java b/script/src/main/java/com/xiang/xservice/application/generator/service/parser/SqlParserService.java index 39a6349..67ac486 100644 --- a/script/src/main/java/com/xiang/xservice/application/generator/service/parser/SqlParserService.java +++ b/script/src/main/java/com/xiang/xservice/application/generator/service/parser/SqlParserService.java @@ -1,8 +1,8 @@ package com.xiang.xservice.application.generator.service.parser; -import com.xiang.xservice.application.generator.entity.dto.ClassInfo; -import com.xiang.xservice.application.generator.entity.dto.ParamInfo; +import com.xiang.xservice.application.generator.entity.domain.ClassInfo; +import com.xiang.xservice.application.generator.entity.domain.ParamInfo; /** * SQL解析服务接口