소스 검색

求解任务获取

huangxingxing 1 년 전
부모
커밋
7fe00768a0
21개의 변경된 파일742개의 추가작업 그리고 51개의 파일을 삭제
  1. 1 0
      dbscript/init/generate/03-functionInit.sql
  2. 1 0
      definitionsrc/returncode/returncode-business.properties
  3. 1 0
      definitionsrc/returncode/returncode-business_zh_CN.properties
  4. 112 0
      generated/com/miniframe/generate/business/system/model/D10017BaseModel.java
  5. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10017Client.java
  6. 25 0
      generated/com/miniframe/generate/comm/system/A_D10017.java
  7. 181 0
      generated/com/miniframe/generate/comm/system/D_D10017.java
  8. 12 0
      generated/validateform/a_d10017Form.xml
  9. 2 0
      generated/validator/resources_a_d10017Form_validator.properties
  10. 2 0
      generated/validator/resources_a_d10017Form_validator_zh_CN.properties
  11. 14 0
      generated/validator/resources_d_d10017Form_validator.properties
  12. 14 0
      generated/validator/resources_d_d10017Form_validator_zh_CN.properties
  13. 30 7
      modelsrc/com/miniframe/model/system/DJob.java
  14. 98 28
      modelsrc/com/miniframe/model/system/DJobSQLBuilder.java
  15. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  16. 83 0
      src/main/java/com/miniframe/bisiness/system/D10017Service.java
  17. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10017Test.java
  18. 2 1
      系统设计/数据定义/返 回 码/business(业务系统).csv
  19. 2 14
      系统设计/系统模块/SYSTEM(基础系统).csv
  20. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10017_A(求解任务信息).csv
  21. 16 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10017_D(求解任务信息).csv

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

@@ -57,3 +57,4 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D1
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10014', '基础系统','物理属性添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10015', '基础系统','物理属性据删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10016', '基础系统','监测点结果获取',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10017', '基础系统','求解任务信息',true);

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

@@ -73,3 +73,4 @@ EB3100007 = \u8BE5\u7BA1\u9053\u540C\u4F4D\u7F6E\u5B58\u5728\u76F8\u540C\u4F20\u
 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

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

