hxx há 2 anos atrás
pai
commit
1245317595
44 ficheiros alterados com 1205 adições e 4 exclusões
  1. 3 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/system/model/C00006BaseModel.java
  3. 112 0
      generated/com/miniframe/generate/business/system/model/C00007BaseModel.java
  4. 112 0
      generated/com/miniframe/generate/business/system/model/C00008BaseModel.java
  5. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/C00006Client.java
  6. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/C00007Client.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/C00008Client.java
  8. 25 0
      generated/com/miniframe/generate/comm/system/A_C00006.java
  9. 25 0
      generated/com/miniframe/generate/comm/system/A_C00007.java
  10. 51 0
      generated/com/miniframe/generate/comm/system/A_C00008.java
  11. 12 0
      generated/com/miniframe/generate/comm/system/D_C00006.java
  12. 12 0
      generated/com/miniframe/generate/comm/system/D_C00007.java
  13. 12 0
      generated/com/miniframe/generate/comm/system/D_C00008.java
  14. 12 0
      generated/validateform/a_c00005Form.xml
  15. 12 0
      generated/validateform/a_c00006Form.xml
  16. 12 0
      generated/validateform/a_c00007Form.xml
  17. 15 0
      generated/validateform/a_c00008Form.xml
  18. 2 0
      generated/validator/resources_a_c00006Form_validator.properties
  19. 2 0
      generated/validator/resources_a_c00006Form_validator_zh_CN.properties
  20. 2 0
      generated/validator/resources_a_c00007Form_validator.properties
  21. 2 0
      generated/validator/resources_a_c00007Form_validator_zh_CN.properties
  22. 4 0
      generated/validator/resources_a_c00008Form_validator.properties
  23. 4 0
      generated/validator/resources_a_c00008Form_validator_zh_CN.properties
  24. 1 0
      generated/validator/resources_d_c00006Form_validator.properties
  25. 1 0
      generated/validator/resources_d_c00006Form_validator_zh_CN.properties
  26. 1 0
      generated/validator/resources_d_c00007Form_validator.properties
  27. 1 0
      generated/validator/resources_d_c00007Form_validator_zh_CN.properties
  28. 1 0
      generated/validator/resources_d_c00008Form_validator.properties
  29. 1 0
      generated/validator/resources_d_c00008Form_validator_zh_CN.properties
  30. 1 0
      profiles/dev/userconfig/user.properties
  31. 60 0
      src/main/java/com/miniframe/bisiness/system/C00006Service.java
  32. 61 0
      src/main/java/com/miniframe/bisiness/system/C00007Service.java
  33. 66 0
      src/main/java/com/miniframe/bisiness/system/C00008Service.java
  34. 24 3
      src/main/java/com/miniframe/solverjob/AdiSolverJobService.java
  35. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/C00006Test.java
  36. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/C00007Test.java
  37. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/C00008Test.java
  38. 4 1
      系统设计/系统模块/SYSTEM(基础系统).csv
  39. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00006_A(项目求解日志).csv
  40. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00006_D(项目求解日志).csv
  41. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00007_A(项目求解每步数据).csv
  42. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00007_D(项目求解每步数据).csv
  43. 4 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00008_A(求解任务状态更新).csv
  44. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00008_D(求解任务状态更新).csv

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

@@ -28,3 +28,6 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C0
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00003', '基础系统','项目求解查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00004', '基础系统','项目求解配置信息保存',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00005', '基础系统','求解',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00006', '基础系统','项目求解日志',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00007', '基础系统','项目求解每步数据',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('C00008', '基础系统','求解任务状态更新',true);

