Browse Source

结果数据获取

huangxingxing 1 day ago
parent
commit
0a42840d86
24 changed files with 564 additions and 1 deletions
  1. 2 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/ac/model/AC00010BaseModel.java
  3. 38 0
      generated/com/miniframe/generate/comm/ac/A_AC00010.java
  4. 26 0
      generated/com/miniframe/generate/comm/ac/D_AC00010.java
  5. 38 0
      generated/com/miniframe/generate/comm/ac/D_AC00010_RANKEYS_KEYS_RECODE.java
  6. 39 0
      generated/com/miniframe/generate/comm/ac/D_AC00010_RANKEYS_RECODE.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpesapater/AC00010Client.java
  8. 15 0
      generated/validateform/a_ac00010Form.xml
  9. 3 0
      generated/validator/resources_a_ac00010Form_validator.properties
  10. 3 0
      generated/validator/resources_a_ac00010Form_validator_zh_CN.properties
  11. 1 0
      generated/validator/resources_d_ac00010Form_validator.properties
  12. 1 0
      generated/validator/resources_d_ac00010Form_validator_zh_CN.properties
  13. 3 0
      generated/validator/resources_d_ac00010_rankeys_keys_recodeForm_validator.properties
  14. 3 0
      generated/validator/resources_d_ac00010_rankeys_keys_recodeForm_validator_zh_CN.properties
  15. 2 0
      generated/validator/resources_d_ac00010_rankeys_recodeForm_validator.properties
  16. 2 0
      generated/validator/resources_d_ac00010_rankeys_recodeForm_validator_zh_CN.properties
  17. 10 0
      src/main/java/ac/template/model/gui/ProResultVo.java
  18. 104 0
      src/main/java/com/miniframe/bisiness/ac/AC00010Service.java
  19. 5 0
      src/main/java/com/miniframe/mappers/ac/dao/ExtAcMapper.java
  20. 4 1
      src/test/java/com/miniframe/AcTest.java
  21. 44 0
      src/test/java/com/miniframe/comm/httpesapater/AC00010Test.java
  22. 1 0
      系统设计/系统模块/ac(气动设计系统).csv
  23. 3 0
      系统设计/通信设计/通讯报文/ac(气动设计)/报文体/AC00010_A(结果曲线查询).csv
  24. 6 0
      系统设计/通信设计/通讯报文/ac(气动设计)/报文体/AC00010_D(结果曲线查询).csv

+ 2 - 0
dbscript/init/generate/03-functionInit.sql

