Parcourir la source

后处理消息

huangxingxing il y a 2 ans
Parent
commit
feda025820

+ 65 - 0
generated/com/miniframe/generate/comm/system/A_AFT001.java

@@ -61,4 +61,69 @@ public class A_AFT001 extends BaseMapModel implements Serializable {
 	public String getParamJson() {
 		return this.paramJson;
 	}
+	String step;//步数
+	/**
+	 *步数
+	 */
+	public void setStep(String step) {
+		this.step=step;
+	}
+	/**
+	 *步数
+	 */
+	public String getStep() {
+		return this.step;
+	}
+	String scalarName;//标量
+	/**
+	 *标量
+	 */
+	public void setScalarName(String scalarName) {
+		this.scalarName=scalarName;
+	}
+	/**
+	 *标量
+	 */
+	public String getScalarName() {
+		return this.scalarName;
+	}
+	String level;//色条数量
+	/**
+	 *色条数量
+	 */
+	public void setLevel(String level) {
+		this.level=level;
+	}
+	/**
+	 *色条数量
+	 */
+	public String getLevel() {
+		return this.level;
+	}
+	String range0;//最小值
+	/**
+	 *最小值
+	 */
+	public void setRange0(String range0) {
+		this.range0=range0;
+	}
+	/**
+	 *最小值
+	 */
+	public String getRange0() {
+		return this.range0;
+	}
+	String range1;//最大值
+	/**
+	 *最大值
+	 */
+	public void setRange1(String range1) {
+		this.range1=range1;
+	}
+	/**
+	 *最大值
+	 */
+	public String getRange1() {
+		return this.range1;
+	}
 }

+ 0 - 26
generated/com/miniframe/generate/comm/system/A_AFT002.java

@@ -35,30 +35,4 @@ public class A_AFT002 extends BaseMapModel implements Serializable {
 	public String getSolverConfigId() {
 		return this.solverConfigId;
 	}
-	String action;//操作
-	/**
-	 *操作
-	 */
-	public void setAction(String action) {
-		this.action=action;
-	}
-	/**
-	 *操作
-	 */
-	public String getAction() {
-		return this.action;
-	}
-	String paramJson;//操作参数
-	/**
-	 *操作参数
-	 */
-	public void setParamJson(String paramJson) {
-		this.paramJson=paramJson;
-	}
-	/**
-	 *操作参数
-	 */
-	public String getParamJson() {
-		return this.paramJson;
-	}
 }

+ 65 - 0
generated/validateform/a_aft001Form.xml

@@ -43,6 +43,71 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="step" depends="minlength,maxlength">
+    <arg0 key="a_aft001.step"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
+<field property="scalarName" depends="minlength,maxlength">
+    <arg0 key="a_aft001.scalarName"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
+<field property="level" depends="minlength,maxlength">
+    <arg0 key="a_aft001.level"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
+<field property="range0" depends="minlength,maxlength">
+    <arg0 key="a_aft001.range0"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
+<field property="range1" depends="minlength,maxlength">
+    <arg0 key="a_aft001.range1"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

+ 0 - 26
generated/validateform/a_aft002Form.xml

@@ -17,32 +17,6 @@
       <var-value>1024</var-value>
     </var>
 </field>
-<field property="action" depends="minlength,maxlength">
-    <arg0 key="a_aft002.action"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>2048</var-value>
-    </var>
-</field>
-<field property="paramJson" depends="minlength,maxlength">
-    <arg0 key="a_aft002.paramJson"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
 </form>
 </formset>
 </form-validation>

+ 5 - 0
generated/validator/resources_a_aft001Form_validator.properties

@@ -2,4 +2,9 @@ a_aft001.pid = \u9879\u76EEID
 a_aft001.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
 a_aft001.action = \u64CD\u4F5C
 a_aft001.paramJson = \u64CD\u4F5C\u53C2\u6570
+a_aft001.step = \u6B65\u6570
+a_aft001.scalarName = \u6807\u91CF
+a_aft001.level = \u8272\u6761\u6570\u91CF
+a_aft001.range0 = \u6700\u5C0F\u503C
+a_aft001.range1 = \u6700\u5927\u503C
 a_aft001Form = true

+ 5 - 0
generated/validator/resources_a_aft001Form_validator_zh_CN.properties

