diff --git a/.gitignore b/.gitignore index 7e19986..728e1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ out .idea .idea/workspace.xml /.gradle/ +/build/ diff --git a/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class b/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class index c1a0202..22a34b5 100644 Binary files a/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class and b/build/classes/java/main/com/taover/codegenerate/bazhuayun/GenerateCode.class differ diff --git a/build/libs/code-generater-sources.jar b/build/libs/code-generater-sources.jar deleted file mode 100644 index e62fb9f..0000000 Binary files a/build/libs/code-generater-sources.jar and /dev/null differ diff --git a/build/libs/code-generater.jar b/build/libs/code-generater.jar deleted file mode 100644 index e62fb9f..0000000 Binary files a/build/libs/code-generater.jar and /dev/null differ diff --git a/build/libs/com-taover-codegenerater-sources.jar b/build/libs/com-taover-codegenerater-sources.jar deleted file mode 100644 index a917c87..0000000 Binary files a/build/libs/com-taover-codegenerater-sources.jar and /dev/null differ diff --git a/build/libs/com-taover-codegenerater.jar b/build/libs/com-taover-codegenerater.jar deleted file mode 100644 index 29fa188..0000000 Binary files a/build/libs/com-taover-codegenerater.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 9212d67..3b452d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,4 +7,4 @@ * in the user guide at https://docs.gradle.org/4.5.1/userguide/multi_project_builds.html */ -rootProject.name = 'com-taover-codegenerater' +rootProject.name = 'com-taover-codegenerate' diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java b/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java index 6aadc1f..96f7a6c 100644 --- a/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java +++ b/src/main/java/com/taover/codegenerate/bazhuayun/GenerateCode.java @@ -21,7 +21,7 @@ import freemarker.template.Template; public class GenerateCode { public static void main(String args[]){ try { - //generate("com.taover.wxorder", "ALL", "D:"+File.separator+"dblist", "127.0.0.1", "3306", "tylife", "lexi365", "8zyun_wxorder"); + generate("com.taover.wxorder", "ALL", "D:"+File.separator+"dblist", "127.0.0.1", "3306", "tylife", "lexi365", "8zyun_wxorder"); } catch (Exception e) { e.printStackTrace(); } @@ -94,9 +94,11 @@ public class GenerateCode { } public static String renderByTemplate(String templateName, ApiModel apiModel) throws Exception{ - File f = new File(Tools.getPath()+File.separator+"com"+File.separator+"taover"+File.separator+"codegenerate"+File.separator+"bazhuayun"+File.separator+"template"); Configuration cfg = new Configuration(); - cfg.setDirectoryForTemplateLoading(f); + //String comPath = GenerateCode.class.getResource("/").getPath(); + //File f = new File(comPath+File.separator+"com"+File.separator+"taover"+File.separator+"codegenerate"+File.separator+"bazhuayun"+File.separator+"template"); + //cfg.setDirectoryForTemplateLoading(f); + cfg.setClassForTemplateLoading(GenerateCode.class, "/template/bazhuayun"); Template template = cfg.getTemplate(templateName); StringWriter out = new StringWriter(); template.process(apiModel, out); diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/DtoTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/DtoTemplate.ftl deleted file mode 100644 index 999e93b..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/DtoTemplate.ftl +++ /dev/null @@ -1,37 +0,0 @@ -package ${basePackage}.bean.dto; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Date; - -/** - <#if version?exists> - * @version ${version} - - */ -public class ${dtoClassSimpleName} implements Serializable { - - private static final long serialVersionUID = 1L; - - <#--变量 ,get,set方法--> -<#if tablemodel.columnlist?exists> - <#list tablemodel.columnlist as clist> - - <#if clist.columnRemarks?exists> - /** - * ${clist.columnRemarks} - */ - - private ${clist.columnJAVAType} ${clist.columnName}; - - public ${clist.columnJAVAType} get${clist.columnMethodName}(){ - return ${clist.columnName}; - } - public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ - this.${clist.columnName} = ${clist.columnName}; - } - - - -} \ No newline at end of file diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/EntityTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/EntityTemplate.ftl deleted file mode 100644 index cd8bc03..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/EntityTemplate.ftl +++ /dev/null @@ -1,52 +0,0 @@ -package ${basePackage}.bean.entity; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Date; - -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.Column; - -/** - <#if version?exists> - * @version ${version} - - */ -@Entity -@Table(name="${tablemodel.tableName}", catalog="${tablemodel.schemeName}") -public class ${entityClassSimpleName} implements Serializable { - - private static final long serialVersionUID = 1L; - - <#--变量 ,get,set方法--> -<#if tablemodel.columnlist?exists> - <#list tablemodel.columnlist as clist> - - <#if clist.columnRemarks?exists> - /** - * ${clist.columnRemarks} - */ - - <#if clist.primaryKey == true> - @Id - - @Column(name="${clist.columnUName}") - private ${clist.columnJAVAType} ${clist.columnName}; - - public ${clist.columnJAVAType} get${clist.columnMethodName}(){ - return ${clist.columnName}; - } - public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ - this.${clist.columnName} = ${clist.columnName}; - } - - - - @Override - public String toString() { - return "${entityClassSimpleName}: ${toStringMethodBody}; - } - } \ No newline at end of file diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/ManageControllerTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/ManageControllerTemplate.ftl deleted file mode 100644 index 9ea48f0..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/ManageControllerTemplate.ftl +++ /dev/null @@ -1,135 +0,0 @@ -package ${basePackage}.controller.manage; - -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import ${basePackage}.bean.entity.${entityClassSimpleName}; -import ${basePackage}.constants.GlobalConstants; -import ${basePackage}.service.${serviceClassSimpleName}; - -import com.taover.util.UtilHttpRequestMap; -import com.taover.util.bean.ResultInfo; - -@Controller("manage.${controllerMap}") -@RequestMapping("/manage/${controllerMap}") -public class ${controllerClassName} { - @Resource - private ${serviceClassSimpleName} ${serviceClassFieldName}; - - /** - * @apiDefine ResultInfo - * @apiSuccess {string} - * @apiSuccessExample {json} Success-Response: - * { - * code:ok, - * error:null - * } - * @apiError ThrowException 出现异常 - * @apiErrorExample - * { - * code:fail, - * error:null exception - * } - */ - - /** - * @api {GET} /manage/${controllerMap} 查询${controllerMap}列表 - * @apiDescription 查询${controllerMap}列表数据 - * 返回分页结果 - * - * @apiGroup ${controllerMap} - * @apiName ${controllerMap}列表 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @GetMapping - public ResultInfo get(HttpServletRequest request){ - String pageStr = request.getParameter("page"); - if(StringUtils.isEmpty(pageStr)){ - pageStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE; - } - String sizeStr = request.getParameter("size"); - if(StringUtils.isEmpty(sizeStr)){ - sizeStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE_SIZE; - } - List condition = UtilHttpRequestMap.getSqlConditionListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, "page,size"); - return this.${serviceClassFieldName}.getListManage(condition, Integer.valueOf(pageStr), Integer.valueOf(sizeStr)); - } - - /** - * @api {GET} /manage/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} - * @apiDescription 查询ssid对应${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName get实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @GetMapping("/{ssid}") - public ResultInfo get(String ssid){ - return this.${serviceClassFieldName}.getOneManage(ssid); - } - - /** - * @api {POST} /manage/${controllerMap} 创建${controllerMap} - * @apiDescription 创建${controllerMap} - * - * @apiGroup ${controllerMap} - * @apiName get实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @PostMapping - public ResultInfo post(HttpServletRequest request){ - return this.${serviceClassFieldName}.postManage(UtilHttpRequestMap.getMapValueStringByRequestMap(request.getParameterMap())); - } - - /** - * @api {DELETE} /manage/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} - * @apiDescription 删除ssid对应的${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName 删除实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @DeleteMapping("/{ssid}") - public ResultInfo delete(String ssid){ - return this.${serviceClassFieldName}.deleteManage(ssid); - } - - /** - * @api {PUT} /manage/${controllerMap}/{ssid} 修改${controllerMap}数据 - * @apiDescription 修改${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName 修改实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @PutMapping("/{ssid}") - public ResultInfo put(String ssid, HttpServletRequest request){ - return this.${serviceClassFieldName}.putManage(ssid, UtilHttpRequestMap.getUpdateListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, null)); - } - -} diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/RepositoryTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/RepositoryTemplate.ftl deleted file mode 100644 index c259eb9..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/RepositoryTemplate.ftl +++ /dev/null @@ -1,74 +0,0 @@ -package ${basePackage}.repository; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Base64; -import java.util.List; -import java.util.Map; - -import org.msgpack.MessagePack; -import org.springframework.stereotype.Repository; - -import ${basePackage}.bean.entity.${entityClassSimpleName}; -import ${basePackage}.bean.vo.${voClassSimpleName}; -import com.taover.repository.CustomJdbcTemplate; -import com.taover.util.UtilHttpRequestMap; -import com.taover.util.UtilObject; - -@Repository -public class ${repositoryClassSimpleName} extends CustomJdbcTemplate<${entityClassSimpleName}, Integer>{ - - public ${repositoryClassSimpleName}() throws Exception { - super(); - } - - public String getSsidById(Integer id) throws Exception{ - MessagePack pack = new MessagePack(); - return Base64.getEncoder().encodeToString(pack.write(new Integer[]{id, id, id})); - } - - public Integer getIdBySsid(String ssid) throws Exception{ - MessagePack pack = new MessagePack(); - return pack.read(Base64.getDecoder().decode(ssid), Integer[].class)[0]; - } - - public Map getVoPage(List condition, Integer page, Integer size) throws Exception{ - Map entityData = this.findPageByCondition(condition, page, size); - List<${entityClassSimpleName}> entityList = (List<${entityClassSimpleName}>) entityData.get("rows"); - List<${voClassSimpleName}> voList = new ArrayList<${voClassSimpleName}>(); - for(int i=0; i updateList) throws Exception{ - this.updateEntityById(updateList, this.getIdBySsid(ssid)); - } - - public void deleteEntityBySsid(String ssid) throws Exception{ - this.deleteEntityByID(this.getIdBySsid(ssid)); - } - - public ${voClassSimpleName} addEntityByMap(Map data) throws Exception{ - ${entityClassSimpleName} entityObj = UtilHttpRequestMap.getBeanByMap(data, ${entityClassSimpleName}.class, false, "id"); - BigInteger resultId = this.addEntityForAutoincrementId(entityObj); - return this.getVoByEntity(this.findEntityByID(resultId.intValue())); - } -} diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceImplTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceImplTemplate.ftl deleted file mode 100644 index f9f2d8c..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceImplTemplate.ftl +++ /dev/null @@ -1,124 +0,0 @@ -package ${basePackage}.service.impl; - -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import ${basePackage}.bean.entity.${entityClassSimpleName}; -import ${basePackage}.repository.${repositoryClassSimpleName}; -import ${basePackage}.service.${serviceClassSimpleName}; -import com.taover.util.UtilLog; -import com.taover.util.bean.ResultInfo; -import com.taover.util.bean.UtilResultInfo; - -@Service -public class ${serviceImplClassSimpleName} implements ${serviceClassSimpleName} { - @Resource - private ${repositoryClassSimpleName} ${repositoryClassFieldName}; - - @Override - public ResultInfo getListV1(List condition, Integer page, Integer size) { - try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoPage(condition, page, size)); - } catch (Exception e) { - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - } - - @Override - public ResultInfo getOneV1(String ssid) { - try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); - } catch (Exception e) { - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - } - - @Override - public ResultInfo putV1(String ssid, List updateList) { - try{ - this.${repositoryClassFieldName}.updateEntityBySsid(ssid, updateList); - }catch(Exception e){ - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - return UtilResultInfo.getSuccess("更新成功"); - } - - @Override - public ResultInfo deleteV1(String ssid) { - try{ - this.${repositoryClassFieldName}.deleteEntityBySsid(ssid); - }catch(Exception e){ - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - return UtilResultInfo.getSuccess("删除成功"); - } - - @Override - public ResultInfo postV1(Map data) { - try { - return UtilResultInfo.getSuccess("创建成功", this.${repositoryClassFieldName}.addEntityByMap(data)); - } catch (Exception e) { - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - } - - @Override - public ResultInfo getListManage(List condition, Integer page, Integer size) { - try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoPage(condition, page, size)); - } catch (Exception e) { - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - } - - @Override - public ResultInfo getOneManage(String ssid) { - try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); - } catch (Exception e) { - return UtilResultInfo.getFailure(e.getMessage()); - } - } - - @Override - public ResultInfo putManage(String ssid, List updateList) { - try{ - this.${repositoryClassFieldName}.updateEntityBySsid(ssid, updateList); - }catch(Exception e){ - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - return UtilResultInfo.getSuccess("更新成功"); - } - - @Override - public ResultInfo deleteManage(String ssid) { - try{ - this.${repositoryClassFieldName}.deleteEntityBySsid(ssid); - }catch(Exception e){ - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - return UtilResultInfo.getSuccess("删除成功"); - } - - @Override - public ResultInfo postManage(Map data) { - try { - return UtilResultInfo.getSuccess("创建成功", this.${repositoryClassFieldName}.addEntityByMap(data)); - } catch (Exception e) { - UtilLog.errorForException(e, this.getClass()); - return UtilResultInfo.getFailure(e.getMessage()); - } - } -} diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceTemplate.ftl deleted file mode 100644 index 4817dee..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/ServiceTemplate.ftl +++ /dev/null @@ -1,82 +0,0 @@ -package ${basePackage}.service; - -import java.util.List; -import java.util.Map; - -import com.taover.util.bean.ResultInfo; - -public interface ${serviceClassSimpleName} { - /** - * 获取列表 - * @param condition - * @param page - * @param size - * @return - */ - public ResultInfo getListV1(List condition, Integer page, Integer size); - - /** - * 获取ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo getOneV1(String ssid); - - /** - * 修改ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo putV1(String ssid, List updateList); - - /** - * 删除ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo deleteV1(String ssid); - - /** - * 创建数据 - * @param ssid - * @return - */ - public ResultInfo postV1(Map data); - - /** - * 获取列表 - * @param condition - * @param page - * @param size - * @return - */ - public ResultInfo getListManage(List condition, Integer page, Integer size); - - /** - * 获取ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo getOneManage(String ssid); - - /** - * 修改ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo putManage(String ssid, List updateList); - - /** - * 删除ssid对应的数据 - * @param ssid - * @return - */ - public ResultInfo deleteManage(String ssid); - - /** - * 创建数据 - * @param ssid - * @return - */ - public ResultInfo postManage(Map data); -} diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/V1ControllerTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/V1ControllerTemplate.ftl deleted file mode 100644 index faf6ac3..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/V1ControllerTemplate.ftl +++ /dev/null @@ -1,135 +0,0 @@ -package ${basePackage}.controller.v1; - -import java.util.List; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import ${basePackage}.bean.entity.${entityClassSimpleName}; -import ${basePackage}.constants.GlobalConstants; -import ${basePackage}.service.${serviceClassSimpleName}; - -import com.taover.util.UtilHttpRequestMap; -import com.taover.util.bean.ResultInfo; - -@Controller("v1.${controllerMap}") -@RequestMapping("/v1/${controllerMap}") -public class ${controllerClassName} { - @Resource - private ${serviceClassSimpleName} ${serviceClassFieldName}; - - /** - * @apiDefine ResultInfo - * @apiSuccess {string} - * @apiSuccessExample {json} Success-Response: - * { - * code:ok, - * error:null - * } - * @apiError ThrowException 出现异常 - * @apiErrorExample - * { - * code:fail, - * error:null exception - * } - */ - - /** - * @api {GET} /v1/${controllerMap} 查询${controllerMap}列表 - * @apiDescription 查询${controllerMap}列表数据 - * 返回分页结果 - * - * @apiGroup ${controllerMap} - * @apiName ${controllerMap}列表 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @GetMapping - public ResultInfo get(HttpServletRequest request){ - String pageStr = request.getParameter("page"); - if(StringUtils.isEmpty(pageStr)){ - pageStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE; - } - String sizeStr = request.getParameter("size"); - if(StringUtils.isEmpty(sizeStr)){ - sizeStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE_SIZE; - } - List condition = UtilHttpRequestMap.getSqlConditionListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, "page,size"); - return this.${serviceClassFieldName}.getListV1(condition, Integer.valueOf(pageStr), Integer.valueOf(sizeStr)); - } - - /** - * @api {GET} /v1/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} - * @apiDescription 查询ssid对应${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName get实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @GetMapping("/{ssid}") - public ResultInfo get(String ssid){ - return this.${serviceClassFieldName}.getOneV1(ssid); - } - - /** - * @api {POST} /v1/${controllerMap} 创建${controllerMap} - * @apiDescription 创建${controllerMap} - * - * @apiGroup ${controllerMap} - * @apiName get实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @PostMapping - public ResultInfo post(HttpServletRequest request){ - return this.${serviceClassFieldName}.postV1(UtilHttpRequestMap.getMapValueStringByRequestMap(request.getParameterMap())); - } - - /** - * @api {DELETE} /v1/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} - * @apiDescription 删除ssid对应的${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName 删除实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @DeleteMapping("/{ssid}") - public ResultInfo delete(String ssid){ - return this.${serviceClassFieldName}.deleteV1(ssid); - } - - /** - * @api {PUT} /v1/${controllerMap}/{ssid} 修改${controllerMap}数据 - * @apiDescription 修改${controllerMap}数据 - * - * @apiGroup ${controllerMap} - * @apiName 修改实体数据 - * @apiVersion 1.0.0 - * @apiHeader Authorization - * - * @apiUse ResultInfo - */ - @PutMapping("/{ssid}") - public ResultInfo put(String ssid, HttpServletRequest request){ - return this.${serviceClassFieldName}.putV1(ssid, UtilHttpRequestMap.getUpdateListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, null)); - } - -} diff --git a/src/main/java/com/taover/codegenerate/bazhuayun/template/VoTemplate.ftl b/src/main/java/com/taover/codegenerate/bazhuayun/template/VoTemplate.ftl deleted file mode 100644 index 830389e..0000000 --- a/src/main/java/com/taover/codegenerate/bazhuayun/template/VoTemplate.ftl +++ /dev/null @@ -1,37 +0,0 @@ -package ${basePackage}.bean.vo; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Date; - -/** - <#if version?exists> - * @version ${version} - - */ -public class ${voClassSimpleName} implements Serializable { - - private static final long serialVersionUID = 1L; - - <#--变量 ,get,set方法--> -<#if tablemodel.columnlist?exists> - <#list tablemodel.columnlist as clist> - - <#if clist.columnRemarks?exists> - /** - * ${clist.columnRemarks} - */ - - private ${clist.columnJAVAType} ${clist.columnName}; - - public ${clist.columnJAVAType} get${clist.columnMethodName}(){ - return ${clist.columnName}; - } - public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ - this.${clist.columnName} = ${clist.columnName}; - } - - - -} \ No newline at end of file diff --git a/src/main/resources/template/bazhuayun/DtoTemplate.ftl b/src/main/resources/template/bazhuayun/DtoTemplate.ftl new file mode 100644 index 0000000..999e93b --- /dev/null +++ b/src/main/resources/template/bazhuayun/DtoTemplate.ftl @@ -0,0 +1,37 @@ +package ${basePackage}.bean.dto; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Date; + +/** + <#if version?exists> + * @version ${version} + + */ +public class ${dtoClassSimpleName} implements Serializable { + + private static final long serialVersionUID = 1L; + + <#--变量 ,get,set方法--> +<#if tablemodel.columnlist?exists> + <#list tablemodel.columnlist as clist> + + <#if clist.columnRemarks?exists> + /** + * ${clist.columnRemarks} + */ + + private ${clist.columnJAVAType} ${clist.columnName}; + + public ${clist.columnJAVAType} get${clist.columnMethodName}(){ + return ${clist.columnName}; + } + public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ + this.${clist.columnName} = ${clist.columnName}; + } + + + +} \ No newline at end of file diff --git a/src/main/resources/template/bazhuayun/EntityTemplate.ftl b/src/main/resources/template/bazhuayun/EntityTemplate.ftl new file mode 100644 index 0000000..cd8bc03 --- /dev/null +++ b/src/main/resources/template/bazhuayun/EntityTemplate.ftl @@ -0,0 +1,52 @@ +package ${basePackage}.bean.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Id; +import javax.persistence.Column; + +/** + <#if version?exists> + * @version ${version} + + */ +@Entity +@Table(name="${tablemodel.tableName}", catalog="${tablemodel.schemeName}") +public class ${entityClassSimpleName} implements Serializable { + + private static final long serialVersionUID = 1L; + + <#--变量 ,get,set方法--> +<#if tablemodel.columnlist?exists> + <#list tablemodel.columnlist as clist> + + <#if clist.columnRemarks?exists> + /** + * ${clist.columnRemarks} + */ + + <#if clist.primaryKey == true> + @Id + + @Column(name="${clist.columnUName}") + private ${clist.columnJAVAType} ${clist.columnName}; + + public ${clist.columnJAVAType} get${clist.columnMethodName}(){ + return ${clist.columnName}; + } + public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ + this.${clist.columnName} = ${clist.columnName}; + } + + + + @Override + public String toString() { + return "${entityClassSimpleName}: ${toStringMethodBody}; + } + } \ No newline at end of file diff --git a/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl b/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl new file mode 100644 index 0000000..9ea48f0 --- /dev/null +++ b/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl @@ -0,0 +1,135 @@ +package ${basePackage}.controller.manage; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ${basePackage}.bean.entity.${entityClassSimpleName}; +import ${basePackage}.constants.GlobalConstants; +import ${basePackage}.service.${serviceClassSimpleName}; + +import com.taover.util.UtilHttpRequestMap; +import com.taover.util.bean.ResultInfo; + +@Controller("manage.${controllerMap}") +@RequestMapping("/manage/${controllerMap}") +public class ${controllerClassName} { + @Resource + private ${serviceClassSimpleName} ${serviceClassFieldName}; + + /** + * @apiDefine ResultInfo + * @apiSuccess {string} + * @apiSuccessExample {json} Success-Response: + * { + * code:ok, + * error:null + * } + * @apiError ThrowException 出现异常 + * @apiErrorExample + * { + * code:fail, + * error:null exception + * } + */ + + /** + * @api {GET} /manage/${controllerMap} 查询${controllerMap}列表 + * @apiDescription 查询${controllerMap}列表数据 + * 返回分页结果 + * + * @apiGroup ${controllerMap} + * @apiName ${controllerMap}列表 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @GetMapping + public ResultInfo get(HttpServletRequest request){ + String pageStr = request.getParameter("page"); + if(StringUtils.isEmpty(pageStr)){ + pageStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE; + } + String sizeStr = request.getParameter("size"); + if(StringUtils.isEmpty(sizeStr)){ + sizeStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE_SIZE; + } + List condition = UtilHttpRequestMap.getSqlConditionListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, "page,size"); + return this.${serviceClassFieldName}.getListManage(condition, Integer.valueOf(pageStr), Integer.valueOf(sizeStr)); + } + + /** + * @api {GET} /manage/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} + * @apiDescription 查询ssid对应${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName get实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @GetMapping("/{ssid}") + public ResultInfo get(String ssid){ + return this.${serviceClassFieldName}.getOneManage(ssid); + } + + /** + * @api {POST} /manage/${controllerMap} 创建${controllerMap} + * @apiDescription 创建${controllerMap} + * + * @apiGroup ${controllerMap} + * @apiName get实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @PostMapping + public ResultInfo post(HttpServletRequest request){ + return this.${serviceClassFieldName}.postManage(UtilHttpRequestMap.getMapValueStringByRequestMap(request.getParameterMap())); + } + + /** + * @api {DELETE} /manage/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} + * @apiDescription 删除ssid对应的${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName 删除实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @DeleteMapping("/{ssid}") + public ResultInfo delete(String ssid){ + return this.${serviceClassFieldName}.deleteManage(ssid); + } + + /** + * @api {PUT} /manage/${controllerMap}/{ssid} 修改${controllerMap}数据 + * @apiDescription 修改${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName 修改实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @PutMapping("/{ssid}") + public ResultInfo put(String ssid, HttpServletRequest request){ + return this.${serviceClassFieldName}.putManage(ssid, UtilHttpRequestMap.getUpdateListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, null)); + } + +} diff --git a/src/main/resources/template/bazhuayun/RepositoryTemplate.ftl b/src/main/resources/template/bazhuayun/RepositoryTemplate.ftl new file mode 100644 index 0000000..c259eb9 --- /dev/null +++ b/src/main/resources/template/bazhuayun/RepositoryTemplate.ftl @@ -0,0 +1,74 @@ +package ${basePackage}.repository; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Base64; +import java.util.List; +import java.util.Map; + +import org.msgpack.MessagePack; +import org.springframework.stereotype.Repository; + +import ${basePackage}.bean.entity.${entityClassSimpleName}; +import ${basePackage}.bean.vo.${voClassSimpleName}; +import com.taover.repository.CustomJdbcTemplate; +import com.taover.util.UtilHttpRequestMap; +import com.taover.util.UtilObject; + +@Repository +public class ${repositoryClassSimpleName} extends CustomJdbcTemplate<${entityClassSimpleName}, Integer>{ + + public ${repositoryClassSimpleName}() throws Exception { + super(); + } + + public String getSsidById(Integer id) throws Exception{ + MessagePack pack = new MessagePack(); + return Base64.getEncoder().encodeToString(pack.write(new Integer[]{id, id, id})); + } + + public Integer getIdBySsid(String ssid) throws Exception{ + MessagePack pack = new MessagePack(); + return pack.read(Base64.getDecoder().decode(ssid), Integer[].class)[0]; + } + + public Map getVoPage(List condition, Integer page, Integer size) throws Exception{ + Map entityData = this.findPageByCondition(condition, page, size); + List<${entityClassSimpleName}> entityList = (List<${entityClassSimpleName}>) entityData.get("rows"); + List<${voClassSimpleName}> voList = new ArrayList<${voClassSimpleName}>(); + for(int i=0; i updateList) throws Exception{ + this.updateEntityById(updateList, this.getIdBySsid(ssid)); + } + + public void deleteEntityBySsid(String ssid) throws Exception{ + this.deleteEntityByID(this.getIdBySsid(ssid)); + } + + public ${voClassSimpleName} addEntityByMap(Map data) throws Exception{ + ${entityClassSimpleName} entityObj = UtilHttpRequestMap.getBeanByMap(data, ${entityClassSimpleName}.class, false, "id"); + BigInteger resultId = this.addEntityForAutoincrementId(entityObj); + return this.getVoByEntity(this.findEntityByID(resultId.intValue())); + } +} diff --git a/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl b/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl new file mode 100644 index 0000000..f9f2d8c --- /dev/null +++ b/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl @@ -0,0 +1,124 @@ +package ${basePackage}.service.impl; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import ${basePackage}.bean.entity.${entityClassSimpleName}; +import ${basePackage}.repository.${repositoryClassSimpleName}; +import ${basePackage}.service.${serviceClassSimpleName}; +import com.taover.util.UtilLog; +import com.taover.util.bean.ResultInfo; +import com.taover.util.bean.UtilResultInfo; + +@Service +public class ${serviceImplClassSimpleName} implements ${serviceClassSimpleName} { + @Resource + private ${repositoryClassSimpleName} ${repositoryClassFieldName}; + + @Override + public ResultInfo getListV1(List condition, Integer page, Integer size) { + try { + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoPage(condition, page, size)); + } catch (Exception e) { + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + } + + @Override + public ResultInfo getOneV1(String ssid) { + try { + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); + } catch (Exception e) { + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + } + + @Override + public ResultInfo putV1(String ssid, List updateList) { + try{ + this.${repositoryClassFieldName}.updateEntityBySsid(ssid, updateList); + }catch(Exception e){ + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + return UtilResultInfo.getSuccess("更新成功"); + } + + @Override + public ResultInfo deleteV1(String ssid) { + try{ + this.${repositoryClassFieldName}.deleteEntityBySsid(ssid); + }catch(Exception e){ + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + return UtilResultInfo.getSuccess("删除成功"); + } + + @Override + public ResultInfo postV1(Map data) { + try { + return UtilResultInfo.getSuccess("创建成功", this.${repositoryClassFieldName}.addEntityByMap(data)); + } catch (Exception e) { + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + } + + @Override + public ResultInfo getListManage(List condition, Integer page, Integer size) { + try { + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoPage(condition, page, size)); + } catch (Exception e) { + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + } + + @Override + public ResultInfo getOneManage(String ssid) { + try { + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); + } catch (Exception e) { + return UtilResultInfo.getFailure(e.getMessage()); + } + } + + @Override + public ResultInfo putManage(String ssid, List updateList) { + try{ + this.${repositoryClassFieldName}.updateEntityBySsid(ssid, updateList); + }catch(Exception e){ + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + return UtilResultInfo.getSuccess("更新成功"); + } + + @Override + public ResultInfo deleteManage(String ssid) { + try{ + this.${repositoryClassFieldName}.deleteEntityBySsid(ssid); + }catch(Exception e){ + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + return UtilResultInfo.getSuccess("删除成功"); + } + + @Override + public ResultInfo postManage(Map data) { + try { + return UtilResultInfo.getSuccess("创建成功", this.${repositoryClassFieldName}.addEntityByMap(data)); + } catch (Exception e) { + UtilLog.errorForException(e, this.getClass()); + return UtilResultInfo.getFailure(e.getMessage()); + } + } +} diff --git a/src/main/resources/template/bazhuayun/ServiceTemplate.ftl b/src/main/resources/template/bazhuayun/ServiceTemplate.ftl new file mode 100644 index 0000000..4817dee --- /dev/null +++ b/src/main/resources/template/bazhuayun/ServiceTemplate.ftl @@ -0,0 +1,82 @@ +package ${basePackage}.service; + +import java.util.List; +import java.util.Map; + +import com.taover.util.bean.ResultInfo; + +public interface ${serviceClassSimpleName} { + /** + * 获取列表 + * @param condition + * @param page + * @param size + * @return + */ + public ResultInfo getListV1(List condition, Integer page, Integer size); + + /** + * 获取ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo getOneV1(String ssid); + + /** + * 修改ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo putV1(String ssid, List updateList); + + /** + * 删除ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo deleteV1(String ssid); + + /** + * 创建数据 + * @param ssid + * @return + */ + public ResultInfo postV1(Map data); + + /** + * 获取列表 + * @param condition + * @param page + * @param size + * @return + */ + public ResultInfo getListManage(List condition, Integer page, Integer size); + + /** + * 获取ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo getOneManage(String ssid); + + /** + * 修改ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo putManage(String ssid, List updateList); + + /** + * 删除ssid对应的数据 + * @param ssid + * @return + */ + public ResultInfo deleteManage(String ssid); + + /** + * 创建数据 + * @param ssid + * @return + */ + public ResultInfo postManage(Map data); +} diff --git a/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl b/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl new file mode 100644 index 0000000..edd0e3a --- /dev/null +++ b/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl @@ -0,0 +1,135 @@ +package ${basePackage}.controller.v1; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ${basePackage}.bean.entity.${entityClassSimpleName}; +import ${basePackage}.constants.GlobalConstants; +import ${basePackage}.service.${serviceClassSimpleName}; + +import com.taover.util.UtilHttpRequestMap; +import com.taover.util.bean.ResultInfo; + +@RestController("v1.${controllerMap}") +@RequestMapping("/v1/${controllerMap}") +public class ${controllerClassName} { + @Resource + private ${serviceClassSimpleName} ${serviceClassFieldName}; + + /** + * @apiDefine ResultInfo + * @apiSuccess {string} + * @apiSuccessExample {json} Success-Response: + * { + * code:ok, + * error:null + * } + * @apiError ThrowException 出现异常 + * @apiErrorExample + * { + * code:fail, + * error:null exception + * } + */ + + /** + * @api {GET} /v1/${controllerMap} 查询${controllerMap}列表 + * @apiDescription 查询${controllerMap}列表数据 + * 返回分页结果 + * + * @apiGroup ${controllerMap} + * @apiName ${controllerMap}列表 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @GetMapping + public ResultInfo get(HttpServletRequest request){ + String pageStr = request.getParameter("page"); + if(StringUtils.isEmpty(pageStr)){ + pageStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE; + } + String sizeStr = request.getParameter("size"); + if(StringUtils.isEmpty(sizeStr)){ + sizeStr = ""+GlobalConstants.DEFAULT_QUERY_PAGE_SIZE; + } + List condition = UtilHttpRequestMap.getSqlConditionListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, "page,size"); + return this.${serviceClassFieldName}.getListV1(condition, Integer.valueOf(pageStr), Integer.valueOf(sizeStr)); + } + + /** + * @api {GET} /v1/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} + * @apiDescription 查询ssid对应${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName get实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @GetMapping("/{ssid}") + public ResultInfo get(String ssid){ + return this.${serviceClassFieldName}.getOneV1(ssid); + } + + /** + * @api {POST} /v1/${controllerMap} 创建${controllerMap} + * @apiDescription 创建${controllerMap} + * + * @apiGroup ${controllerMap} + * @apiName get实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @PostMapping + public ResultInfo post(HttpServletRequest request){ + return this.${serviceClassFieldName}.postV1(UtilHttpRequestMap.getMapValueStringByRequestMap(request.getParameterMap())); + } + + /** + * @api {DELETE} /v1/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} + * @apiDescription 删除ssid对应的${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName 删除实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @DeleteMapping("/{ssid}") + public ResultInfo delete(String ssid){ + return this.${serviceClassFieldName}.deleteV1(ssid); + } + + /** + * @api {PUT} /v1/${controllerMap}/{ssid} 修改${controllerMap}数据 + * @apiDescription 修改${controllerMap}数据 + * + * @apiGroup ${controllerMap} + * @apiName 修改实体数据 + * @apiVersion 1.0.0 + * @apiHeader Authorization + * + * @apiUse ResultInfo + */ + @PutMapping("/{ssid}") + public ResultInfo put(String ssid, HttpServletRequest request){ + return this.${serviceClassFieldName}.putV1(ssid, UtilHttpRequestMap.getUpdateListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, null)); + } + +} diff --git a/src/main/resources/template/bazhuayun/VoTemplate.ftl b/src/main/resources/template/bazhuayun/VoTemplate.ftl new file mode 100644 index 0000000..830389e --- /dev/null +++ b/src/main/resources/template/bazhuayun/VoTemplate.ftl @@ -0,0 +1,37 @@ +package ${basePackage}.bean.vo; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Date; + +/** + <#if version?exists> + * @version ${version} + + */ +public class ${voClassSimpleName} implements Serializable { + + private static final long serialVersionUID = 1L; + + <#--变量 ,get,set方法--> +<#if tablemodel.columnlist?exists> + <#list tablemodel.columnlist as clist> + + <#if clist.columnRemarks?exists> + /** + * ${clist.columnRemarks} + */ + + private ${clist.columnJAVAType} ${clist.columnName}; + + public ${clist.columnJAVAType} get${clist.columnMethodName}(){ + return ${clist.columnName}; + } + public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ + this.${clist.columnName} = ${clist.columnName}; + } + + + +} \ No newline at end of file -- libgit2 0.21.2