检测点数据获取

generated/com/miniframe/generate/comm/system/D_D10016.java

@@ -4,9 +4,36 @@
 package com.miniframe.generate.comm.system;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
+import java.util.*;
 /**
  * 监测点结果文件获取
  */
 public class D_D10016 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_D10016_COCODES_RECODE> cocodes;//数据
+	/**
+	 *数据
+	 */
+	public void setCocodes(List <D_D10016_COCODES_RECODE> cocodes) {
+		this.cocodes=cocodes;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10016_COCODES_RECODE> getCocodes() {
+		return this.cocodes;
+	}
+	List <D_D10016_CHVALS_RECODE> chvals;//数据
+	/**
+	 *数据
+	 */
+	public void setChvals(List <D_D10016_CHVALS_RECODE> chvals) {
+		this.chvals=chvals;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10016_CHVALS_RECODE> getChvals() {
+		return this.chvals;
+	}
 }

generated/com/miniframe/generate/comm/system/D_D10016_CHNAMES_RECODE.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果文件获取->数据
+ */
+public class D_D10016_CHNAMES_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String chname1;//监测点名称1
+	/**
+	 *监测点名称1
+	 */
+	public void setChname1(String chname1) {
+		this.chname1=chname1;
+	}
+	/**
+	 *监测点名称1
+	 */
+	public String getChname1() {
+		return this.chname1;
+	}
+}

generated/com/miniframe/generate/comm/system/D_D10016_CHVALS_RECODE.java

@@ -0,0 +1,103 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果文件获取->数据
+ */
+public class D_D10016_CHVALS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String chcode;//监测点编号
+	/**
+	 *监测点编号
+	 */
+	public void setChcode(String chcode) {
+		this.chcode=chcode;
+	}
+	/**
+	 *监测点编号
+	 */
+	public String getChcode() {
+		return this.chcode;
+	}
+	String v1;//v1
+	/**
+	 *v1
+	 */
+	public void setV1(String v1) {
+		this.v1=v1;
+	}
+	/**
+	 *v1
+	 */
+	public String getV1() {
+		return this.v1;
+	}
+	String v2;//v2
+	/**
+	 *v2
+	 */
+	public void setV2(String v2) {
+		this.v2=v2;
+	}
+	/**
+	 *v2
+	 */
+	public String getV2() {
+		return this.v2;
+	}
+	String v3;//v3
+	/**
+	 *v3
+	 */
+	public void setV3(String v3) {
+		this.v3=v3;
+	}
+	/**
+	 *v3
+	 */
+	public String getV3() {
+		return this.v3;
+	}
+	String v4;//v4
+	/**
+	 *v4
+	 */
+	public void setV4(String v4) {
+		this.v4=v4;
+	}
+	/**
+	 *v4
+	 */
+	public String getV4() {
+		return this.v4;
+	}
+	String v5;//v5
+	/**
+	 *v5
+	 */
+	public void setV5(String v5) {
+		this.v5=v5;
+	}
+	/**
+	 *v5
+	 */
+	public String getV5() {
+		return this.v5;
+	}
+	String v6;//v6
+	/**
+	 *v6
+	 */
+	public void setV6(String v6) {
+		this.v6=v6;
+	}
+	/**
+	 *v6
+	 */
+	public String getV6() {
+		return this.v6;
+	}
+}

generated/com/miniframe/generate/comm/system/D_D10016_COCODES_RECODE.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果文件获取->数据
+ */
+public class D_D10016_COCODES_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String cocode;//物理量编号
+	/**
+	 *物理量编号
+	 */
+	public void setCocode(String cocode) {
+		this.cocode=cocode;
+	}
+	/**
+	 *物理量编号
+	 */
+	public String getCocode() {
+		return this.cocode;
+	}
+}

generated/validator/resources_d_d10016_chnames_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_d10016_chnames_recode.chname1 = \u76D1\u6D4B\u70B9\u540D\u79F01
+d_d10016_chnames_recodeForm = true

generated/validator/resources_d_d10016_chnames_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10016_chnames_recode.chname1 = \u76D1\u6D4B\u70B9\u540D\u79F01
+d_d10016_chnames_recodeForm = true

generated/validator/resources_d_d10016_chvals_recodeForm_validator.properties

@@ -0,0 +1,8 @@
+d_d10016_chvals_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+d_d10016_chvals_recode.v1 = v1
+d_d10016_chvals_recode.v2 = v2
+d_d10016_chvals_recode.v3 = v3
+d_d10016_chvals_recode.v4 = v4
+d_d10016_chvals_recode.v5 = v5
+d_d10016_chvals_recode.v6 = v6
+d_d10016_chvals_recodeForm = true