@@ -2,4 +2,9 @@ a_aft001.pid = \u9879\u76EEID
 a_aft001.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
 a_aft001.action = \u64CD\u4F5C
 a_aft001.paramJson = \u64CD\u4F5C\u53C2\u6570
+a_aft001.step = \u6B65\u6570
+a_aft001.scalarName = \u6807\u91CF
+a_aft001.level = \u8272\u6761\u6570\u91CF
+a_aft001.range0 = \u6700\u5C0F\u503C
+a_aft001.range1 = \u6700\u5927\u503C
 a_aft001Form = true

+ 0 - 2
generated/validator/resources_a_aft002Form_validator.properties

@@ -1,5 +1,3 @@
 a_aft002.pid = \u9879\u76EEID
 a_aft002.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
-a_aft002.action = \u64CD\u4F5C
-a_aft002.paramJson = \u64CD\u4F5C\u53C2\u6570
 a_aft002Form = true

+ 0 - 2
generated/validator/resources_a_aft002Form_validator_zh_CN.properties

@@ -1,5 +1,3 @@
 a_aft002.pid = \u9879\u76EEID
 a_aft002.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
-a_aft002.action = \u64CD\u4F5C
-a_aft002.paramJson = \u64CD\u4F5C\u53C2\u6570
 a_aft002Form = true

+ 11 - 6
src/main/java/com/miniframe/bisiness/system/AFT001Service.java

@@ -34,6 +34,11 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 		String proId =getA_aft001().getPid();
 		String paramJson =getA_aft001().getParamJson();
 		String action =getA_aft001().getAction();
+        String step=getA_aft001().getStep();
+        String scalarName =getA_aft001().getScalarName();
+        String level =getA_aft001().getLevel();
+        String range0 =getA_aft001().getRange0();
+        String range1 =getA_aft001().getRange1();
 
 		AdiSolverConfigMapper configMapper = UtilTools.getBean(AdiSolverConfigMapper.class);
 		AdiSolverConfig config= configMapper.selectByPrimaryKey(solverConfigId);
@@ -101,15 +106,15 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 			msg.setParamJson(obj.toString());
 		}else if(action.equals("ContourDisplay")){
 			JSONObject obj  = new JSONObject();
-			obj.put("level",5);
-			obj.put("range","0.111,0.6");
-			obj.put("scalarName","r");
+			obj.put("level",level);
+			obj.put("range",range0+","+range1);
+			obj.put("scalarName",scalarName);
 			msg.setParamJson(obj.toString());
 		}else if(action.equals("LineDisplay")){
 			JSONObject obj  = new JSONObject();
-			obj.put("level",5);
-			obj.put("range","0.111,0.6");
-			obj.put("scalarName","r");
+            obj.put("level",level);
+            obj.put("range",range0+","+range1);
+            obj.put("scalarName",scalarName);
 			msg.setParamJson(obj.toString());
 		}
 		System.out.println(XiJsonUtil.objectToJson(msg));

+ 3 - 0
src/test/java/com/miniframe/MyTest.java

@@ -1,5 +1,6 @@
 package com.miniframe;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -9,8 +10,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.miniframe.aftercure.ActionMsg;
 import com.miniframe.constant.MFConstant;
 import com.miniframe.core.ext.UtilTools;
+import com.miniframe.tools.XiJsonUtil;
 import org.apache.commons.beanutils.Converter;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;

+ 5 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/AFT001_A(后处理消息操作消息发送).csv

@@ -3,3 +3,8 @@
 2,solverConfigId,求解配置Id,string,,,,,,,,,,,
 3,action,操作,string,,,,1,2048,,,,,,
 4,paramJson,操作参数,string,,,,1,128,,,,,,
+5,step,步数,string,,,,1,2048,,,,,,
+6,scalarName,标量,string,,,,1,2048,,,,,,
+7,level,色条数量,string,,,,1,2048,,,,,,
+8,range0,最小值,string,,,,1,2048,,,,,,
+9,range1,最大值,string,,,,1,2048,,,,,,

+ 0 - 2
系统设计/通信设计/通讯报文/system(系统服务)/报文体/AFT002_A(求解步数).csv

@@ -1,5 +1,3 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,pid,项目ID,string,,,,1,1024,,,,,,
 2,solverConfigId,求解配置Id,string,,,,,,,,,,,
-3,action,操作,string,,,,1,2048,,,,,,
-4,paramJson,操作参数,string,,,,1,128,,,,,,