@@ -10,7 +10,9 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('AC
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('AC00007', '气动设计系统','项目属性删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('AC00008', '气动设计系统','日志获取',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('AC00009', '气动设计系统','项目属性大对象查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('AC00010', '气动设计系统','结果曲线查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('BES001', '气动设计系统','基础字典查询',true);
+-- 飞机系统
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00001', '基础系统','获取短信验证码',true);

+ 112 - 0
generated/com/miniframe/generate/business/ac/model/AC00010BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.ac.model;
+
+import java.util.Map;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import com.miniframe.core.BaseMapModel;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.core.ext.HttpMapFormater;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import com.miniframe.generate.global.AppGlobalVariableSysconfig;
+
+import com.miniframe.generate.comm.ac.A_ACHEAD;
+import com.miniframe.generate.comm.ac.D_ACHEAD;
+import com.miniframe.generate.comm.ac.A_AC00010;
+import com.miniframe.generate.comm.ac.D_AC00010;
+
+/**
+ * 气动设计,“结果曲线查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class AC00010BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ACHEAD a_achead;//上行头
+	D_ACHEAD d_achead;//下行头
+	A_AC00010 a_ac00010;//上行体
+	D_AC00010 d_ac00010;//下行体
+
+	public AC00010BaseModel(){
+		a_achead=new A_ACHEAD();
+		d_achead=new D_ACHEAD();
+		a_ac00010=new A_AC00010();
+		d_ac00010=new D_AC00010();
+	}
+
+	public void validater() throws Exception {
+		this.a_achead.validater();
+		this.a_ac00010.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_ACHEAD.class);
+		this.a_achead = UtilTools.map2Obj(headMap, A_ACHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_AC00010.class);
+		this.a_ac00010 = UtilTools.map2Obj(bodyMap, A_AC00010.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_achead).getTransCode())){
+			(this.d_achead).setTransCode((this.a_achead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_achead).getChannelNo())){
+			(this.d_achead).setChannelNo((this.a_achead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_achead).getUserId())){
+			(this.d_achead).setUserId((this.a_achead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_achead).getTransTime())){
+            (this.d_achead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_achead));
+		reMap.putAll(UtilTools.obj2Map(this.d_ac00010));
+
+		return reMap;
+	}
+
+	public A_ACHEAD getA_achead() {
+		return this.a_achead;
+	}
+
+	public void setA_achead(A_ACHEAD a_achead) {
+		this.a_achead=a_achead;
+	}
+
+	public D_ACHEAD getD_achead() {
+		return d_achead;
+	}
+
+	public void setD_achead(D_ACHEAD d_achead) {
+		this.d_achead=d_achead;
+	}
+
+	public A_AC00010 getA_ac00010() {
+		return a_ac00010;
+	}
+
+	public void setA_ac00010(A_AC00010 a_ac00010) {
+		this.a_ac00010=a_ac00010;
+	}
+
+	public D_AC00010 getD_ac00010() {
+		return this.d_ac00010;
+	}
+
+	public void setD_ac00010(D_AC00010 d_ac00010) {
+		this.d_ac00010=d_ac00010;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 38 - 0
generated/com/miniframe/generate/comm/ac/A_AC00010.java

@@ -0,0 +1,38 @@
+/**
+ * 气动设计
+ */
+package com.miniframe.generate.comm.ac;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 结果曲线查询
+ */
+public class A_AC00010 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pid;//项目id
+	/**
+	 *项目id
+	 */
+	public void setPid(String pid) {
+		this.pid=pid;
+	}
+	/**
+	 *项目id
+	 */
+	public String getPid() {
+		return this.pid;
+	}
+	int type;//类型0气动1结构2气弹
+	/**
+	 *类型0气动1结构2气弹
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *类型0气动1结构2气弹
+	 */
+	public int getType() {
+		return this.type;
+	}
+}

+ 26 - 0
generated/com/miniframe/generate/comm/ac/D_AC00010.java

@@ -0,0 +1,26 @@
+/**
+ * 气动设计
+ */
+package com.miniframe.generate.comm.ac;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 结果曲线查询
+ */
+public class D_AC00010 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_AC00010_RANKEYS_RECODE> rankeys;//类型1列表
+	/**
+	 *类型1列表
+	 */
+	public void setRankeys(List <D_AC00010_RANKEYS_RECODE> rankeys) {
+		this.rankeys=rankeys;
+	}
+	/**
+	 *类型1列表
+	 */
+	public List <D_AC00010_RANKEYS_RECODE> getRankeys() {
+		return this.rankeys;
+	}
+}

+ 38 - 0
generated/com/miniframe/generate/comm/ac/D_AC00010_RANKEYS_KEYS_RECODE.java

@@ -0,0 +1,38 @@
+/**
+ * 气动设计
+ */
+package com.miniframe.generate.comm.ac;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 结果曲线查询->类型1列表->参数类型列表
+ */
+public class D_AC00010_RANKEYS_KEYS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String key;//参数类型
+	/**
+	 *参数类型
+	 */
+	public void setKey(String key) {
+		this.key=key;
+	}
+	/**
+	 *参数类型
+	 */
+	public String getKey() {
+		return this.key;
+	}
+	String svJson;//数据库Josn
+	/**
+	 *数据库Josn
+	 */
+	public void setSvJson(String svJson) {
+		this.svJson=svJson;
+	}
+	/**
+	 *数据库Josn
+	 */
+	public String getSvJson() {
+		return this.svJson;
+	}
+}