@@ -73,3 +73,4 @@ EB3100007 = \u8BE5\u7BA1\u9053\u540C\u4F4D\u7F6E\u5B58\u5728\u76F8\u540C\u4F20\u
 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

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10017BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.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.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10017;
+import com.miniframe.generate.comm.system.D_D10017;
+
+/**
+ * 系统服务,“求解任务信息”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10017BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10017 a_d10017;//上行体
+	D_D10017 d_d10017;//下行体
+
+	public D10017BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10017=new A_D10017();
+		d_d10017=new D_D10017();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10017.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10017.class);
+		this.a_d10017 = UtilTools.map2Obj(bodyMap, A_D10017.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10017));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10017 getA_d10017() {
+		return a_d10017;
+	}
+
+	public void setA_d10017(A_D10017 a_d10017) {
+		this.a_d10017=a_d10017;
+	}
+
+	public D_D10017 getD_d10017() {
+		return this.d_d10017;
+	}
+
+	public void setD_d10017(D_D10017 d_d10017) {
+		this.d_d10017=d_d10017;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10017Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+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.system.D_D10017;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10017BaseModel;
+
+public class D10017Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10017Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->求解任务信息((D10017)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10017BaseModel execute(D10017BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10017BaseModel execute(D10017BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10017BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10017BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10017");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10017()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10017 d_d10017 =  UtilTools.map2Obj(outMap, D_D10017.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10017(d_d10017);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10017BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10017BaseModel execute(D10017BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 25 - 0
generated/com/miniframe/generate/comm/system/A_D10017.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解任务信息
+ */
+public class A_D10017 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int aid;//事故ID
+	/**
+	 *事故ID
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故ID
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+}

+ 181 - 0
generated/com/miniframe/generate/comm/system/D_D10017.java

@@ -0,0 +1,181 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解任务信息
+ */
+public class D_D10017 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int jid;//任务ID
+	/**
+	 *任务ID
+	 */
+	public void setJid(int jid) {
+		this.jid=jid;
+	}
+	/**
+	 *任务ID
+	 */
+	public int getJid() {
+		return this.jid;
+	}
+	int aid;//事故ID
+	/**
+	 *事故ID
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故ID
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+	String starttime;//结束时间
+	/**
+	 *结束时间
+	 */
+	public void setStarttime(String starttime) {
+		this.starttime=starttime;
+	}
+	/**
+	 *结束时间
+	 */
+	public String getStarttime() {
+		return this.starttime;
+	}
+	String endtime;//开始时间
+	/**
+	 *开始时间
+	 */
+	public void setEndtime(String endtime) {
+		this.endtime=endtime;
+	}
+	/**
+	 *开始时间
+	 */
+	public String getEndtime() {
+		return this.endtime;
+	}
+	String state;//状态
+	/**
+	 *状态
+	 */
+	public void setState(String state) {
+		this.state=state;
+	}
+	/**
+	 *状态
+	 */
+	public String getState() {
+		return this.state;
+	}
+	String faildes;//失败原因
+	/**
+	 *失败原因
+	 */
+	public void setFaildes(String faildes) {
+		this.faildes=faildes;
+	}
+	/**
+	 *失败原因
+	 */
+	public String getFaildes() {
+		return this.faildes;
+	}
+	String dt;//时间步长
+	/**
+	 *时间步长
+	 */
+	public void setDt(String dt) {
+		this.dt=dt;
+	}
+	/**
+	 *时间步长
+	 */
+	public String getDt() {
+		return this.dt;
+	}
+	String dx;//空间步长
+	/**
+	 *空间步长
+	 */
+	public void setDx(String dx) {
+		this.dx=dx;
+	}
+	/**
+	 *空间步长
+	 */
+	public String getDx() {
+		return this.dx;
+	}
+	String reportstep;//输出步长
+	/**
+	 *输出步长
+	 */
+	public void setReportstep(String reportstep) {
+		this.reportstep=reportstep;
+	}
+	/**
+	 *输出步长
+	 */
+	public String getReportstep() {
+		return this.reportstep;
+	}
+	String interactionstep;//交互步长
+	/**
+	 *交互步长
+	 */
+	public void setInteractionstep(String interactionstep) {
+		this.interactionstep=interactionstep;
+	}
+	/**
+	 *交互步长
+	 */
+	public String getInteractionstep() {
+		return this.interactionstep;
+	}
+	String acctime;//事故开始时间
+	/**
+	 *事故开始时间
+	 */
+	public void setAcctime(String acctime) {
+		this.acctime=acctime;
+	}
+	/**
+	 *事故开始时间
+	 */
+	public String getAcctime() {
+		return this.acctime;
+	}
+	String totaltime;//模拟时长
+	/**
+	 *模拟时长
+	 */
+	public void setTotaltime(String totaltime) {
+		this.totaltime=totaltime;
+	}
+	/**
+	 *模拟时长
+	 */
+	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;
+	}
+}

+ 12 - 0
generated/validateform/a_d10017Form.xml

@@ -0,0 +1,12 @@
+<?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_d10017Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d10017.aid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 2 - 0
generated/validator/resources_a_d10017Form_validator.properties

@@ -0,0 +1,2 @@
+a_d10017.aid = \u4E8B\u6545ID
+a_d10017Form = true

+ 2 - 0
generated/validator/resources_a_d10017Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d10017.aid = \u4E8B\u6545ID
+a_d10017Form = true

+ 14 - 0
generated/validator/resources_d_d10017Form_validator.properties

@@ -0,0 +1,14 @@
+d_d10017.jid = \u4EFB\u52A1ID
+d_d10017.aid = \u4E8B\u6545ID
+d_d10017.starttime = \u7ED3\u675F\u65F6\u95F4
+d_d10017.endtime = \u5F00\u59CB\u65F6\u95F4
+d_d10017.state = \u72B6\u6001
+d_d10017.faildes = \u5931\u8D25\u539F\u56E0
+d_d10017.dt = \u65F6\u95F4\u6B65\u957F
+d_d10017.dx = \u7A7A\u95F4\u6B65\u957F
+d_d10017.reportstep = \u8F93\u51FA\u6B65\u957F
+d_d10017.interactionstep = \u4EA4\u4E92\u6B65\u957F
+d_d10017.acctime = \u4E8B\u6545\u5F00\u59CB\u65F6\u95F4
+d_d10017.totaltime = \u6A21\u62DF\u65F6\u957F
+d_d10017.coids = \u7269\u7406\u5C5E\u6027ID\u9017\u53F7\u5206\u9694
+d_d10017Form = true

