huangxingxing 2 年 前
コミット
6d9eee6b9e

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

@@ -61,4 +61,17 @@ public class A_AFT003 extends BaseMapModel implements Serializable {
 	public String getStep() {
 		return this.step;
 	}
+	String isVolume;//物面流场1物面2流场
+	/**
+	 *物面流场1物面2流场
+	 */
+	public void setIsVolume(String isVolume) {
+		this.isVolume=isVolume;
+	}
+	/**
+	 *物面流场1物面2流场
+	 */
+	public String getIsVolume() {
+		return this.isVolume;
+	}
 }

+ 13 - 0
generated/validateform/a_aft003Form.xml

@@ -26,6 +26,19 @@
 <field property="step" depends="required">
     <arg0 key="a_aft003.step"/>
 </field>
+<field property="isVolume" depends="minlength,maxlength">
+    <arg0 key="a_aft003.isVolume"/>
+    <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_aft003Form_validator.properties

@@ -2,4 +2,5 @@ a_aft003.pid = \u9879\u76EEID
 a_aft003.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
 a_aft003.animationType = \u6E32\u67D3\u7C7B\u578B
 a_aft003.step = \u6B65\u6570
+a_aft003.isVolume = \u7269\u9762\u6D41\u573A1\u7269\u97622\u6D41\u573A
 a_aft003Form = true

+ 1 - 0
generated/validator/resources_a_aft003Form_validator_zh_CN.properties

@@ -2,4 +2,5 @@ a_aft003.pid = \u9879\u76EEID
 a_aft003.solverConfigId = \u6C42\u89E3\u914D\u7F6EId
 a_aft003.animationType = \u6E32\u67D3\u7C7B\u578B
 a_aft003.step = \u6B65\u6570
+a_aft003.isVolume = \u7269\u9762\u6D41\u573A1\u7269\u97622\u6D41\u573A
 a_aft003Form = true

+ 24 - 0
modelsrc/com/miniframe/model/system/AdiSolverConfigImg.java

@@ -51,6 +51,12 @@ public class AdiSolverConfigImg extends MiniserviceBaseModel implements Serializ
 
     private String animationtype;
 
+    /**
+     * 物面0 流场1
+     */
+    @Column(name = "isVolume")
+    private String isvolume;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -220,4 +226,22 @@ public class AdiSolverConfigImg extends MiniserviceBaseModel implements Serializ
     public void setAnimationtype(String animationtype) {
         this.animationtype = animationtype == null ? null : animationtype.trim();
     }