generated/validator/resources_d_d10016_chvals_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,8 @@
+d_d10016_chvals_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+d_d10016_chvals_recode.v1 = v1
+d_d10016_chvals_recode.v2 = v2
+d_d10016_chvals_recode.v3 = v3
+d_d10016_chvals_recode.v4 = v4
+d_d10016_chvals_recode.v5 = v5
+d_d10016_chvals_recode.v6 = v6
+d_d10016_chvals_recodeForm = true

generated/validator/resources_d_d10016_cocodes_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_d10016_cocodes_recode.cocode = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10016_cocodes_recodeForm = true

generated/validator/resources_d_d10016_cocodes_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10016_cocodes_recode.cocode = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10016_cocodes_recodeForm = true

src/main/java/com/miniframe/bisiness/system/D10016Service.java

@@ -1,15 +1,22 @@
 package com.miniframe.bisiness.system;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10016BaseModel;
+import com.miniframe.generate.comm.system.D_D10016_CHVALS_RECODE;
+import com.miniframe.generate.comm.system.D_D10016_COCODES_RECODE;
 import com.miniframe.httpserver.HttpServerTransFile;
 import com.miniframe.model.system.DAccident;
 import com.miniframe.model.system.dao.DAccidentMapper;
 import com.miniframe.template.TemplateGenerator;
+import com.miniframe.tools.XIFileUtils;
 import com.miniframe.utils.MFMimeTypeUtils;
 
 /**
@@ -39,10 +46,41 @@ public class D10016Service extends D10016BaseModel implements ExecProcessFlow {
 			outPath=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out";
 			fileName ="monitorValue"+step;
 		}
-		Path path = Paths.get(outPath+"/"+fileName);
-		String mimeType = MFMimeTypeUtils.getMimeType(path);
-		HttpServerTransFile transFile = new HttpServerTransFile(fileName, mimeType, path);
-		UtilTools.setHttpServerTransFile(transFile);
+
+//		Path path = Paths.get(outPath+"/"+fileName);
+		FileReader fileReader = new FileReader(outPath+"/"+fileName);
+		BufferedReader reader = new BufferedReader(fileReader);
+		String line;
+		int linNum =1;
+		List<D_D10016_COCODES_RECODE> coodeList= new ArrayList<>();
+
+		List<D_D10016_CHVALS_RECODE> chvalsList= new ArrayList<>();
+		while ((line = reader.readLine()) != null) {
+			if(linNum==1){
+				String[] t = line.split(" ");
+				for (int i=1;i<t.length;i++) {
+					D_D10016_COCODES_RECODE cocode =new D_D10016_COCODES_RECODE();
+					cocode.setCocode(t[i]);
+					coodeList.add(cocode);
+				}
+			}else {
+				String[] t = line.split(" ");
+				D_D10016_CHVALS_RECODE chval=new D_D10016_CHVALS_RECODE();
+				chval.setV1(t.length>1?t[1]:"0");
+				chval.setV2(t.length>2?t[2]:"0");
+				chval.setV3(t.length>3?t[3]:"0");
+				chval.setV4(t.length>4?t[4]:"0");
+				chval.setV5(t.length>5?t[5]:"0");
+				chval.setV6(t.length>6?t[6]:"0");
+			}
+		}
+		this.getD_d10016().setChvals(chvalsList);
+		this.getD_d10016().setCocodes(coodeList);
+
+//		XIFileUtils.readFileAsString(outPath+"/"+fileName);
+//		String mimeType = MFMimeTypeUtils.getMimeType(path);
+//		HttpServerTransFile transFile = new HttpServerTransFile(fileName, mimeType, path);
+//		UtilTools.setHttpServerTransFile(transFile);
 	}
 	
 	/**

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10016_D(监测点结果文件获取).csv

@@ -1 +1,11 @@
-序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,cocodes,数据,list,,,,0,,,,,,,
+1.1,cocode,物理量编号,string,,,,,,,,,,,
+2,chvals,数据,list,,,,0,,,,,,,
+2.1,chcode,监测点编号,string,,,,,,,,,,,
+2.2,v1,v1,string,,,,,,,,,,,
+2.3,v2,v2,string,,,,,,,,,,,
+2.4,v3,v3,string,,,,,,,,,,,
+2.5,v4,v4,string,,,,,,,,,,,
+2.6,v5,v5,string,,,,,,,,,,,
+2.7,v6,v6,string,,,,,,,,,,,