+ 112 - 0
generated/com/miniframe/generate/business/system/model/C00006BaseModel.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_C00006;
+import com.miniframe.generate.comm.system.D_C00006;
+
+/**
+ * 系统服务,“项目求解日志”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class C00006BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_C00006 a_c00006;//上行体
+	D_C00006 d_c00006;//下行体
+
+	public C00006BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_c00006=new A_C00006();
+		d_c00006=new D_C00006();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_c00006.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_C00006.class);
+		this.a_c00006 = UtilTools.map2Obj(bodyMap, A_C00006.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_c00006));
+
+		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_C00006 getA_c00006() {
+		return a_c00006;
+	}
+
+	public void setA_c00006(A_C00006 a_c00006) {
+		this.a_c00006=a_c00006;
+	}
+
+	public D_C00006 getD_c00006() {
+		return this.d_c00006;
+	}
+
+	public void setD_c00006(D_C00006 d_c00006) {
+		this.d_c00006=d_c00006;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/C00007BaseModel.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_C00007;
+import com.miniframe.generate.comm.system.D_C00007;
+
+/**
+ * 系统服务,“项目求解每步数据”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class C00007BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_C00007 a_c00007;//上行体
+	D_C00007 d_c00007;//下行体
+
+	public C00007BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_c00007=new A_C00007();
+		d_c00007=new D_C00007();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_c00007.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_C00007.class);
+		this.a_c00007 = UtilTools.map2Obj(bodyMap, A_C00007.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_c00007));
+
+		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_C00007 getA_c00007() {
+		return a_c00007;
+	}
+
+	public void setA_c00007(A_C00007 a_c00007) {
+		this.a_c00007=a_c00007;
+	}
+
+	public D_C00007 getD_c00007() {
+		return this.d_c00007;
+	}
+
+	public void setD_c00007(D_C00007 d_c00007) {
+		this.d_c00007=d_c00007;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/C00008BaseModel.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_C00008;
+import com.miniframe.generate.comm.system.D_C00008;
+
+/**
+ * 系统服务,“求解任务状态更新”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class C00008BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_C00008 a_c00008;//上行体
+	D_C00008 d_c00008;//下行体
+
+	public C00008BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_c00008=new A_C00008();
+		d_c00008=new D_C00008();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_c00008.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_C00008.class);
+		this.a_c00008 = UtilTools.map2Obj(bodyMap, A_C00008.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_c00008));
+
+		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_C00008 getA_c00008() {
+		return a_c00008;
+	}
+
+	public void setA_c00008(A_C00008 a_c00008) {
+		this.a_c00008=a_c00008;
+	}
+
+	public D_C00008 getD_c00008() {
+		return this.d_c00008;
+	}
+
+	public void setD_c00008(D_C00008 d_c00008) {
+		this.d_c00008=d_c00008;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/C00006Client.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_C00006;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.C00006BaseModel;
+
+public class C00006Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00006Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->项目求解日志((C00006)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00006BaseModel execute(C00006BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00006BaseModel execute(C00006BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(C00006BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00006BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("C00006");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_c00006()));
+		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_C00006 d_c00006 =  UtilTools.map2Obj(outMap, D_C00006.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_c00006(d_c00006);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00006BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00006BaseModel execute(C00006BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/C00007Client.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_C00007;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.C00007BaseModel;
+
+public class C00007Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00007Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->项目求解每步数据((C00007)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00007BaseModel execute(C00007BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00007BaseModel execute(C00007BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(C00007BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00007BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("C00007");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_c00007()));
+		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_C00007 d_c00007 =  UtilTools.map2Obj(outMap, D_C00007.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_c00007(d_c00007);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00007BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00007BaseModel execute(C00007BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/C00008Client.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_C00008;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.C00008BaseModel;
+
+public class C00008Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00008Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->求解任务状态更新((C00008)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00008BaseModel execute(C00008BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00008BaseModel execute(C00008BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(C00008BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00008BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("C00008");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_c00008()));
+		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_C00008 d_c00008 =  UtilTools.map2Obj(outMap, D_C00008.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_c00008(d_c00008);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(C00008BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public C00008BaseModel execute(C00008BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解日志
+ */
+public class A_C00006 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pId;//项目ID
+	/**
+	 *项目ID
+	 */
+	public void setPId(String pId) {
+		this.pId=pId;
+	}
+	/**
+	 *项目ID
+	 */
+	public String getPId() {
+		return this.pId;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解每步数据
+ */
+public class A_C00007 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pId;//项目ID
+	/**
+	 *项目ID
+	 */
+	public void setPId(String pId) {
+		this.pId=pId;
+	}
+	/**
+	 *项目ID
+	 */
+	public String getPId() {
+		return this.pId;
+	}
+}

+ 51 - 0
generated/com/miniframe/generate/comm/system/A_C00008.java