+ 14 - 0
generated/validator/resources_d_d10017Form_validator_zh_CN.properties

@@ -0,0 +1,14 @@
+d_d10017.jid = \u4EFB\u52A1ID
+d_d10017.aid = \u4E8B\u6545ID
+d_d10017.starttime = \u7ED3\u675F\u65F6\u95F4
+d_d10017.endtime = \u5F00\u59CB\u65F6\u95F4
+d_d10017.state = \u72B6\u6001
+d_d10017.faildes = \u5931\u8D25\u539F\u56E0
+d_d10017.dt = \u65F6\u95F4\u6B65\u957F
+d_d10017.dx = \u7A7A\u95F4\u6B65\u957F
+d_d10017.reportstep = \u8F93\u51FA\u6B65\u957F
+d_d10017.interactionstep = \u4EA4\u4E92\u6B65\u957F
+d_d10017.acctime = \u4E8B\u6545\u5F00\u59CB\u65F6\u95F4
+d_d10017.totaltime = \u6A21\u62DF\u65F6\u957F
+d_d10017.coids = \u7269\u7406\u5C5E\u6027ID\u9017\u53F7\u5206\u9694
+d_d10017Form = true

+ 30 - 7
modelsrc/com/miniframe/model/system/DJob.java

@@ -16,7 +16,7 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
 
     private String starttime;
 
-    private String endtme;
+    private String endtime;
 
     /**
      * 0 执行中 1执行成功 2 执行失败
@@ -58,6 +58,11 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
      */
     private String totaltime;
 
+    /**
+     * 物理属性ID逗号分隔
+     */
+    private String coids;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -107,17 +112,17 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * @return endtme
+     * @return endtime
      */
