diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type.txt b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_typeController.txt similarity index 56% rename from dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type.txt rename to dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_typeController.txt index 106c4fcb..72055dab 100644 --- a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type.txt +++ b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_typeController.txt @@ -21,7 +21,7 @@ public void delWxFaultTypeById(int type_id){ renderJson(RetKit.renderSuccess()); } -/**修改维修故障类型字典 +/**按ID修改维修故障类型字典 * @param type_name 类型名称 */ @Before({POST.class}) @@ -30,4 +30,23 @@ public void delWxFaultTypeById(int type_id){ public void updateWxFaultTypeById(int type_id , String type_name ){ ym.updateWxFaultTypeById(type_id , type_name ); renderJson(RetKit.renderSuccess()); +} + +/**按ID查询维修故障类型字典 +* @para type_id 主键 +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +@IsNumericInterface("{type_id}") +public void getWxFaultTypeById(int type_id){ + renderJson(RetKit.renderSuccess(ym.getWxFaultTypeById(type_id))); +} + +/** 分页查询维修故障类型字典 +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +public void getWxFaultTypeList(int pageNum, int pageSize){ + Page listPage = ym.getWxFaultTypeList(pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); } \ No newline at end of file diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java index 21ac2d34..b112e16e 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java @@ -466,7 +466,7 @@ public class GenerateCodeWithFreeMaker { Template template = cfg.getTemplate("Controller.ftl"); // 渲染模板到文件 - Writer out = new FileWriter(codePath +"/"+ table + ".txt", StandardCharsets.UTF_8); + Writer out = new FileWriter(codePath +"/"+ table + "_Controller.txt", StandardCharsets.UTF_8); template.process(dataModel, out); out.close(); } diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl index 5fa43c50..7727884c 100644 --- a/dsUtils/src/main/resources/Controller.ftl +++ b/dsUtils/src/main/resources/Controller.ftl @@ -25,7 +25,7 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ renderJson(RetKit.renderSuccess()); } -/**修改${comment} +/**按ID修改${comment} <#list params as param> * @param ${param.key} ${param.comment} @@ -36,4 +36,23 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters}){ ${daoName}.update${beanNameWithoutT}ById(${key} , ${parameters}); renderJson(RetKit.renderSuccess()); +} + +/**按ID查询${comment} +* @para ${key} 主键 +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +@IsNumericInterface("{${key}}") +public void get${beanNameWithoutT}ById(${key_type} ${key}){ + renderJson(RetKit.renderSuccess(${daoName}.get${beanNameWithoutT}ById(${key}))); +} + +/** 分页查询${comment} +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +public void get${beanNameWithoutT}List(int pageNum, int pageSize){ + Page listPage = ${daoName}.get${beanNameWithoutT}List(pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); } \ No newline at end of file diff --git a/dsUtils/target/classes/Controller.ftl b/dsUtils/target/classes/Controller.ftl index 5fa43c50..7727884c 100644 --- a/dsUtils/target/classes/Controller.ftl +++ b/dsUtils/target/classes/Controller.ftl @@ -25,7 +25,7 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ renderJson(RetKit.renderSuccess()); } -/**修改${comment} +/**按ID修改${comment} <#list params as param> * @param ${param.key} ${param.comment} @@ -36,4 +36,23 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters}){ ${daoName}.update${beanNameWithoutT}ById(${key} , ${parameters}); renderJson(RetKit.renderSuccess()); +} + +/**按ID查询${comment} +* @para ${key} 主键 +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +@IsNumericInterface("{${key}}") +public void get${beanNameWithoutT}ById(${key_type} ${key}){ + renderJson(RetKit.renderSuccess(${daoName}.get${beanNameWithoutT}ById(${key}))); +} + +/** 分页查询${comment} +*/ +@Before({GET.class}) +@JwtCheckInterface({}) +public void get${beanNameWithoutT}List(int pageNum, int pageSize){ + Page listPage = ${daoName}.get${beanNameWithoutT}List(pageNum, pageSize); + renderJson(RetKit.renderSuccess(listPage)); } \ No newline at end of file