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_type.txt new file mode 100644 index 00000000..e31e1b2d --- /dev/null +++ b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type.txt @@ -0,0 +1,10 @@ +/** +* 增加维修故障类型字典 +* @param type_name 类型名称 +*/ +@Before({POST.class}) +@JwtCheckInterface({}) +public void addWxFaultType(String type_name ){ + ym.addWxFaultType(type_name ); + renderJson(RetKit.renderSuccess()); +} \ 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 1c06022f..9b6f287f 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCodeWithFreeMaker.java @@ -13,6 +13,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; @@ -455,6 +457,7 @@ public class GenerateCodeWithFreeMaker { Configuration cfg = new Configuration(new Version(2, 3, 33)); // 设置模板目录 String path = System.getProperty("user.dir") + "/dsUtils/src/main/resources"; + String codePath = System.getProperty("user.dir") + "/dsUtils/src/main/java/com/dsideal/Code"; cfg.setDirectoryForTemplateLoading(new File(path)); // 设置字符编码 cfg.setDefaultEncoding("UTF-8"); @@ -462,7 +465,7 @@ public class GenerateCodeWithFreeMaker { Template template = cfg.getTemplate("Controller.ftl"); // 渲染模板到文件 - Writer out = new FileWriter("c:/output_users.txt"); + Writer out = new FileWriter(codePath +"/"+ table + ".txt", StandardCharsets.UTF_8); template.process(dataModel, out); out.close(); } diff --git a/dsUtils/target/classes/users.ftl b/dsUtils/target/classes/users.ftl deleted file mode 100644 index 49aa3e03..00000000 --- a/dsUtils/target/classes/users.ftl +++ /dev/null @@ -1,7 +0,0 @@ -列表
-<#list users as user> -
  • ${user.name} - ${user.age}
    • - - -变量
    -${title} \ No newline at end of file diff --git a/output_users.html b/output_users.html deleted file mode 100644 index 3160b301..00000000 --- a/output_users.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - User List - - -

    User List

    - - - \ No newline at end of file