Ver Fonte

求解任务获取

huangxingxing há 1 ano atrás
pai
commit
7138a3c727

+ 1 - 0
definitionsrc/returncode/returncode-business.properties

@@ -74,3 +74,4 @@ EB3100008 = \u4F20\u611F\u5668\u4E0D\u5B58\u5728\uFF01
 EB3100010 = \u5B58\u5728\u76F8\u540C\u7684\u7269\u7406\u5C5E\u6027\uFF01
 EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
 EB3100012 = \u4EFB\u52A1\u4E0D\u5B58\u5728\uFF01
+EB3100013 = \u7269\u7406\u5C5E\u6027\u4FE1\u606F\u7F3A\u5931\uFF01

+ 1 - 0
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -74,3 +74,4 @@ EB3100008 = \u4F20\u611F\u5668\u4E0D\u5B58\u5728\uFF01
 EB3100010 = \u5B58\u5728\u76F8\u540C\u7684\u7269\u7406\u5C5E\u6027\uFF01
 EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
 EB3100012 = \u4EFB\u52A1\u4E0D\u5B58\u5728\uFF01
+EB3100013 = \u7269\u7406\u5C5E\u6027\u4FE1\u606F\u7F3A\u5931\uFF01

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

@@ -100,4 +100,30 @@ public class A_D00008 extends BaseMapModel implements Serializable {
 	public String getTotaltime() {
 		return this.totaltime;
 	}
+	String coids;//物理属性ID逗号分隔
+	/**
+	 *物理属性ID逗号分隔
+	 */
+	public void setCoids(String coids) {
+		this.coids=coids;
+	}
+	/**
+	 *物理属性ID逗号分隔
+	 */
+	public String getCoids() {
+		return this.coids;
+	}
+	String cocodes;//物理属性code逗号分隔
+	/**
+	 *物理属性code逗号分隔
+	 */
+	public void setCocodes(String cocodes) {
+		this.cocodes=cocodes;
+	}
+	/**
+	 *物理属性code逗号分隔
+	 */
+	public String getCocodes() {
+		return this.cocodes;
+	}
 }

+ 2 - 0
generated/validator/resources_a_d00008Form_validator.properties

@@ -5,4 +5,6 @@ a_d00008.dx = \u7A7A\u95F4\u6B65\u957F
 a_d00008.reportstep = \u8F93\u51FA\u6B65\u957F
 a_d00008.interactionstep = \u4EA4\u4E92\u6B65\u957F
 a_d00008.totaltime = \u6A21\u62DF\u65F6\u957F
+a_d00008.coids = \u7269\u7406\u5C5E\u6027ID\u9017\u53F7\u5206\u9694
+a_d00008.cocodes = \u7269\u7406\u5C5E\u6027code\u9017\u53F7\u5206\u9694
 a_d00008Form = true

+ 2 - 0
generated/validator/resources_a_d00008Form_validator_zh_CN.properties

@@ -5,4 +5,6 @@ a_d00008.dx = \u7A7A\u95F4\u6B65\u957F
 a_d00008.reportstep = \u8F93\u51FA\u6B65\u957F
 a_d00008.interactionstep = \u4EA4\u4E92\u6B65\u957F
 a_d00008.totaltime = \u6A21\u62DF\u65F6\u957F
+a_d00008.coids = \u7269\u7406\u5C5E\u6027ID\u9017\u53F7\u5206\u9694
+a_d00008.cocodes = \u7269\u7406\u5C5E\u6027code\u9017\u53F7\u5206\u9694
 a_d00008Form = true

+ 23 - 0
modelsrc/com/miniframe/model/system/DJob.java

@@ -63,6 +63,11 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
      */
     private String coids;
 
+    /**
+     * 物理属性code逗号分隔
+     */
+    private String cocodes;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -286,4 +291,22 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     public void setCoids(String coids) {
         this.coids = coids == null ? null : coids.trim();
     }
+
+    /**
+     * 获取物理属性code逗号分隔
+     *
+     * @return cocodes - 物理属性code逗号分隔
+     */
+    public String getCocodes() {
+        return cocodes;
+    }
+
+    /**
+     * 设置物理属性code逗号分隔
+     *
+     * @param cocodes 物理属性code逗号分隔
+     */
+    public void setCocodes(String cocodes) {
+        this.cocodes = cocodes == null ? null : cocodes.trim();
+    }
 }

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