+
+    /**
+     * 获取物面0 流场1
+     *
+     * @return isVolume - 物面0 流场1
+     */
+    public String getIsvolume() {
+        return isvolume;
+    }
+
+    /**
+     * 设置物面0 流场1
+     *
+     * @param isvolume 物面0 流场1
+     */
+    public void setIsvolume(String isvolume) {
+        this.isvolume = isvolume == null ? null : isvolume.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/AdiSolverConfigImgSQLBuilder.java

@@ -794,6 +794,76 @@ public class AdiSolverConfigImgSQLBuilder {
             addCriterion("animationtype not between", value1, value2, "animationtype");
             return (Criteria) this;
         }
+
+        public Criteria andIsvolumeIsNull() {
+            addCriterion("isVolume is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeIsNotNull() {
+            addCriterion("isVolume is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeEqualTo(String value) {
+            addCriterion("isVolume =", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeNotEqualTo(String value) {
+            addCriterion("isVolume <>", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeGreaterThan(String value) {
+            addCriterion("isVolume >", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeGreaterThanOrEqualTo(String value) {
+            addCriterion("isVolume >=", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeLessThan(String value) {
+            addCriterion("isVolume <", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeLessThanOrEqualTo(String value) {
+            addCriterion("isVolume <=", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeLike(String value) {
+            addCriterion("isVolume like", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeNotLike(String value) {
+            addCriterion("isVolume not like", value, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeIn(List<String> values) {
+            addCriterion("isVolume in", values, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeNotIn(List<String> values) {
+            addCriterion("isVolume not in", values, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeBetween(String value1, String value2) {
+            addCriterion("isVolume between", value1, value2, "isvolume");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsvolumeNotBetween(String value1, String value2) {
+            addCriterion("isVolume not between", value1, value2, "isvolume");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 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 Thu Jun 29 18:01:44 CST 2023.
+    This file was generated on Wed Jul 05 18:04:55 CST 2023.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 3 - 3
profiles/dev/application-dev.properties

@@ -125,11 +125,11 @@ spring.rabbitmq.virtual-host=/
 #spring.rabbitmq.listener.direct.acknowledge-mode=manual
 spring.rabbitmq.listener.simple.acknowledge-mode=manual
 #\u6D88\u8D39\u8005\u7EBF\u7A0B\u6570\u914D\u7F6E \u6D88\u8D39\u8005\u6700\u5C0F\u6570\u91CF Minimum number of listener invoker threads.
-spring.rabbitmq.listener.simple.concurrency=1
+spring.rabbitmq.listener.simple.concurrency=20
 #\u6D88\u8D39\u8005\u7EBF\u7A0B\u6570\u914D\u7F6E \u6D88\u8D39\u8005\u6700\u5927\u6570\u91CFMaximum number of listener invoker threads.
-spring.rabbitmq.listener.simple.max-concurrency=1
+spring.rabbitmq.listener.simple.max-concurrency=30
 #\u4E00\u6B21\u53EA\u53D6\u51E0\u4E2A
-spring.rabbitmq.listener.simple.prefetch=1
+spring.rabbitmq.listener.simple.prefetch=5
 
 #\u5F00\u542F\u91CD\u8BD5
 #spring.rabbitmq.listener.direct.retry.enabled=true

+ 9 - 0
src/main/java/com/miniframe/aftercure/ActionMsg.java

@@ -64,6 +64,15 @@ public class ActionMsg {
 
     private String fileNames;
     private String animationType;
+    private String isVolume;
+
+    public String getIsVolume() {
+        return isVolume;
+    }
+
+    public void setIsVolume(String isVolume) {
+        this.isVolume = isVolume;
+    }
 
     public String getAnimationType() {
         return animationType;

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

@@ -315,6 +315,11 @@ public class AFT001Service extends AFT001BaseModel implements ExecProcessFlow {
 			JSONObject obj = new JSONObject();
 			String hideZones =this.getA_aft001().getHideZones();
 			obj.put("hideZones",hideZones);
+			if(StringUtil.isNullOrEmpty(this.getA_aft001().getIsVolume())){
+				obj.put("isVolume","");
+			}else{
+				obj.put("isVolume",this.getA_aft001().getIsVolume());
+			}
 			animationTypePara(scalarName, level, range0, range1, obj);
 			if(solver.getSolverModel().equals("HCFDLab")) {
 				animationHcfdFile(proId, obj,msg);

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

@@ -10,6 +10,7 @@ import com.miniframe.model.system.AdiSolverConfigImg;
 import com.miniframe.model.system.AdiSolverConfigImgSQLBuilder;
 import com.miniframe.model.system.AdiSolverConfigSQLBuilder;
 import com.miniframe.model.system.dao.AdiSolverConfigImgMapper;
+import io.netty.util.internal.StringUtil;
 
 /**
  * 基础系统,“获取每步图片”逻辑处理(重新生成不覆盖)。
@@ -26,6 +27,7 @@ public class AFT003Service extends AFT003BaseModel implements ExecProcessFlow {
 		String solverConfigId =this.getA_aft003().getSolverConfigId();
 		String animationType=this.getA_aft003().getAnimationType();
 		String step =this.getA_aft003().getStep();
+		String isVolume=this.getA_aft003().getIsVolume();
 		AdiSolverConfigImgMapper configImgDao= UtilTools.getBean(AdiSolverConfigImgMapper.class);
 		AdiSolverConfigImgSQLBuilder sb = new AdiSolverConfigImgSQLBuilder();
 		AdiSolverConfigImgSQLBuilder.Criteria sc = sb.createCriteria();
@@ -34,6 +36,10 @@ public class AFT003Service extends AFT003BaseModel implements ExecProcessFlow {
 		sc.andStepEqualTo(step);
 		sc.andAnimationtypeEqualTo(animationType);
 		sc.andSolverConfigIdEqualTo(solverConfigId);
+		if(StringUtil.isNullOrEmpty(isVolume)){
+			sc.andIsvolumeEqualTo(isVolume);
+		}
+
 		List<AdiSolverConfigImg> list = configImgDao.selectByExample(sb);
 		if(!list.isEmpty()){
 			this.getD_aft003().setAnimationType(animationType);

+ 1 - 0
src/main/java/com/miniframe/service/mq/CaeMQ.java

@@ -120,6 +120,7 @@ public class CaeMQ extends CaeViewMFMqDynamic {
                         img.setAnimationtype(msg.getAnimationType());
                         configImgMapper.insert(img);
                         img.setImg("");
+                        img.setIsvolume(msg.getIsVolume());
                         point.sendMessageToUser(msg.getProId(),XiJsonUtil.objectToJson(img));//发送加载进度
                     }else{
                         AdiSolverConfigImgMapper configImgMapper= UtilTools.getBean(AdiSolverConfigImgMapper.class);

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/AFT003_A(获取每步图片).csv

@@ -2,4 +2,5 @@
 1,pid,项目ID,string,,,是,1,1024,,,,,,
 2,solverConfigId,求解配置Id,string,,,是,,,,,,,,
 3,animationType,渲染类型,string,,,是,,,,,,,,
-4,step,步数,string,,,是,,,,,,,,
+4,step,步数,string,,,是,,,,,,,,
+5,isVolume,物面流场1物面2流场,string,,,,1,2048,,,,,,