huangxingxing пре 11 месеци
родитељ
комит
86c27b6349

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

@@ -26,6 +26,7 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MD
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0022', '西工大系统','变量设计查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0023', '西工大系统','约束条件查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0024', '西工大系统','目标函数查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0025', '西工大系统','求解日志获取',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('SYSTEM', '基础系统','系统内部服务',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);

+ 25 - 0
generated/com/miniframe/generate/comm/mdo/A_MDO0025.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解日志获取
+ */
+public class A_MDO0025 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/mdo/D_MDO0025.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 求解日志获取
+ */
+public class D_MDO0025 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String logs;//日志
+	/**
+	 *日志
+	 */
+	public void setLogs(String logs) {
+		this.logs=logs;
+	}
+	/**
+	 *日志
+	 */
+	public String getLogs() {
+		return this.logs;
+	}
+}

+ 12 - 0
generated/validateform/a_mdo0025Form.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_mdo0025Form">
+<field property="pid" depends="required">
+    <arg0 key="a_mdo0025.pid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 2 - 0
generated/validator/resources_a_mdo0025Form_validator.properties

@@ -0,0 +1,2 @@
+a_mdo0025.pid = \u9879\u76EEID
+a_mdo0025Form = true

+ 2 - 0
generated/validator/resources_a_mdo0025Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_mdo0025.pid = \u9879\u76EEID
+a_mdo0025Form = true

+ 2 - 0
generated/validator/resources_d_mdo0025Form_validator.properties

@@ -0,0 +1,2 @@
+d_mdo0025.logs = \u65E5\u5FD7
+d_mdo0025Form = true

+ 2 - 0
generated/validator/resources_d_mdo0025Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_mdo0025.logs = \u65E5\u5FD7
+d_mdo0025Form = true

+ 9 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0008Service.java

@@ -7,8 +7,10 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.mdo.model.MDO0008BaseModel;
+import com.miniframe.model.mdo.MdoProInputSQLBuilder;
 import com.miniframe.model.mdo.MdoProjectVariate;
 import com.miniframe.model.mdo.MdoProjectVariateSQLBuilder;
+import com.miniframe.model.mdo.dao.MdoProInputMapper;
 import com.miniframe.model.mdo.dao.MdoProjectVariateMapper;
 
 /**
@@ -49,6 +51,13 @@ public class MDO0008Service extends MDO0008BaseModel implements ExecProcessFlow
 		sc.andPidEqualTo(pid);
 		varDao.deleteByExample(sb);
 
+		//删除INput 数据
+		MdoProInputMapper iDao =UtilTools.getBean(MdoProInputMapper.class);
+		MdoProInputSQLBuilder isb = new MdoProInputSQLBuilder();
+		MdoProInputSQLBuilder.Criteria isc =isb.createCriteria();
+		sc.andPidEqualTo(pid);
+		iDao.deleteByExample(isb);
+
 		for (MdoProjectVariate obj:varObjList
 			 ) {
 			varDao.insert(obj);

+ 9 - 2
src/main/java/com/miniframe/bisiness/mdo/MDO0009Service.java

@@ -7,8 +7,9 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.mdo.model.MDO0009BaseModel;
-import com.miniframe.model.mdo.MdoProjectConstraint;
-import com.miniframe.model.mdo.MdoProjectConstraintSQLBuilder;
+import com.miniframe.model.mdo.*;
+import com.miniframe.model.mdo.dao.MdoProInputMapper;
+import com.miniframe.model.mdo.dao.MdoProOutputMapper;
 import com.miniframe.model.mdo.dao.MdoProjectConstraintMapper;
 
 /**
@@ -45,6 +46,12 @@ public class MDO0009Service extends MDO0009BaseModel implements ExecProcessFlow
 		MdoProjectConstraintSQLBuilder.Criteria sc = sb.createCriteria();
 		sc.andPidEqualTo(pid);
 		conDao.deleteByExample(sb);
+		//删除输出
+		MdoProOutputMapper oDao =UtilTools.getBean(MdoProOutputMapper.class);
+		MdoProOutputSQLBuilder osb = new MdoProOutputSQLBuilder();
+		MdoProOutputSQLBuilder.Criteria osc =osb.createCriteria();
+		osc.andPidEqualTo(pid);
+		oDao.deleteByExample(osb);
 
 		for (MdoProjectConstraint obj:conObjList) {
 			conDao.insert(obj);

+ 8 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0010Service.java

@@ -8,6 +8,7 @@ import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.mdo.model.MDO0010BaseModel;
 import com.miniframe.model.mdo.*;
+import com.miniframe.model.mdo.dao.MdoProOutputMapper;
 import com.miniframe.model.mdo.dao.MdoProjectObjfunMapper;
 
 /**
@@ -49,6 +50,13 @@ public class MDO0010Service extends MDO0010BaseModel implements ExecProcessFlow
 		sc.andPidEqualTo(pid);
 		funDao.deleteByExample(sb);
 
+		//删除输出
+		MdoProOutputMapper oDao =UtilTools.getBean(MdoProOutputMapper.class);
+		MdoProOutputSQLBuilder osb = new MdoProOutputSQLBuilder();
+		MdoProOutputSQLBuilder.Criteria osc =osb.createCriteria();
+		osc.andPidEqualTo(pid);
+		oDao.deleteByExample(osb);
+
 		for (MdoProjectObjfun obj:funObjList) {
 			funDao.insert(obj);
 		}

+ 58 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0025Service.java

@@ -0,0 +1,58 @@
+package com.miniframe.bisiness.mdo;
+
+import java.io.*;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.mdo.model.MDO0025BaseModel;
+import com.miniframe.mdo.service.LogService;
+import com.miniframe.tools.XIFileUtils;
+import com.miniframe.websocket.WebsocketEndPoint;
+
+/**
+ * 西工大系统,“求解日志获取”逻辑处理(重新生成不覆盖)。
+ */
+public class MDO0025Service extends MDO0025BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 西工大系统,“求解日志获取”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String pid =this.getA_mdo0025().getPid();
+		String filePath =LogService.BPATH+"/"+pid+"/log.txt";
+		String logs = XIFileUtils.readFileAsString(filePath);
+		this.getD_mdo0025().setLogs(logs);
+	}
+	
+	/**
+	 * 西工大系统,“求解日志获取”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 2 - 3
系统设计/系统模块/MDO(西工大系统).csv

@@ -10,7 +10,6 @@
 100008,MDO0008,变量设计添加,service,
 100009,MDO0009,约束条件添加,service,
 100010,MDO0010,目标函数添加,service,
-
 100011,MDO0011,初始化求解参数,service,
 100012,MDO0012,求解输入参数查询,service,
 100013,MDO0013,求解输入参数添加修改,service,
@@ -22,7 +21,7 @@
 100019,MDO0019,进化优化器参数添加修改,service,
 100020,MDO0020,求解,service,
 100021,MDO0021,求解过程变量数据获取,service,
-
 100022,MDO0022,变量设计查询,service,
 100023,MDO0023,约束条件查询,service,
-100024,MDO0024,目标函数查询,service,
+100024,MDO0024,目标函数查询,service,
+100025,MDO0025,求解日志获取,service,

+ 2 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0025_A(求解日志获取).csv

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

+ 2 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0025_D(求解日志获取).csv

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