@@ -0,0 +1,51 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解任务状态更新
+ */
+public class A_C00008 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String jobId;//求解任务ID
+	/**
+	 *求解任务ID
+	 */
+	public void setJobId(String jobId) {
+		this.jobId=jobId;
+	}
+	/**
+	 *求解任务ID
+	 */
+	public String getJobId() {
+		return this.jobId;
+	}
+	int state;//状态
+	/**
+	 *状态
+	 */
+	public void setState(int state) {
+		this.state=state;
+	}
+	/**
+	 *状态
+	 */
+	public int getState() {
+		return this.state;
+	}
+	int resultsState;//求解失败or成功
+	/**
+	 *求解失败or成功
+	 */
+	public void setResultsState(int resultsState) {
+		this.resultsState=resultsState;
+	}
+	/**
+	 *求解失败or成功
+	 */
+	public int getResultsState() {
+		return this.resultsState;
+	}
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/D_C00006.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解日志
+ */
+public class D_C00006 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/D_C00007.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解每步数据
+ */
+public class D_C00007 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/D_C00008.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解任务状态更新
+ */
+public class D_C00008 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 12 - 0
generated/validateform/a_c00005Form.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_c00005Form">
+<field property="solverConfigId" depends="required">
+    <arg0 key="a_c00005.solverConfigId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/a_c00006Form.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_c00006Form">
+<field property="pId" depends="required">
+    <arg0 key="a_c00006.pId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/a_c00007Form.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_c00007Form">
+<field property="pId" depends="required">
+    <arg0 key="a_c00007.pId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 15 - 0
generated/validateform/a_c00008Form.xml

@@ -0,0 +1,15 @@
+<?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_c00008Form">
+<field property="jobId" depends="required">
+    <arg0 key="a_c00008.jobId"/>
+</field>
+<field property="state" depends="required">
+    <arg0 key="a_c00008.state"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 2 - 0
generated/validator/resources_a_c00006Form_validator.properties

@@ -0,0 +1,2 @@
+a_c00006.pId = \u9879\u76EEID
+a_c00006Form = true

+ 2 - 0
generated/validator/resources_a_c00006Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_c00006.pId = \u9879\u76EEID
+a_c00006Form = true

+ 2 - 0
generated/validator/resources_a_c00007Form_validator.properties

@@ -0,0 +1,2 @@
+a_c00007.pId = \u9879\u76EEID
+a_c00007Form = true

+ 2 - 0
generated/validator/resources_a_c00007Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_c00007.pId = \u9879\u76EEID
+a_c00007Form = true

+ 4 - 0
generated/validator/resources_a_c00008Form_validator.properties

@@ -0,0 +1,4 @@
+a_c00008.jobId = \u6C42\u89E3\u4EFB\u52A1ID
+a_c00008.state = \u72B6\u6001
+a_c00008.resultsState = \u6C42\u89E3\u5931\u8D25or\u6210\u529F
+a_c00008Form = true

+ 4 - 0
generated/validator/resources_a_c00008Form_validator_zh_CN.properties

@@ -0,0 +1,4 @@
+a_c00008.jobId = \u6C42\u89E3\u4EFB\u52A1ID
+a_c00008.state = \u72B6\u6001
+a_c00008.resultsState = \u6C42\u89E3\u5931\u8D25or\u6210\u529F
+a_c00008Form = true

+ 1 - 0
generated/validator/resources_d_c00006Form_validator.properties

@@ -0,0 +1 @@
+d_c00006Form = false

+ 1 - 0
generated/validator/resources_d_c00006Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_c00006Form = false

+ 1 - 0
generated/validator/resources_d_c00007Form_validator.properties

@@ -0,0 +1 @@
+d_c00007Form = false

+ 1 - 0
generated/validator/resources_d_c00007Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_c00007Form = false

+ 1 - 0
generated/validator/resources_d_c00008Form_validator.properties

@@ -0,0 +1 @@
+d_c00008Form = false

+ 1 - 0
generated/validator/resources_d_c00008Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_c00008Form = false

+ 1 - 0
profiles/dev/userconfig/user.properties

@@ -2,3 +2,4 @@
 cfdurl=http://192.168.0.43:8081/
 cfduid=5f06c8bc77234f969d13e160b54c27e3
 cfdtoken=e47b87eec69545559d1e81e56626da68
+es.host=http://localhost:8031/

+ 60 - 0
src/main/java/com/miniframe/bisiness/system/C00006Service.java

