From 5d3d1c013b35648b3471f6c5294ec797625a87a5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Dec 2020 11:18:22 +0800 Subject: [PATCH] update id deal --- build.gradle | 2 +- src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl | 26 +++++++++++++------------- src/main/resources/template/bazhuayun/RepositoryTemplate.ftl | 17 ++++++----------- src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl | 16 ++++++++-------- src/main/resources/template/bazhuayun/ServiceTemplate.ftl | 25 +++++++++++++------------ src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl | 20 ++++++++++---------- src/main/resources/template/bazhuayun/VoTemplate.ftl | 11 ----------- 7 files changed, 51 insertions(+), 66 deletions(-) diff --git a/build.gradle b/build.gradle index a321496..f7b46f6 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.2.15' + version '1.2.16' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl b/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl index f56fc5f..a156aea 100644 --- a/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl +++ b/src/main/resources/template/bazhuayun/ManageControllerTemplate.ftl @@ -70,7 +70,7 @@ public class ${controllerClassName} { } /** - * @api {GET} /manage/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} + * @api {GET} /manage/${controllerMap}/{id} 查询id对应的${controllerMap} * @apiDescription 查询ssid对应${controllerMap}数据 * * @apiGroup ${controllerMap} @@ -80,9 +80,9 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @GetMapping("/{ssid}") - public ResultInfo get(@PathVariable String ssid){ - return this.${serviceClassFieldName}.getOneManage(ssid); + @GetMapping("/{id}") + public ResultInfo get(@PathVariable Integer id){ + return this.${serviceClassFieldName}.getOneManage(id); } /** @@ -102,8 +102,8 @@ public class ${controllerClassName} { } /** - * @api {DELETE} /manage/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} - * @apiDescription 删除ssid对应的${controllerMap}数据 + * @api {DELETE} /manage/${controllerMap}/{id} 删除id对应的${controllerMap} + * @apiDescription 删除id对应的${controllerMap}数据 * * @apiGroup ${controllerMap} * @apiName 删除实体数据 @@ -112,13 +112,13 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @DeleteMapping("/{ssid}") - public ResultInfo delete(@PathVariable String ssid){ - return this.${serviceClassFieldName}.deleteManage(ssid); + @DeleteMapping("/{id}") + public ResultInfo delete(@PathVariable Integer id){ + return this.${serviceClassFieldName}.deleteManage(id); } /** - * @api {PUT} /manage/${controllerMap}/{ssid} 修改${controllerMap}数据 + * @api {PUT} /manage/${controllerMap}/{id} 修改${controllerMap}数据 * @apiDescription 修改${controllerMap}数据 * * @apiGroup ${controllerMap} @@ -128,9 +128,9 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @PutMapping("/{ssid}") - public ResultInfo put(@PathVariable String ssid, HttpServletRequest request){ - return this.${serviceClassFieldName}.putManage(ssid, UtilHttpRequestMap.getUpdateListByRequestMap(request.getParameterMap(), ${entityClassSimpleName}.class, null)); + @PutMapping("/{id}") + public ResultInfo put(@PathVariable Integer id, HttpServletRequest request){ + return this.${serviceClassFieldName}.putManage(id, 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 index c259eb9..6a55155 100644 --- a/src/main/resources/template/bazhuayun/RepositoryTemplate.ftl +++ b/src/main/resources/template/bazhuayun/RepositoryTemplate.ftl @@ -42,28 +42,23 @@ public class ${repositoryClassSimpleName} extends CustomJdbcTemplate<${entityCla entityData.put("rows", voList); return entityData; } - - public ${voClassSimpleName} getVoBySsid(String ssid) throws Exception{ - return this.getVoByEntity(this.findEntityByID(this.getIdBySsid(ssid))); - } - + public ${voClassSimpleName} getVoByEntity(${entityClassSimpleName} entity) throws Exception{ ${voClassSimpleName} voObj = null; try { - voObj = UtilObject.fieldCopy(entity, ${voClassSimpleName}.class, true, new String[]{"id"}); + voObj = UtilObject.fieldCopy(entity, ${voClassSimpleName}.class, true, null); } catch (Exception e) { throw new Exception("对象转换失败"); } - voObj.setSsid(this.getSsidById(entity.getId())); return voObj; } - public void updateEntityBySsid(String ssid, List updateList) throws Exception{ - this.updateEntityById(updateList, this.getIdBySsid(ssid)); + public void updateEntityById(Integer id, List updateList) throws Exception{ + this.updateEntityById(updateList, id); } - public void deleteEntityBySsid(String ssid) throws Exception{ - this.deleteEntityByID(this.getIdBySsid(ssid)); + public void deleteEntityById(Integer id) throws Exception{ + this.deleteEntityByID(id); } public ${voClassSimpleName} addEntityByMap(Map data) throws Exception{ diff --git a/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl b/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl index 786fcbd..e4df4c8 100644 --- a/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl +++ b/src/main/resources/template/bazhuayun/ServiceImplTemplate.ftl @@ -30,9 +30,9 @@ public class ${serviceImplClassSimpleName} implements ${serviceClassSimpleName} } @Override - public ResultInfo getOneV1(String ssid) { + public ResultInfo getOneV1(Integer id) { try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.findEntityById(id)); } catch (Exception e) { UtilLog.errorForException(e, this.getClass()); return UtilResultInfo.getFailure(e.getMessage()); @@ -50,18 +50,18 @@ public class ${serviceImplClassSimpleName} implements ${serviceClassSimpleName} } @Override - public ResultInfo getOneManage(String ssid) { + public ResultInfo getOneManage(Integer id) { try { - return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.getVoBySsid(ssid)); + return UtilResultInfo.getSuccess("查询成功", this.${repositoryClassFieldName}.findEntityById(id)); } catch (Exception e) { return UtilResultInfo.getFailure(e.getMessage()); } } @Override - public ResultInfo putManage(String ssid, List updateList) { + public ResultInfo putManage(Integer id, List updateList) { try{ - this.${repositoryClassFieldName}.updateEntityBySsid(ssid, updateList); + this.${repositoryClassFieldName}.updateEntityById(id, updateList); }catch(Exception e){ UtilLog.errorForException(e, this.getClass()); return UtilResultInfo.getFailure(e.getMessage()); @@ -70,9 +70,9 @@ public class ${serviceImplClassSimpleName} implements ${serviceClassSimpleName} } @Override - public ResultInfo deleteManage(String ssid) { + public ResultInfo deleteManage(Integer id) { try{ - this.${repositoryClassFieldName}.deleteEntityBySsid(ssid); + this.${repositoryClassFieldName}.deleteEntityById(id); }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 index 2868a4c..c495fa8 100644 --- a/src/main/resources/template/bazhuayun/ServiceTemplate.ftl +++ b/src/main/resources/template/bazhuayun/ServiceTemplate.ftl @@ -16,11 +16,11 @@ public interface ${serviceClassSimpleName} { public ResultInfo getListV1(List condition, Integer page, Integer size); /** - * 获取ssid对应的数据 - * @param ssid + * 获取id对应的数据 + * @param id * @return */ - public ResultInfo getOneV1(String ssid); + public ResultInfo getOneV1(Integer id); /** * 获取列表 @@ -32,29 +32,30 @@ public interface ${serviceClassSimpleName} { public ResultInfo getListManage(List condition, Integer page, Integer size); /** - * 获取ssid对应的数据 - * @param ssid + * 获取id对应的数据 + * @param id * @return */ - public ResultInfo getOneManage(String ssid); + public ResultInfo getOneManage(Integer id); /** - * 修改ssid对应的数据 - * @param ssid + * 修改id对应的数据 + * @param id + * @param updateList * @return */ - public ResultInfo putManage(String ssid, List updateList); + public ResultInfo putManage(Integer id, List updateList); /** * 删除ssid对应的数据 - * @param ssid + * @param id * @return */ - public ResultInfo deleteManage(String ssid); + public ResultInfo deleteManage(Integer id); /** * 创建数据 - * @param ssid + * @param data * @return */ public ResultInfo postManage(Map data); diff --git a/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl b/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl index 10af9fe..c301fb0 100644 --- a/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl +++ b/src/main/resources/template/bazhuayun/V1ControllerTemplate.ftl @@ -71,7 +71,7 @@ public class ${controllerClassName} { } /** - * @api {GET} /v1/${controllerMap}/{ssid} 查询ssid对应的${controllerMap} + * @api {GET} /v1/${controllerMap}/{id} 查询ssid对应的${controllerMap} * @apiDescription 查询ssid对应${controllerMap}数据 * * @apiGroup ${controllerMap} @@ -81,9 +81,9 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @GetMapping("/{ssid}") - public ResultInfo get(@PathVariable String ssid){ - return this.${serviceClassFieldName}.getOneV1(ssid); + @GetMapping("/{id}") + public ResultInfo get(@PathVariable Integer id){ + return this.${serviceClassFieldName}.getOneV1(id); } /** @@ -103,7 +103,7 @@ public class ${controllerClassName} { } /** - * @api {DELETE} /v1/${controllerMap}/{ssid} 删除ssid对应的${controllerMap} + * @api {DELETE} /v1/${controllerMap}/{id} 删除id对应的${controllerMap} * @apiDescription 删除ssid对应的${controllerMap}数据 * * @apiGroup ${controllerMap} @@ -113,13 +113,13 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @DeleteMapping("/{ssid}") - public ResultInfo delete(@PathVariable String ssid){ + @DeleteMapping("/{id}") + public ResultInfo delete(@PathVariable Integer id){ return UtilResultInfo.getFailure("没有找到对应处理逻辑"); } /** - * @api {PUT} /v1/${controllerMap}/{ssid} 修改${controllerMap}数据 + * @api {PUT} /v1/${controllerMap}/{id} 修改${controllerMap}数据 * @apiDescription 修改${controllerMap}数据 * * @apiGroup ${controllerMap} @@ -129,8 +129,8 @@ public class ${controllerClassName} { * * @apiUse ResultInfo */ - @PutMapping("/{ssid}") - public ResultInfo put(@PathVariable String ssid, HttpServletRequest request){ + @PutMapping("/{id}") + public ResultInfo put(@PathVariable Integer id, HttpServletRequest request){ return UtilResultInfo.getFailure("没有找到对应处理逻辑"); } diff --git a/src/main/resources/template/bazhuayun/VoTemplate.ftl b/src/main/resources/template/bazhuayun/VoTemplate.ftl index 9daf7d4..5740750 100644 --- a/src/main/resources/template/bazhuayun/VoTemplate.ftl +++ b/src/main/resources/template/bazhuayun/VoTemplate.ftl @@ -16,22 +16,12 @@ public class ${voClassSimpleName} implements Serializable { <#--变量 ,get,set方法--> <#if tablemodel.columnlist?exists> - private String ssid; - - public String getSsid(){ - return ssid; - } - public void setSsid(String ssid){ - this.ssid = ssid; - } - <#list tablemodel.columnlist as clist> <#if clist.columnRemarks?exists> /** * ${clist.columnRemarks} */ - <#if clist.columnName != "id" && clist.columnName != "ssid" > private ${clist.columnJAVAType} ${clist.columnName}; public ${clist.columnJAVAType} get${clist.columnMethodName}(){ @@ -40,7 +30,6 @@ public class ${voClassSimpleName} implements Serializable { public void set${clist.columnMethodName}(${clist.columnJAVAType} ${clist.columnName}){ this.${clist.columnName} = ${clist.columnName}; } - -- libgit2 0.21.2