+ 39 - 0
generated/com/miniframe/generate/comm/ac/D_AC00010_RANKEYS_RECODE.java

@@ -0,0 +1,39 @@
+/**
+ * 气动设计
+ */
+package com.miniframe.generate.comm.ac;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 结果曲线查询->类型1列表
+ */
+public class D_AC00010_RANKEYS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String rankey;//类型1
+	/**
+	 *类型1
+	 */
+	public void setRankey(String rankey) {
+		this.rankey=rankey;
+	}
+	/**
+	 *类型1
+	 */
+	public String getRankey() {
+		return this.rankey;
+	}
+	List <D_AC00010_RANKEYS_KEYS_RECODE> keys;//参数类型列表
+	/**
+	 *参数类型列表
+	 */
+	public void setKeys(List <D_AC00010_RANKEYS_KEYS_RECODE> keys) {
+		this.keys=keys;
+	}
+	/**
+	 *参数类型列表
+	 */
+	public List <D_AC00010_RANKEYS_KEYS_RECODE> getKeys() {
+		return this.keys;
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/AC00010Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpesapater;
+
+import com.miniframe.spring.httpclient.MFHttpRespInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.miniframe.core.Transmitter;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.comm.ac.D_AC00010;
+import com.miniframe.generate.comm.ac.D_ACHEAD;
+
+import com.miniframe.generate.business.ac.model.AC00010BaseModel;
+
+public class AC00010Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(AC00010Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [气动设计->结果曲线查询((AC00010)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public AC00010BaseModel execute(AC00010BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public AC00010BaseModel execute(AC00010BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(AC00010BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(AC00010BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_achead().getTransCode())){
+			model.getA_achead().setTransCode("AC00010");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_achead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_ac00010()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpesApater = (Transmitter) UtilTools.getBean("httpesApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpesApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpesApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_ACHEAD d_achead =  UtilTools.map2Obj(outMap, D_ACHEAD.class);
+			D_AC00010 d_ac00010 =  UtilTools.map2Obj(outMap, D_AC00010.class);
+			model.setD_achead(d_achead);
+			model.setD_ac00010(d_ac00010);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(AC00010BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public AC00010BaseModel execute(AC00010BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 15 - 0
generated/validateform/a_ac00010Form.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 结果曲线查询Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="a_ac00010Form">
+<field property="pid" depends="required">
+    <arg0 key="a_ac00010.pid"/>
+</field>
+<field property="type" depends="required">
+    <arg0 key="a_ac00010.type"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 3 - 0
generated/validator/resources_a_ac00010Form_validator.properties

@@ -0,0 +1,3 @@
+a_ac00010.pid = \u9879\u76EEid
+a_ac00010.type = \u7C7B\u578B0\u6C14\u52A81\u7ED3\u67842\u6C14\u5F39
+a_ac00010Form = true

+ 3 - 0
generated/validator/resources_a_ac00010Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_ac00010.pid = \u9879\u76EEid
+a_ac00010.type = \u7C7B\u578B0\u6C14\u52A81\u7ED3\u67842\u6C14\u5F39
+a_ac00010Form = true

+ 1 - 0
generated/validator/resources_d_ac00010Form_validator.properties

@@ -0,0 +1 @@
+d_ac00010Form = false

+ 1 - 0
generated/validator/resources_d_ac00010Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_ac00010Form = false

+ 3 - 0
generated/validator/resources_d_ac00010_rankeys_keys_recodeForm_validator.properties

@@ -0,0 +1,3 @@
+d_ac00010_rankeys_keys_recode.key = \u53C2\u6570\u7C7B\u578B
+d_ac00010_rankeys_keys_recode.svJson = \u6570\u636E\u5E93Josn
+d_ac00010_rankeys_keys_recodeForm = true

+ 3 - 0
generated/validator/resources_d_ac00010_rankeys_keys_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+d_ac00010_rankeys_keys_recode.key = \u53C2\u6570\u7C7B\u578B
+d_ac00010_rankeys_keys_recode.svJson = \u6570\u636E\u5E93Josn
+d_ac00010_rankeys_keys_recodeForm = true

+ 2 - 0
generated/validator/resources_d_ac00010_rankeys_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_ac00010_rankeys_recode.rankey = \u7C7B\u578B1
+d_ac00010_rankeys_recodeForm = true

+ 2 - 0
generated/validator/resources_d_ac00010_rankeys_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_ac00010_rankeys_recode.rankey = \u7C7B\u578B1
+d_ac00010_rankeys_recodeForm = true

+ 10 - 0
src/main/java/ac/template/model/gui/ProResultVo.java

@@ -0,0 +1,10 @@
+package ac.template.model.gui;
+
+import lombok.Data;
+
+@Data
+public class ProResultVo {
+   private String key ;
+   private Integer step ;
+   private Double value;
+}

+ 104 - 0
src/main/java/com/miniframe/bisiness/ac/AC00010Service.java

@@ -0,0 +1,104 @@
+package com.miniframe.bisiness.ac;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import ac.template.model.gui.ProResultVo;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.ac.model.AC00010BaseModel;
+import com.miniframe.generate.comm.ac.D_AC00010_RANKEYS_KEYS_RECODE;
+import com.miniframe.generate.comm.ac.D_AC00010_RANKEYS_RECODE;
+import com.miniframe.mappers.ac.dao.ExtAcMapper;
+import com.miniframe.model.ac.AcProResult;
+import com.miniframe.model.ac.AcProResultSQLBuilder;
+import com.miniframe.model.ac.dao.AcProResultMapper;
+import com.miniframe.tools.XiJsonUtil;
+
+/**
+ * 气动设计系统,“结果曲线查询”逻辑处理(重新生成不覆盖)。
+ */
+public class AC00010Service extends AC00010BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 气动设计系统,“结果曲线查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String pid = this.getA_ac00010().getPid();
+		Integer type =this.getA_ac00010().getType();
+		ExtAcMapper acdao = UtilTools.getBean(ExtAcMapper.class);
+		List<String> ranktypes = acdao.getProResultRankTypes(pid,type);
+		List<D_AC00010_RANKEYS_RECODE> rows = new ArrayList<>();
+		for (String ranktype:ranktypes) {
+			D_AC00010_RANKEYS_RECODE row = new D_AC00010_RANKEYS_RECODE();
+			row.setRankey(ranktype);
+			List<String> keys = acdao.getProResultKeys(pid,type,ranktype);
+			List <D_AC00010_RANKEYS_KEYS_RECODE> dkeys =new ArrayList<>();
+			for (String key :keys) {
+				D_AC00010_RANKEYS_KEYS_RECODE dkey =new D_AC00010_RANKEYS_KEYS_RECODE();
+				List<ProResultVo> vos = getProResultVos(pid, type, ranktype, key);
+				dkey.setKey(key);
+				dkey.setSvJson(XiJsonUtil.objectToJson(vos));
+				dkeys.add(dkey);
+			}
+			row.setKeys(dkeys);
+			rows.add(row);
+		}
+		this.getD_ac00010().setRankeys(rows);
+	}
+
+	private List<ProResultVo> getProResultVos(String pid, Integer type, String ranktype, String key) {
+		AcProResultMapper acrdao = UtilTools.getBean(AcProResultMapper.class);
+		AcProResultSQLBuilder acrsb = new AcProResultSQLBuilder();
+		AcProResultSQLBuilder.Criteria acrsc = acrsb.createCriteria();
+		acrsc.andPidEqualTo(pid);
+		acrsc.andRankTypeEqualTo(ranktype);
+		acrsc.andAstTypeEqualTo(type);
+		acrsc.andKeyEqualTo(key);
+		acrsb.setOrderByClause("step asc");
+		List<AcProResult> prs = acrdao.selectByExample(acrsb);
+		List<ProResultVo> vos = new ArrayList<>();
+		for (AcProResult pr:prs ) {
+			String[] vls = pr.getValue().split(",");
+			for (int i = 0; i < vls.length; i++) {
+				ProResultVo vo = new ProResultVo();
+				vo.setKey(key +i);
+				vo.setStep(pr.getStep());
+				vo.setValue(Double.valueOf(vls[i].trim()));
+				vos.add(vo);
+			}
+		}
+		return vos;
+	}
+
+	/**
+	 * 气动设计系统,“结果曲线查询”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 气动设计系统,“结果曲线查询”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 气动设计系统,“结果曲线查询”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

+ 5 - 0
src/main/java/com/miniframe/mappers/ac/dao/ExtAcMapper.java

@@ -21,4 +21,9 @@ public interface ExtAcMapper extends MiniserviceBaseDao {
             " LEFT JOIN  ac_pro_att pa on pa.att_id = att.att_id and pa.pid =#{pid} " +
             " where ast.ast_id=att.ast_id and ast.type =#{astType}  ORDER BY fat_id ,ser;")
     List<ProAttVo> getProAttList(String pid, Integer astType);
+
+    @Select("SELECT DISTINCT rank_type FROM ac_pro_result where pid =#{pid} and ast_type =#{astType}")
+    List<String> getProResultRankTypes(String pid, Integer astType);
+    @Select("SELECT DISTINCT Key FROM ac_pro_result where pid =#{pid} and ast_type =#{astType} and rank_type =#{rankType}")
+    List<String> getProResultKeys(String pid, Integer astType,String rankType);
 }

+ 4 - 1
src/test/java/com/miniframe/AcTest.java

@@ -26,7 +26,10 @@ public class AcTest {
     }
 
     public static void main(String[] args) throws IOException {
-        readLog("t",1);
+//        readLog("t",1);
+        String s = "0.1, 1.3, 2.4,";
+        String[] tr  =s.split(",");
+        System.out.println(tr);
     }
 
     public static void readLog(String pid ,Integer type) throws IOException {

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/AC00010Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpesapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpesapater.HttpesapaterUtil;
+import com.miniframe.generate.comm.ac.A_AC00010;
+import com.miniframe.generate.comm.httpesapater.AC00010Client;
+import com.miniframe.generate.business.ac.model.AC00010BaseModel;
+
+public class AC00010Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(AC00010Test.class);
+
+	/**
+	 * 结果曲线查询,获取报文体
+	 * @return
+	 */
+	public static A_AC00010 getA_ac00010() {
+		A_AC00010 a_ac00010 = new A_AC00010();
+
+		// ----------以下增加【结果曲线查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_ac00010;
+	}
+	
+	/**
+	 * 运行客户端测试,结果曲线查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		AC00010BaseModel model = new AC00010BaseModel();
+		model.setA_achead(HttpesapaterUtil.getA_achead("AC00010"));
+		model.setA_ac00010(AC00010Test.getA_ac00010());
+		AC00010Client client = new AC00010Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 1 - 0
系统设计/系统模块/ac(气动设计系统).csv

@@ -8,4 +8,5 @@
 100007,AC00007,项目属性删除,service,
 100008,AC00008,日志获取,service,
 100009,AC00009,项目属性大对象查询,service,
+100010,AC00010,结果曲线查询,service,
 110001,BES001,基础字典查询,service,

+ 3 - 0
系统设计/通信设计/通讯报文/ac(气动设计)/报文体/AC00010_A(结果曲线查询).csv

@@ -0,0 +1,3 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,pid,项目id,string,,,是,,,,,,,,
+2,type,类型0气动1结构2气弹,int,,,是,,,,,,,,

+ 6 - 0
系统设计/通信设计/通讯报文/ac(气动设计)/报文体/AC00010_D(结果曲线查询).csv

@@ -0,0 +1,6 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,rankeys,类型1列表,list,,,,0,,,,,,,
+1.1,rankey,类型1,string,,,,,,,,,,,
+1.2,keys,参数类型列表,list,,,,0,,,,,,,
+1.2.1,key,参数类型,string,,,,,,,,,,,
+1.2.2,svJson,数据库Josn,string,,,,,,,,,,,