-    public String getEndtme() {
-        return endtme;
+    public String getEndtime() {
+        return endtime;
     }
 
     /**
-     * @param endtme
+     * @param endtime
      */
-    public void setEndtme(String endtme) {
-        this.endtme = endtme == null ? null : endtme.trim();
+    public void setEndtime(String endtime) {
+        this.endtime = endtime == null ? null : endtime.trim();
     }
 
     /**
@@ -263,4 +268,22 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     public void setTotaltime(String totaltime) {
         this.totaltime = totaltime == null ? null : totaltime.trim();
     }
+
+    /**
+     * 获取物理属性ID逗号分隔
+     *
+     * @return coids - 物理属性ID逗号分隔
+     */
+    public String getCoids() {
+        return coids;
+    }
+
+    /**
+     * 设置物理属性ID逗号分隔
+     *
+     * @param coids 物理属性ID逗号分隔
+     */
+    public void setCoids(String coids) {
+        this.coids = coids == null ? null : coids.trim();
+    }
 }

+ 98 - 28
modelsrc/com/miniframe/model/system/DJobSQLBuilder.java

@@ -294,73 +294,73 @@ public class DJobSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeIsNull() {
-            addCriterion("endtme is null");
+        public Criteria andEndtimeIsNull() {
+            addCriterion("endtime is null");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeIsNotNull() {
-            addCriterion("endtme is not null");
+        public Criteria andEndtimeIsNotNull() {
+            addCriterion("endtime is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeEqualTo(String value) {
-            addCriterion("endtme =", value, "endtme");
+        public Criteria andEndtimeEqualTo(String value) {
+            addCriterion("endtime =", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeNotEqualTo(String value) {
-            addCriterion("endtme <>", value, "endtme");
+        public Criteria andEndtimeNotEqualTo(String value) {
+            addCriterion("endtime <>", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeGreaterThan(String value) {
-            addCriterion("endtme >", value, "endtme");
+        public Criteria andEndtimeGreaterThan(String value) {
+            addCriterion("endtime >", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeGreaterThanOrEqualTo(String value) {
-            addCriterion("endtme >=", value, "endtme");
+        public Criteria andEndtimeGreaterThanOrEqualTo(String value) {
+            addCriterion("endtime >=", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeLessThan(String value) {
-            addCriterion("endtme <", value, "endtme");
+        public Criteria andEndtimeLessThan(String value) {
+            addCriterion("endtime <", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeLessThanOrEqualTo(String value) {
-            addCriterion("endtme <=", value, "endtme");
+        public Criteria andEndtimeLessThanOrEqualTo(String value) {
+            addCriterion("endtime <=", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeLike(String value) {
-            addCriterion("endtme like", value, "endtme");
+        public Criteria andEndtimeLike(String value) {
+            addCriterion("endtime like", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeNotLike(String value) {
-            addCriterion("endtme not like", value, "endtme");
+        public Criteria andEndtimeNotLike(String value) {
+            addCriterion("endtime not like", value, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeIn(List<String> values) {
-            addCriterion("endtme in", values, "endtme");
+        public Criteria andEndtimeIn(List<String> values) {
+            addCriterion("endtime in", values, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeNotIn(List<String> values) {
-            addCriterion("endtme not in", values, "endtme");
+        public Criteria andEndtimeNotIn(List<String> values) {
+            addCriterion("endtime not in", values, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeBetween(String value1, String value2) {
-            addCriterion("endtme between", value1, value2, "endtme");
+        public Criteria andEndtimeBetween(String value1, String value2) {
+            addCriterion("endtime between", value1, value2, "endtime");
             return (Criteria) this;
         }
 
-        public Criteria andEndtmeNotBetween(String value1, String value2) {
-            addCriterion("endtme not between", value1, value2, "endtme");
+        public Criteria andEndtimeNotBetween(String value1, String value2) {
+            addCriterion("endtime not between", value1, value2, "endtime");
             return (Criteria) this;
         }
 
@@ -923,6 +923,76 @@ public class DJobSQLBuilder {
             addCriterion("totaltime not between", value1, value2, "totaltime");
             return (Criteria) this;
         }
+
+        public Criteria andCoidsIsNull() {
+            addCriterion("coids is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsIsNotNull() {
+            addCriterion("coids is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsEqualTo(String value) {
+            addCriterion("coids =", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsNotEqualTo(String value) {
+            addCriterion("coids <>", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsGreaterThan(String value) {
+            addCriterion("coids >", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsGreaterThanOrEqualTo(String value) {
+            addCriterion("coids >=", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsLessThan(String value) {
+            addCriterion("coids <", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsLessThanOrEqualTo(String value) {
+            addCriterion("coids <=", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsLike(String value) {
+            addCriterion("coids like", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsNotLike(String value) {
+            addCriterion("coids not like", value, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsIn(List<String> values) {
+            addCriterion("coids in", values, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsNotIn(List<String> values) {
+            addCriterion("coids not in", values, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsBetween(String value1, String value2) {
+            addCriterion("coids between", value1, value2, "coids");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoidsNotBetween(String value1, String value2) {
+            addCriterion("coids not between", value1, value2, "coids");
+            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 Fri Mar 01 14:55:10 CST 2024.
+    This file was generated on Sat Mar 02 09:21:13 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -0,0 +1,83 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10017BaseModel;
+import com.miniframe.generate.comm.system.D_D10017;
+import com.miniframe.model.system.DAccident;
+import com.miniframe.model.system.DJob;
+import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DJobMapper;
+import tk.mybatis.mapper.util.StringUtil;
+
+/**
+ * 基础系统,“求解任务信息”逻辑处理(重新生成不覆盖)。
+ */
+public class D10017Service extends D10017BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“求解任务信息”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer aid = this.getA_d10017().getAid();
+		DAccidentMapper accidentMapper =UtilTools.getBean(DAccidentMapper.class);
+		DAccident accident = accidentMapper.selectByPrimaryKey(aid);
+		if(accident ==null ){
+			throw  new BusinessException("EB3000002");
+		}
+		if(accident.getJid()==null||accident.getJid()<=0){
+			throw new BusinessException("EB3100012");
+		}
+		DJobMapper jobMapper = UtilTools.getBean(DJobMapper.class);
+		DJob jb = jobMapper.selectByPrimaryKey(accident.getJid());
+		D_D10017 rb =this.getD_d10017();
+		rb.setJid(jb.getId());
+		rb.setAid(jb.getAid());
+		rb.setStarttime(jb.getStarttime());
+		rb.setEndtime(jb.getEndtime());
+		rb.setState(jb.getState());
+		rb.setFaildes(jb.getFaildes());
+		rb.setDt(jb.getDt());
+		rb.setDx(jb.getDx());
+		rb.setReportstep(jb.getReportstep());
+		rb.setInteractionstep(jb.getInteractionstep());
+		rb.setAcctime(jb.getAcctime());
+		rb.setTotaltime(jb.getTotaltime());
+		rb.setCoids(jb.getCoids());
+
+
+
+	}
+	
+	/**
+	 * 基础系统,“求解任务信息”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10017Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10017;
+import com.miniframe.generate.comm.httpclientapater.D10017Client;
+import com.miniframe.generate.business.system.model.D10017BaseModel;
+
+public class D10017Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10017Test.class);
+
+	/**
+	 * 求解任务信息,获取报文体
+	 * @return
+	 */
+	public static A_D10017 getA_d10017() {
+		A_D10017 a_d10017 = new A_D10017();
+
+		// ----------以下增加【求解任务信息】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10017;
+	}
+	
+	/**
+	 * 运行客户端测试,求解任务信息
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10017BaseModel model = new D10017BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10017"));
+		model.setA_d10017(D10017Test.getA_d10017());
+		D10017Client client = new D10017Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -81,4 +81,5 @@
 3100008,EB3100008,传感器不存在!,
 
 3100010,EB3100010,存在相同的物理属性!,
-3100011,EB3100011,物理属性不存在!,
+3100011,EB3100011,物理属性不存在!,
+3100012,EB3100012,任务不存在!,

+ 2 - 14
系统设计/系统模块/SYSTEM(基础系统).csv

@@ -25,27 +25,19 @@
 300001,D00001,管道数据查询,service,,
 300002,D00002,事故数据添加修改,service,,
 300003,D00003,事故数据查询,service,,
-
 300004,D00004,灾情点源数据添加,service,,
-
 300005,D00005,灾情点源数据查询,service,,、
 300006,D00006,灾情源检测数据添加,service,,
 300007,D00007,灾情源检测数据查询,service,,
-
-
 300008,D00008,灾情演练,service,,
 300009,D00009,灾情文件获取,service,,
-
-
 300010,D000010,灾情点源数据修改,service,,
 300011,D000011,灾情点源数据删除,service,,
 300012,D000012,灾情点源检测数据修改,service,,
 300013,D000013,灾情点源检测数据删除,service,,
 300014,D000014,灾情几何文件获取,service,,
-
 300015,D000015,日志文件获取,service,,
 300016,D000016,事故数据删除,service,,
-
 310000,D10000,节点数据添加修改,service,,
 310001,D10001,节点数据删除,service,,
 310002,D10002,管道数据添加修改,service,,
@@ -53,18 +45,14 @@
 310004,D10004,监测点查询,service,,
 310005,D10005,监测点添加修改,service,,
 310006,D10006,监测点删除,service,,
-
 310007,D10007,边界数据查询,service,,
 310008,D10008,边界数据添加修改,service,,
 310009,D10009,边界数据删除,service,,
-
 310010,D10010,传感器数据查询,service,,
 310011,D10011,传感器数据添加修改,service,,
 310012,D10012,传感器数据删除,service,,
-
 310013,D10013,物理属性查询,service,,
 310014,D10014,物理属性添加修改,service,,
 310015,D10015,物理属性据删除,service,,
-
-
-D10016,D10016,监测点结果获取,service,
+310016,D10016,监测点结果获取,service,
+310017,D10017,求解任务信息,service,

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

@@ -0,0 +1,2 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,aid,事故ID,int,,,是,,,,,,,,

+ 16 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10017_D(求解任务信息).csv

@@ -0,0 +1,16 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,jid,任务ID,int,,,,,,,,,,,
+2,aid,事故ID,int,,,,,,,,,,,
+3,starttime,结束时间,string,,,,,,,,,,,
+4,endtime,开始时间,string,,,,,,,,,,,
+5,state,状态,string,,,,,,,,,,,
+6,faildes,失败原因,string,,,,,,,,,,,
+7,dt,时间步长,string,,,,,,,,,,,
+8,dx,空间步长,string,,,,,,,,,,,
+9,reportstep,输出步长,string,,,,,,,,,,,
+10,interactionstep,交互步长,string,,,,,,,,,,,
+11,acctime,事故开始时间,string,,,,,,,,,,,
+12,totaltime,模拟时长,string,,,,,,,,,,,
+13,coids,物理属性ID逗号分隔,string,,,,,,,,,,,
+
+