huangxingxing vor 2 Jahren
Ursprung
Commit
0abe7edea1

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

@@ -321,4 +321,17 @@ public class A_AFT001 extends BaseMapModel implements Serializable {
 	public String getAnimationType() {
 		return this.animationType;
 	}
+	String hideZones;//隐藏的zone
+	/**
+	 *隐藏的zone
+	 */
+	public void setHideZones(String hideZones) {
+		this.hideZones=hideZones;
+	}
+	/**
+	 *隐藏的zone
+	 */
+	public String getHideZones() {
+		return this.hideZones;
+	}
 }

+ 13 - 0
generated/validateform/a_aft001Form.xml

@@ -303,6 +303,19 @@
       <var-value>2048</var-value>
     </var>
 </field>
+<field property="hideZones" depends="minlength,maxlength">
+    <arg0 key="a_aft001.hideZones"/>
+    <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>

+ 1 - 0
generated/validator/resources_a_aft001Form_validator.properties

@@ -22,4 +22,5 @@ a_aft001.x = x
 a_aft001.y = y
 a_aft001.z = z
 a_aft001.animationType = \u52A8\u753B\u6E32\u67D3\u7C7B\u578B
+a_aft001.hideZones = \u9690\u85CF\u7684zone
 a_aft001Form = true

+ 1 - 0
generated/validator/resources_a_aft001Form_validator_zh_CN.properties

@@ -22,4 +22,5 @@ a_aft001.x = x
 a_aft001.y = y
 a_aft001.z = z
 a_aft001.animationType = \u52A8\u753B\u6E32\u67D3\u7C7B\u578B
+a_aft001.hideZones = \u9690\u85CF\u7684zone
 a_aft001Form = true

+ 1 - 1
src/main/java/com/miniframe/bisiness/system/A00001Service.java

@@ -54,7 +54,7 @@ public class A00001Service extends A00001BaseModel implements ExecProcessFlow {
             sb.createCriteria().andUsermobnubEqualTo(this.getA_a00001().getMailOrPhone());
             userList = dao.selectByExample(sb);
             if (CollectionUtils.isEmpty(userList)) {
-                throw new BusinessException("EB8000029");
+//                throw new BusinessException("EB8000029");
             }
         }
         if(type.equals("1")) {//注册

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

@@ -307,6 +307,8 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 
 		}else if(action.equals("animation")){
 			JSONObject obj = new JSONObject();
+			String hideZones =this.getA_aft001().getHideZones();
+			obj.put("hideZones",hideZones);
 			animationTypePara(scalarName, level, range0, range1, obj);
 			if(solver.getSolverModel().equals("HCFDLab")) {
 				animationHcfdFile(proId, obj);
@@ -364,10 +366,12 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 		if(StringUtil.isNullOrEmpty(animationType)){
 			throw new BusinessException("4000018");
 		}else if(animationType.equals("ContourDisplay")){
+			obj.put("animationType","ContourDisplay");
 			obj.put("level", level);
 			obj.put("range", range0 +","+ range1);
 			obj.put("scalarName", scalarName);
 		}else if(animationType.equals("LineDisplay")){
+			obj.put("animationType","LineDisplay");
 			obj.put("level", level);
 			obj.put("range", range0 +","+ range1);
 			obj.put("scalarName", scalarName);
@@ -383,11 +387,13 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 			){
 				throw new BusinessException("EB4000013");
 			}
+			obj.put("animationType","VectorDisplay");
 			obj.put("scaleFactor",this.getA_aft001().getScaleFactor());
 			obj.put("dataU",this.getA_aft001().getDataU());
 			obj.put("dataV",this.getA_aft001().getDataV());
 			obj.put("dataW",this.getA_aft001().getDataW());
 		}else if(animationType.equals("SolidSurfaceDisplay")){
+			obj.put("animationType","SolidSurfaceDisplay");
 			String r =this.getA_aft001().getR();
 			String g =this.getA_aft001().getG();
 			String b =this.getA_aft001().getB();

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

@@ -22,4 +22,5 @@
 21,x,x,string,,,,1,2048,,,,,,
 22,y,y,string,,,,1,2048,,,,,,
 23,z,z,string,,,,1,2048,,,,,,
-24,animationType,动画渲染类型,string,,,,1,2048,,,,,,
+24,animationType,动画渲染类型,string,,,,1,2048,,,,,,
+25,hideZones,隐藏的zone,string,,,,1,2048,,,,,,