huangxingxing 1 éve
szülő
commit
ed13a6a881

+ 5 - 5
generated/com/miniframe/generate/comm/system/A_D00005.java

@@ -22,17 +22,17 @@ public class A_D00005 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
-	String sType;//灾情类型
+	String stype;//灾情类型
 	/**
 	 *灾情类型
 	 */
-	public void setSType(String sType) {
-		this.sType=sType;
+	public void setStype(String stype) {
+		this.stype=stype;
 	}
 	/**
 	 *灾情类型
 	 */
-	public String getSType() {
-		return this.sType;
+	public String getStype() {
+		return this.stype;
 	}
 }

+ 5 - 5
generated/com/miniframe/generate/comm/system/D_D00005_ROWS_RECODE.java

@@ -48,18 +48,18 @@ public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getPid() {
 		return this.pid;
 	}
-	String sType;//灾情类型
+	String stype;//灾情类型
 	/**
 	 *灾情类型
 	 */
-	public void setSType(String sType) {
-		this.sType=sType;
+	public void setStype(String stype) {
+		this.stype=stype;
 	}
 	/**
 	 *灾情类型
 	 */
-	public String getSType() {
-		return this.sType;
+	public String getStype() {
+		return this.stype;
 	}
 	int aid;//事故id
 	/**

+ 2 - 2
generated/validateform/a_d00005Form.xml

@@ -7,8 +7,8 @@
 <field property="aid" depends="required">
     <arg0 key="a_d00005.aid"/>
 </field>
-<field property="sType" depends="required">
-    <arg0 key="a_d00005.sType"/>
+<field property="stype" depends="required">
+    <arg0 key="a_d00005.stype"/>
 </field>
 </form>
 </formset>

+ 1 - 1
generated/validator/resources_a_d00005Form_validator.properties

@@ -1,3 +1,3 @@
 a_d00005.aid = \u4E8B\u6545id
-a_d00005.sType = \u707E\u60C5\u7C7B\u578B
+a_d00005.stype = \u707E\u60C5\u7C7B\u578B
 a_d00005Form = true

+ 1 - 1
generated/validator/resources_a_d00005Form_validator_zh_CN.properties

@@ -1,3 +1,3 @@
 a_d00005.aid = \u4E8B\u6545id
-a_d00005.sType = \u707E\u60C5\u7C7B\u578B
+a_d00005.stype = \u707E\u60C5\u7C7B\u578B
 a_d00005Form = true

+ 1 - 1
generated/validator/resources_d_d00005_rows_recodeForm_validator.properties

@@ -1,7 +1,7 @@
 d_d00005_rows_recode.sid = \u707E\u60C5\u6E90id
 d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
-d_d00005_rows_recode.sType = \u707E\u60C5\u7C7B\u578B
+d_d00005_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

+ 1 - 1
generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties

@@ -1,7 +1,7 @@
 d_d00005_rows_recode.sid = \u707E\u60C5\u6E90id
 d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
-d_d00005_rows_recode.sType = \u707E\u60C5\u7C7B\u578B
+d_d00005_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

+ 1 - 1
modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Mon Jan 15 16:08:00 CST 2024.
+    This file was generated on Tue Jan 16 09:55:23 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 7 - 0
pom.xml

@@ -274,6 +274,13 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
 
+        <!--添加FreeMarker的依赖 ,版本是 2.3.29-->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.29</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

+ 2 - 2
src/main/java/com/miniframe/bisiness/system/D00005Service.java

@@ -26,7 +26,7 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
  	 */
 	public void transExecute() throws Exception {
 		Integer aid = this.getA_d00005().getAid();
-		String  sType = this.getA_d00005().getSType();
+		String  sType = this.getA_d00005().getStype();
 		DSourceMapper dsm = UtilTools.getBean(DSourceMapper.class);
 		DSourceSQLBuilder sb =new DSourceSQLBuilder();
 		DSourceSQLBuilder.Criteria sc=sb.createCriteria();
@@ -40,7 +40,7 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
 			row.setAid(ds.getAid());
 			row.setPid(ds.getPid());
 			row.setPname(ds.getPname());
-			row.setSType(ds.getsType());
+			row.setStype(ds.getsType());
 			row.setSite(CommonUtils.floatTodobule(ds.getSite()));
 			rows.add(row);
 		}

+ 31 - 0
src/main/java/com/miniframe/tools/TemplateGenerator.java

@@ -0,0 +1,31 @@
+package com.miniframe.tools;
+import freemarker.template.*;
+
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TemplateGenerator {
+    public static void main(String[] args) throws Exception {
+        // 创建配置对象
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+
+        // 获取模板对象
+        Template template = cfg.getTemplate("example.ftl");
+
+        // 定义数据模型(Map)
+        Map<String, Object> dataModel = new HashMap<>();
+        dataModel.put("name", "John Doe");
+        dataModel.put("age", 25);
+
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+
+        // 输出结果到控制台或保存为文件
+        System.out.println(writer.toString());
+    }
+}

+ 1 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00005_A(灾情点源数据查询).csv

@@ -1,3 +1,3 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,aid,事故id,int,,,是,,,,,,,,
-2,sType,灾情类型,string,,,是,,,,,,,,
+2,stype,灾情类型,string,,,是,,,,,,,,

+ 1 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00005_D(灾情点源数据查询).csv

@@ -3,6 +3,6 @@
 2.1,sid,灾情源id,int,,,,,,,,,,,
 2.2,pname,管道名称,string,,,,1,2048,,,,,,
 2.3,pid,管道编号,int,,,,,,,,,,,
-2.4,sType,灾情类型,string,,,,,,,,,,,
+2.4,stype,灾情类型,string,,,,,,,,,,,
 2.5,aid,事故id,int,,,,,,,,,,,
 2.6,site,位置,double,,,,,,,,,,,