perf:优化代码
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
package com.xiang.xservice.application.generator.controller;
|
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.application.generator.service.CodeGenService;
|
||||||
import com.xiang.xservice.basic.common.resp.Result;
|
import com.xiang.xservice.basic.common.resp.Result;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.xiang.xservice.application.generator.controller;
|
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.application.generator.service.TemplateService;
|
||||||
import com.xiang.xservice.basic.common.resp.Result;
|
import com.xiang.xservice.basic.common.resp.Result;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.dto;
|
package com.xiang.xservice.application.generator.entity.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ import java.util.List;
|
|||||||
/**
|
/**
|
||||||
* 类信息
|
* 类信息
|
||||||
*
|
*
|
||||||
* @author zhengkai.blog.csdn.net
|
* @author xiang
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class ClassInfo {
|
public class ClassInfo {
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.dto;
|
package com.xiang.xservice.application.generator.entity.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字段信息
|
* 字段信息
|
||||||
*
|
*
|
||||||
* @author zhengkai.blog.csdn.net
|
* @author xiang
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class FieldInfo {
|
public class FieldInfo {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.dto;
|
package com.xiang.xservice.application.generator.entity.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ import java.util.Map;
|
|||||||
/**
|
/**
|
||||||
* 请求参数信息
|
* 请求参数信息
|
||||||
*
|
*
|
||||||
* @author zhengkai.blog.csdn.net
|
* @author xiang
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class ParamInfo {
|
public class ParamInfo {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.dto;
|
package com.xiang.xservice.application.generator.entity.domain;
|
||||||
|
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.dto;
|
package com.xiang.xservice.application.generator.entity.domain;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -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<String, Object> {
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.xiang.xservice.application.generator.entity.enums;
|
package com.xiang.xservice.application.generator.enums;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.xiang.xservice.application.generator.service;
|
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 com.xiang.xservice.basic.common.resp.Result;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.xiang.xservice.application.generator.service;
|
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.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package com.xiang.xservice.application.generator.service.impl;
|
package com.xiang.xservice.application.generator.service.impl;
|
||||||
|
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ClassInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ClassInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ParamInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ParamInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.TemplateList;
|
import com.xiang.xservice.application.generator.entity.domain.TemplateList;
|
||||||
import com.xiang.xservice.application.generator.entity.enums.ParserTypeEnum;
|
import com.xiang.xservice.application.generator.enums.ParserTypeEnum;
|
||||||
import com.xiang.xservice.application.generator.service.CodeGenService;
|
import com.xiang.xservice.application.generator.service.CodeGenService;
|
||||||
import com.xiang.xservice.application.generator.service.TemplateService;
|
import com.xiang.xservice.application.generator.service.TemplateService;
|
||||||
import com.xiang.xservice.application.generator.service.parser.JsonParserService;
|
import com.xiang.xservice.application.generator.service.parser.JsonParserService;
|
||||||
@@ -66,10 +66,10 @@ public class CodeGenServiceImpl implements CodeGenService {
|
|||||||
// 解析模板配置并生成代码
|
// 解析模板配置并生成代码
|
||||||
List<TemplateList> parentTemplates = templateService.getAllTemplates();
|
List<TemplateList> parentTemplates = templateService.getAllTemplates();
|
||||||
for (TemplateList parentTemplateObj : parentTemplates) {
|
for (TemplateList parentTemplateObj : parentTemplates) {
|
||||||
List<com.xiang.xservice.application.generator.entity.dto.Template> childTemplates = parentTemplateObj.getTemplates();
|
List<com.xiang.xservice.application.generator.entity.domain.Template> childTemplates = parentTemplateObj.getTemplates();
|
||||||
if (childTemplates != null) {
|
if (childTemplates != null) {
|
||||||
for (int x = 0; x < childTemplates.size(); x++) {
|
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 templatePath = parentTemplateObj.getGroup() + "/" + childTemplate.getName() + ".ftl";
|
||||||
String generatedCode = FreemarkerUtil.processString(templatePath, params);
|
String generatedCode = FreemarkerUtil.processString(templatePath, params);
|
||||||
result.put(childTemplate.getName(), generatedCode);
|
result.put(childTemplate.getName(), generatedCode);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.xiang.xservice.application.generator.service.impl;
|
package com.xiang.xservice.application.generator.service.impl;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
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 com.xiang.xservice.application.generator.service.TemplateService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.core.io.ClassPathResource;
|
import org.springframework.core.io.ClassPathResource;
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ package com.xiang.xservice.application.generator.service.impl.parser;
|
|||||||
|
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
import com.alibaba.fastjson2.JSONArray;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ClassInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ClassInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.FieldInfo;
|
import com.xiang.xservice.application.generator.entity.domain.FieldInfo;
|
||||||
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.parser.JsonParserService;
|
import com.xiang.xservice.application.generator.service.parser.JsonParserService;
|
||||||
import com.xiang.xservice.basic.exception.BusinessException;
|
import com.xiang.xservice.basic.exception.BusinessException;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package com.xiang.xservice.application.generator.service.impl.parser;
|
package com.xiang.xservice.application.generator.service.impl.parser;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ClassInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ClassInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.FieldInfo;
|
import com.xiang.xservice.application.generator.entity.domain.FieldInfo;
|
||||||
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.parser.SqlParserService;
|
import com.xiang.xservice.application.generator.service.parser.SqlParserService;
|
||||||
import com.xiang.xservice.application.generator.util.MapUtil;
|
import com.xiang.xservice.application.generator.util.MapUtil;
|
||||||
import com.xiang.xservice.application.generator.util.StringUtilsPlus;
|
import com.xiang.xservice.application.generator.util.StringUtilsPlus;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.xiang.xservice.application.generator.service.parser;
|
package com.xiang.xservice.application.generator.service.parser;
|
||||||
|
|
||||||
|
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ClassInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ClassInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ParamInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ParamInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JSON解析服务接口
|
* JSON解析服务接口
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.xiang.xservice.application.generator.service.parser;
|
package com.xiang.xservice.application.generator.service.parser;
|
||||||
|
|
||||||
|
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ClassInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ClassInfo;
|
||||||
import com.xiang.xservice.application.generator.entity.dto.ParamInfo;
|
import com.xiang.xservice.application.generator.entity.domain.ParamInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SQL解析服务接口
|
* SQL解析服务接口
|
||||||
|
|||||||
Reference in New Issue
Block a user