@@ -993,6 +993,76 @@ public class DJobSQLBuilder {
             addCriterion("coids not between", value1, value2, "coids");
             return (Criteria) this;
         }
+
+        public Criteria andCocodesIsNull() {
+            addCriterion("cocodes is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesIsNotNull() {
+            addCriterion("cocodes is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesEqualTo(String value) {
+            addCriterion("cocodes =", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesNotEqualTo(String value) {
+            addCriterion("cocodes <>", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesGreaterThan(String value) {
+            addCriterion("cocodes >", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesGreaterThanOrEqualTo(String value) {
+            addCriterion("cocodes >=", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesLessThan(String value) {
+            addCriterion("cocodes <", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesLessThanOrEqualTo(String value) {
+            addCriterion("cocodes <=", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesLike(String value) {
+            addCriterion("cocodes like", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesNotLike(String value) {
+            addCriterion("cocodes not like", value, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesIn(List<String> values) {
+            addCriterion("cocodes in", values, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesNotIn(List<String> values) {
+            addCriterion("cocodes not in", values, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesBetween(String value1, String value2) {
+            addCriterion("cocodes between", value1, value2, "cocodes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCocodesNotBetween(String value1, String value2) {
+            addCriterion("cocodes not between", value1, value2, "cocodes");
+            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 Sat Mar 02 09:21:13 CST 2024.
+    This file was generated on Sat Mar 02 11:47:42 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -1,6 +1,7 @@
 package com.miniframe.bisiness.system;
 
 import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.disaster.service.LogService;
 import com.miniframe.generate.business.system.model.D00008BaseModel;
@@ -14,6 +15,7 @@ import com.miniframe.template.TemplateGenerator;
 import com.miniframe.tools.XIDateTimeUtils;
 import com.miniframe.websocket.WebsocketEndPoint;
 import lombok.SneakyThrows;
+import tk.mybatis.mapper.util.StringUtil;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -51,9 +53,22 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccident accident= accidentDao.selectByPrimaryKey(aid);
 		DJobMapper dJobDao = UtilTools.getBean(DJobMapper.class);
+		String coids=this.getA_d00008().getCoids();
+		String cocodes=this.getA_d00008().getCocodes();
 
 
-		DJob job = CreateJob(aid, totaltime, dt, dx, reportstep, interactionstep, acctime);
+		DJob job = CreateJob(aid, totaltime, dt, dx,
+				reportstep, interactionstep, acctime);
+		if(accident.getStype().equals("Fire")){
+			if(StringUtil.isEmpty(coids)||StringUtil.isEmpty(cocodes)){
+				throw new BusinessException("EB3100013");
+			}
+			job.setCoids(coids);
+			job.setCocodes(cocodes);
+		}else if(accident.getStype().equals("Water")){
+			job.setCoids("-1");
+			job.setCocodes("Height");
+		}
 		dJobDao.insertSelective(job);
 		//获取最新JOB
 		DJob newJob = getNewJob(aid, dJobDao);

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

@@ -48,7 +48,7 @@ public class D10017Service extends D10017BaseModel implements ExecProcessFlow {
 		rb.setAcctime(jb.getAcctime());
 		rb.setTotaltime(jb.getTotaltime());
 		rb.setCoids(jb.getCoids());
-		rb.setCocodes(jb.getCoids());
+		rb.setCocodes(jb.getCocodes());
 	}
 	
 	/**

+ 2 - 1
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -82,4 +82,5 @@
 
 3100010,EB3100010,存在相同的物理属性!,
 3100011,EB3100011,物理属性不存在!,
-3100012,EB3100012,任务不存在!,
+3100012,EB3100012,任务不存在!,
+3100013,EB3100013,物理属性信息缺失!,

+ 3 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00008_A(灾情演练).csv

@@ -5,4 +5,6 @@
 4,dx,空间步长,String,,,是,,,,,,,,
 5,reportstep,输出步长,String,,,是,,,,,,,,
 6,interactionstep,交互步长,String,,,是,,,,,,,,
-7,totaltime,模拟时长,String,,,是,,,,,,,,
+7,totaltime,模拟时长,String,,,是,,,,,,,,
+13,coids,物理属性ID逗号分隔,string,,,,,,,,,,,
+14,cocodes,物理属性code逗号分隔,string,,,,,,,,,,,