@@ -0,0 +1,60 @@
+package com.miniframe.bisiness.system;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.IniFileReader;
+import com.miniframe.generate.business.system.model.C00006BaseModel;
+import com.miniframe.tools.ali.HttpUtils;
+import org.apache.http.HttpResponse;
+
+/**
+ * 基础系统,“项目求解日志”逻辑处理(重新生成不覆盖)。
+ */
+public class C00006Service extends C00006BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“项目求解日志”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		IniFileReader ini = new IniFileReader("sms.properties");
+		String host = ini.getStrValue("es.host")+"/searchAllLog";
+		String path ="";
+		String method="";
+		Map<String, String> headers = new HashMap<>();
+		Map<String, String> querys= new HashMap<>();
+		Map<String, String> bodys= new HashMap<>();
+		bodys.put("projectId",this.getA_c00006().getPId());
+		HttpResponse response= HttpUtils.doPost(host,path,method,headers,querys,bodys);
+	}
+	
+	/**
+	 * 基础系统,“项目求解日志”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 61 - 0
src/main/java/com/miniframe/bisiness/system/C00007Service.java

@@ -0,0 +1,61 @@
+package com.miniframe.bisiness.system;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.IniFileReader;
+import com.miniframe.generate.business.system.model.C00007BaseModel;
+import com.miniframe.tools.ali.HttpUtils;
+import org.apache.http.HttpResponse;
+
+/**
+ * 基础系统,“项目求解每步数据”逻辑处理(重新生成不覆盖)。
+ */
+public class C00007Service extends C00007BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“项目求解每步数据”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		IniFileReader ini = new IniFileReader("sms.properties");
+		String host = ini.getStrValue("es.host")+"/searchAllIter";
+		String path ="";
+		String method="";
+		Map<String, String> headers = new HashMap<>();
+		Map<String, String> querys= new HashMap<>();
+		Map<String, String> bodys= new HashMap<>();
+		bodys.put("projectId", getA_c00007().getPId());
+		HttpResponse response= HttpUtils.doPost(host,path,method,headers,querys,bodys);
+
+	}
+	
+	/**
+	 * 基础系统,“项目求解每步数据”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 66 - 0
src/main/java/com/miniframe/bisiness/system/C00008Service.java

@@ -0,0 +1,66 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.C00008BaseModel;
+import com.miniframe.model.system.AdiSolverJob;
+import com.miniframe.model.system.dao.AdiSolverJobMapper;
+import com.miniframe.model.system.dao.AdiSolverMapper;
+import com.miniframe.solverjob.AdiSolverJobService;
+
+/**
+ * 基础系统,“求解任务状态更新”逻辑处理(重新生成不覆盖)。
+ */
+public class C00008Service extends C00008BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“求解任务状态更新”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String jobId =this.getA_c00008().getJobId();
+		int state = this.getA_c00008().getState();
+		int resultsState = this.getA_c00008().getResultsState();
+		AdiSolverJobMapper jobdao = UtilTools.getBean(AdiSolverJobMapper.class);
+		AdiSolverJob job = jobdao.selectByPrimaryKey(jobId);
+		if(state ==0){
+			AdiSolverJobService.exeJob(job);
+		}else if(state ==1 || resultsState==1){//执行成功
+			AdiSolverJobService.overSucessJob(job);
+
+		}else if(state ==1 || resultsState==-1){//执行失败
+			AdiSolverJobService.overFailJob(job);
+
+		}
+	}
+	
+	/**
+	 * 基础系统,“求解任务状态更新”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 24 - 3
src/main/java/com/miniframe/solverjob/AdiSolverJobService.java

@@ -3,6 +3,7 @@ package com.miniframe.solverjob;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.model.system.AdiSolverConfig;
 import com.miniframe.model.system.AdiSolverJob;
+import com.miniframe.model.system.dao.AdiSolverConfigMapper;
 import com.miniframe.model.system.dao.AdiSolverJobMapper;
 import com.miniframe.tools.XIDateTimeUtils;
 
@@ -24,6 +25,12 @@ public class AdiSolverJobService {
         AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
         job.setState(-1);//待执行
         jobDao.insert(job);
+
+        AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
+//        AdiSolverConfig  config =configDao.selectByPrimaryKey(job.getConfigid());
+        config.setState((short)-1);
+        config.setSolverNum(config.getSolverNum()+1);
+        configDao.updateByPrimaryKey(config);
         return job;
     }
     /**
@@ -31,12 +38,17 @@ public class AdiSolverJobService {
      * @param
      */
     public static AdiSolverJob exeJob(AdiSolverJob job){
-        job.setId(UtilTools.getUUid());
         String now = XIDateTimeUtils.getNowStr();
         job.setStartexeTime(now);
         AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
         job.setState(0);//执行中
         jobDao.updateByPrimaryKey(job);
+
+        AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
+        AdiSolverConfig  config =configDao.selectByPrimaryKey(job.getConfigid());
+        config.setState((short)0);
+        config.setSolverStime(XIDateTimeUtils.getNowDate());
+        configDao.updateByPrimaryKey(config);
         return job;
     }
     /**
@@ -44,13 +56,18 @@ public class AdiSolverJobService {
      * @param
      */
     public static AdiSolverJob overSucessJob(AdiSolverJob job){
-        job.setId(UtilTools.getUUid());
         String now = XIDateTimeUtils.getNowStr();
         job.setEndexeTime(now);
         AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
         job.setState(1);//任务执行完成
         job.setResultsState(1);//执行成功
         jobDao.updateByPrimaryKey(job);
+
+        AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
+        AdiSolverConfig  config =configDao.selectByPrimaryKey(job.getConfigid());
+        config.setState((short)0);
+        config.setSolverEtime(XIDateTimeUtils.getNowDate());
+        configDao.updateByPrimaryKey(config);
         return job;
     }
     /**
@@ -58,13 +75,17 @@ public class AdiSolverJobService {
      * @param
      */
     public static AdiSolverJob overFailJob(AdiSolverJob job){
-        job.setId(UtilTools.getUUid());
         String now = XIDateTimeUtils.getNowStr();
         job.setEndexeTime(now);
         AdiSolverJobMapper jobDao = UtilTools.getBean(AdiSolverJobMapper.class);
         job.setState(1);//任务执行完成
         job.setResultsState(-1);//求解失败
         jobDao.updateByPrimaryKey(job);
+
+        AdiSolverConfigMapper configDao = UtilTools.getBean(AdiSolverConfigMapper.class);
+        AdiSolverConfig  config =configDao.selectByPrimaryKey(job.getConfigid());
+        config.setState((short)0);
+        config.setSolverEtime(XIDateTimeUtils.getNowDate());
         return job;
     }
 }

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/C00006Test.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_C00006;
+import com.miniframe.generate.comm.httpclientapater.C00006Client;
+import com.miniframe.generate.business.system.model.C00006BaseModel;
+
+public class C00006Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00006Test.class);
+
+	/**
+	 * 项目求解日志,获取报文体
+	 * @return
+	 */
+	public static A_C00006 getA_c00006() {
+		A_C00006 a_c00006 = new A_C00006();
+
+		// ----------以下增加【项目求解日志】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_c00006;
+	}
+	
+	/**
+	 * 运行客户端测试,项目求解日志
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		C00006BaseModel model = new C00006BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("C00006"));
+		model.setA_c00006(C00006Test.getA_c00006());
+		C00006Client client = new C00006Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/C00007Test.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_C00007;
+import com.miniframe.generate.comm.httpclientapater.C00007Client;
+import com.miniframe.generate.business.system.model.C00007BaseModel;
+
+public class C00007Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00007Test.class);
+
+	/**
+	 * 项目求解每步数据,获取报文体
+	 * @return
+	 */
+	public static A_C00007 getA_c00007() {
+		A_C00007 a_c00007 = new A_C00007();
+
+		// ----------以下增加【项目求解每步数据】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_c00007;
+	}
+	
+	/**
+	 * 运行客户端测试,项目求解每步数据
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		C00007BaseModel model = new C00007BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("C00007"));
+		model.setA_c00007(C00007Test.getA_c00007());
+		C00007Client client = new C00007Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/C00008Test.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_C00008;
+import com.miniframe.generate.comm.httpclientapater.C00008Client;
+import com.miniframe.generate.business.system.model.C00008BaseModel;
+
+public class C00008Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(C00008Test.class);
+
+	/**
+	 * 求解任务状态更新,获取报文体
+	 * @return
+	 */
+	public static A_C00008 getA_c00008() {
+		A_C00008 a_c00008 = new A_C00008();
+
+		// ----------以下增加【求解任务状态更新】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_c00008;
+	}
+	
+	/**
+	 * 运行客户端测试,求解任务状态更新
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		C00008BaseModel model = new C00008BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("C00008"));
+		model.setA_c00008(C00008Test.getA_c00008());
+		C00008Client client = new C00008Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -26,4 +26,7 @@
 300002,C00002,项目保存,service,,
 300003,C00003,项目求解查询,service,,
 300004,C00004,项目求解配置信息保存,service,,
-300005,C00005,求解,service,,
+300005,C00005,求解,service,,
+300006,C00006,项目求解日志,service,,
+300007,C00007,项目求解每步数据,service,,
+300008,C00008,求解任务状态更新,service,,

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00006_A(项目求解日志).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00006_D(项目求解日志).csv

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

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

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

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00007_D(项目求解每步数据).csv

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

+ 4 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00008_A(求解任务状态更新).csv

@@ -0,0 +1,4 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,jobId,求解任务ID,string,,,是,,,,,,,,
+2,state,状态,int,,,是,,,,,,,,
+3,resultsState,求解失败or成功,int,,,,,,,,,,,

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00008_D(求解任务状态更新).csv

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