文件上传下载

definitionsrc/returncode/returncode-business.properties

@@ -81,3 +81,7 @@ EB4000003 = \u5206\u7247\u6587\u4EF6\u9519\u8BEF\uFF01
 EB4000004 = \u9879\u76EE\u6C42\u89E3\u5668\u540C\u7C7B\u578B\u591A\u6761\uFF01
 EB4000005 = \u9879\u76EE\u7EDF\u4E00\u6C42\u89E3\u591A\u73AF\u5883\u914D\u7F6E\u4E0D\u652F\u6301\uFF01
 EB4000006 = \u914D\u7F6E\u53C2\u6570json\u683C\u5F0F\u9519\u8BEF\uFF01
+EB4000007 = \u914D\u7F6EID\u672A\u67E5\u5230\u914D\u7F6E\u5DE5\u51B5\u6570\u636E\uFF01
+EB4000008 = \u914D\u7F6EID\u672A\u67E5\u5230\u9879\u76EE\u6570\u636E\uFF01
+EB4000009 = \u914D\u7F6EID\u672A\u67E5\u5230solver\u6570\u636E\uFF01
+EB4000010 = \u65E0\u51E0\u4F55\u6570\u636E\uFF01

definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -81,3 +81,7 @@ EB4000003 = \u5206\u7247\u6587\u4EF6\u9519\u8BEF\uFF01
 EB4000004 = \u9879\u76EE\u6C42\u89E3\u5668\u540C\u7C7B\u578B\u591A\u6761\uFF01
 EB4000005 = \u9879\u76EE\u7EDF\u4E00\u6C42\u89E3\u591A\u73AF\u5883\u914D\u7F6E\u4E0D\u652F\u6301\uFF01
 EB4000006 = \u914D\u7F6E\u53C2\u6570json\u683C\u5F0F\u9519\u8BEF\uFF01
+EB4000007 = \u914D\u7F6EID\u672A\u67E5\u5230\u914D\u7F6E\u5DE5\u51B5\u6570\u636E\uFF01
+EB4000008 = \u914D\u7F6EID\u672A\u67E5\u5230\u9879\u76EE\u6570\u636E\uFF01
+EB4000009 = \u914D\u7F6EID\u672A\u67E5\u5230solver\u6570\u636E\uFF01
+EB4000010 = \u65E0\u51E0\u4F55\u6570\u636E\uFF01

generated/com/miniframe/generate/business/system/model/C00005BaseModel.java

@@ -16,7 +16,7 @@ import com.miniframe.generate.comm.system.A_C00005;
 import com.miniframe.generate.comm.system.D_C00005;
 
 /**
- * 系统服务,“获取统计信息”模型类（不要维护，重新生成将覆盖）。
+ * 系统服务,“项目求解”模型类（不要维护，重新生成将覆盖）。
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class C00005BaseModel extends BaseMapModel {

generated/com/miniframe/generate/comm/httpclientapater/C00005Client.java

@@ -24,7 +24,7 @@ public class C00005Client {
 	}
 
 	/**
-	 * 调用 [系统服务->获取统计信息((C00005)]的通讯接口
+	 * 调用 [系统服务->项目求解((C00005)]的通讯接口
 	 * @param model 接口模型
 	 * @param extMap 扩展输入
 	 * @param url 请求地址

generated/com/miniframe/generate/comm/system/A_C00005.java

@@ -5,47 +5,21 @@ package com.miniframe.generate.comm.system;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
 /**
- * 获取统计信息
+ * 项目求解
  */
 public class A_C00005 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	String startTime;//开始时间
+	String solverConfigid;//求解配置Id
 	/**
-	 *开始时间
+	 *求解配置Id
 	 */
-	public void setStartTime(String startTime) {
-		this.startTime=startTime;
+	public void setSolverConfigid(String solverConfigid) {
+		this.solverConfigid=solverConfigid;
 	}
 	/**
-	 *开始时间
+	 *求解配置Id
 	 */
-	public String getStartTime() {
-		return this.startTime;
-	}
-	String endTime;//结束时间
-	/**
-	 *结束时间
-	 */
-	public void setEndTime(String endTime) {
-		this.endTime=endTime;
-	}
-	/**
-	 *结束时间
-	 */
-	public String getEndTime() {
-		return this.endTime;
-	}
-	String type;//统计类型(0-全部 1-用户 2-部门)
-	/**
-	 *统计类型(0-全部 1-用户 2-部门)
-	 */
-	public void setType(String type) {
-		this.type=type;
-	}
-	/**
-	 *统计类型(0-全部 1-用户 2-部门)
-	 */
-	public String getType() {
-		return this.type;
+	public String getSolverConfigid() {
+		return this.solverConfigid;
 	}
 }

generated/com/miniframe/generate/comm/system/D_C00003.java

@@ -87,4 +87,69 @@ public class D_C00003 extends BaseMapModel implements Serializable {
 	public String getParameterObj() {
 		return this.parameterObj;
 	}
+	String name;//求解工况名称
+	/**
+	 *求解工况名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *求解工况名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	int solverNum;//求解次数
+	/**
+	 *求解次数
+	 */
+	public void setSolverNum(int solverNum) {
+		this.solverNum=solverNum;
+	}
+	/**
+	 *求解次数
+	 */
+	public int getSolverNum() {
+		return this.solverNum;
+	}
+	int state;//状态
+	/**
+	 *状态
+	 */
+	public void setState(int state) {
+		this.state=state;
+	}
+	/**
+	 *状态
+	 */
+	public int getState() {
+		return this.state;
+	}
+	String solverStime;//求解开始时间
+	/**
+	 *求解开始时间
+	 */
+	public void setSolverStime(String solverStime) {
+		this.solverStime=solverStime;
+	}
+	/**
+	 *求解开始时间
+	 */
+	public String getSolverStime() {
+		return this.solverStime;
+	}
+	String solverEtime;//q求解结束时间
+	/**
+	 *q求解结束时间
+	 */
+	public void setSolverEtime(String solverEtime) {
+		this.solverEtime=solverEtime;
+	}
+	/**
+	 *q求解结束时间
+	 */
+	public String getSolverEtime() {
+		return this.solverEtime;
+	}
 }

generated/com/miniframe/generate/comm/system/D_C00005.java

@@ -4,153 +4,9 @@
 package com.miniframe.generate.comm.system;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
-import java.util.*;
 /**
- * 获取统计信息
+ * 项目求解
  */
 public class D_C00005 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	String totalUploadFile;//总上传文件数
-	/**
-	 *总上传文件数
-	 */
-	public void setTotalUploadFile(String totalUploadFile) {
-		this.totalUploadFile=totalUploadFile;
-	}
-	/**
-	 *总上传文件数
-	 */
-	public String getTotalUploadFile() {
-		return this.totalUploadFile;
-	}
-	String totalProject;//总项目数
-	/**
-	 *总项目数
-	 */
-	public void setTotalProject(String totalProject) {
-		this.totalProject=totalProject;
-	}
-	/**
-	 *总项目数
-	 */
-	public String getTotalProject() {
-		return this.totalProject;
-	}
-	String user;//注册用户数
-	/**
-	 *注册用户数
-	 */
-	public void setUser(String user) {
-		this.user=user;
-	}
-	/**
-	 *注册用户数
-	 */
-	public String getUser() {
-		return this.user;
-	}
-	String activeUser;//当前活跃用户数
-	/**
-	 *当前活跃用户数
-	 */
-	public void setActiveUser(String activeUser) {
-		this.activeUser=activeUser;
-	}
-	/**
-	 *当前活跃用户数
-	 */
-	public String getActiveUser() {
-		return this.activeUser;
-	}
-	String totalNotary;//总申请公证数
-	/**
-	 *总申请公证数
-	 */
-	public void setTotalNotary(String totalNotary) {
-		this.totalNotary=totalNotary;
-	}
-	/**
-	 *总申请公证数
-	 */
-	public String getTotalNotary() {
-		return this.totalNotary;
-	}
-	String totalUpChain;//总上链数
-	/**
-	 *总上链数
-	 */
-	public void setTotalUpChain(String totalUpChain) {
-		this.totalUpChain=totalUpChain;
-	}
-	/**
-	 *总上链数
-	 */
-	public String getTotalUpChain() {
-		return this.totalUpChain;
-	}
-	List <D_C00005_FILELIST_RECODE> fileList;//最新项目文件
-	/**
-	 *最新项目文件
-	 */
-	public void setFileList(List <D_C00005_FILELIST_RECODE> fileList) {
-		this.fileList=fileList;
-	}
-	/**
-	 *最新项目文件
-	 */
-	public List <D_C00005_FILELIST_RECODE> getFileList() {
-		return this.fileList;
-	}
-	List <D_C00005_UPCHAINTREND_RECODE> upchainTrend;//上链走势
-	/**
-	 *上链走势
-	 */
-	public void setUpchainTrend(List <D_C00005_UPCHAINTREND_RECODE> upchainTrend) {
-		this.upchainTrend=upchainTrend;
-	}
-	/**
-	 *上链走势
-	 */
-	public List <D_C00005_UPCHAINTREND_RECODE> getUpchainTrend() {
-		return this.upchainTrend;
-	}
-	List <D_C00005_UPCHAININFO_RECODE> upchainInfo;//上链信息
-	/**
-	 *上链信息
-	 */
-	public void setUpchainInfo(List <D_C00005_UPCHAININFO_RECODE> upchainInfo) {
-		this.upchainInfo=upchainInfo;
-	}
-	/**
-	 *上链信息
-	 */
-	public List <D_C00005_UPCHAININFO_RECODE> getUpchainInfo() {
-		return this.upchainInfo;
-	}
-	List <D_C00005_FILEMEDIA_RECODE> fileMedia;//文件来源
-	/**
-	 *文件来源
-	 */
-	public void setFileMedia(List <D_C00005_FILEMEDIA_RECODE> fileMedia) {
-		this.fileMedia=fileMedia;
-	}
-	/**
-	 *文件来源
-	 */
-	public List <D_C00005_FILEMEDIA_RECODE> getFileMedia() {
-		return this.fileMedia;
-	}
-	List <D_C00005_FILETYPE_RECODE> fileType;//文件类型
-	/**
-	 *文件类型
-	 */
-	public void setFileType(List <D_C00005_FILETYPE_RECODE> fileType) {
-		this.fileType=fileType;
-	}
-	/**
-	 *文件类型
-	 */
-	public List <D_C00005_FILETYPE_RECODE> getFileType() {
-		return this.fileType;
-	}
 }

generated/validateform/d_c00003Form.xml

@@ -0,0 +1,35 @@
+<?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="d_c00003Form">
+<field property="solverStime" depends="minlength,maxlength">
+    <arg0 key="d_c00003.solverStime"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>2048</var-value>
+    </var>
+</field>
+<field property="solverEtime" depends="minlength,maxlength">
+    <arg0 key="d_c00003.solverEtime"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>1</var-value>
+    </var>
+    <arg1 name="maxlength" key="${var:maxlength}"/>
+    <var>
+      <var-name>maxlength</var-name>
+      <var-value>128</var-value>
+    </var>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_c00005Form_validator.properties

@@ -1,4 +1,2 @@
-a_c00005.startTime = \u5F00\u59CB\u65F6\u95F4
-a_c00005.endTime = \u7ED3\u675F\u65F6\u95F4
-a_c00005.type = \u7EDF\u8BA1\u7C7B\u578B(0-\u5168\u90E81-\u7528\u62372-\u90E8\u95E8)
+a_c00005.solverConfigid = \u6C42\u89E3\u914D\u7F6EId
 a_c00005Form = true

generated/validator/resources_a_c00005Form_validator_zh_CN.properties

@@ -1,4 +1,2 @@
-a_c00005.startTime = \u5F00\u59CB\u65F6\u95F4
-a_c00005.endTime = \u7ED3\u675F\u65F6\u95F4
-a_c00005.type = \u7EDF\u8BA1\u7C7B\u578B(0-\u5168\u90E81-\u7528\u62372-\u90E8\u95E8)
+a_c00005.solverConfigid = \u6C42\u89E3\u914D\u7F6EId
 a_c00005Form = true

generated/validator/resources_d_c00003Form_validator.properties

@@ -4,4 +4,9 @@ d_c00003.solverModel = \u6C42\u89E3\u5668
 d_c00003.solverid = \u6C42\u89E3\u5668ID
 d_c00003.solverConfigid = \u6C42\u89E3\u914D\u7F6EId
 d_c00003.parameterObj = \u6C42\u89E3\u53C2\u6570
+d_c00003.name = \u6C42\u89E3\u5DE5\u51B5\u540D\u79F0
+d_c00003.solverNum = \u6C42\u89E3\u6B21\u6570
+d_c00003.state = \u72B6\u6001
+d_c00003.solverStime = \u6C42\u89E3\u5F00\u59CB\u65F6\u95F4
+d_c00003.solverEtime = q\u6C42\u89E3\u7ED3\u675F\u65F6\u95F4
 d_c00003Form = true

generated/validator/resources_d_c00003Form_validator_zh_CN.properties

@@ -4,4 +4,9 @@ d_c00003.solverModel = \u6C42\u89E3\u5668
 d_c00003.solverid = \u6C42\u89E3\u5668ID
 d_c00003.solverConfigid = \u6C42\u89E3\u914D\u7F6EId
 d_c00003.parameterObj = \u6C42\u89E3\u53C2\u6570
+d_c00003.name = \u6C42\u89E3\u5DE5\u51B5\u540D\u79F0
+d_c00003.solverNum = \u6C42\u89E3\u6B21\u6570
+d_c00003.state = \u72B6\u6001
+d_c00003.solverStime = \u6C42\u89E3\u5F00\u59CB\u65F6\u95F4
+d_c00003.solverEtime = q\u6C42\u89E3\u7ED3\u675F\u65F6\u95F4
 d_c00003Form = true

generated/validator/resources_d_c00005Form_validator.properties

@@ -1,7 +1 @@
-d_c00005.totalUploadFile = \u603B\u4E0A\u4F20\u6587\u4EF6\u6570
-d_c00005.totalProject = \u603B\u9879\u76EE\u6570
-d_c00005.user = \u6CE8\u518C\u7528\u6237\u6570
-d_c00005.activeUser = \u5F53\u524D\u6D3B\u8DC3\u7528\u6237\u6570
-d_c00005.totalNotary = \u603B\u7533\u8BF7\u516C\u8BC1\u6570
-d_c00005.totalUpChain = \u603B\u4E0A\u94FE\u6570
-d_c00005Form = true
+d_c00005Form = false

generated/validator/resources_d_c00005Form_validator_zh_CN.properties

@@ -1,7 +1 @@
-d_c00005.totalUploadFile = \u603B\u4E0A\u4F20\u6587\u4EF6\u6570
-d_c00005.totalProject = \u603B\u9879\u76EE\u6570
-d_c00005.user = \u6CE8\u518C\u7528\u6237\u6570
-d_c00005.activeUser = \u5F53\u524D\u6D3B\u8DC3\u7528\u6237\u6570
-d_c00005.totalNotary = \u603B\u7533\u8BF7\u516C\u8BC1\u6570
-d_c00005.totalUpChain = \u603B\u4E0A\u94FE\u6570
-d_c00005Form = true
+d_c00005Form = false

modelsrc/com/miniframe/model/system/AdiSolverConfig.java

@@ -48,6 +48,34 @@ public class AdiSolverConfig extends MiniserviceBaseModel implements Serializabl
     @Column(name = "update_time")
     private Date updateTime;
 
+    /**
+     * 求解配置工况名称
+     */
+    private String name;
+
+    /**
+     * 状态
+     */
+    private Short state;
+
+    /**
+     * 求解次数
+     */
+    @Column(name = "solver_num")
+    private Long solverNum;
+
+    /**
+     * 求解开始时间
+     */
+    @Column(name = "solver_stime")
+    private Date solverStime;
+
+    /**
+     * 求解结束时间
+     */
+    @Column(name = "solver_etime")
+    private Date solverEtime;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -183,4 +211,94 @@ public class AdiSolverConfig extends MiniserviceBaseModel implements Serializabl
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    /**
+     * 获取求解配置工况名称
+     *
+     * @return name - 求解配置工况名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置求解配置工况名称
+     *
+     * @param name 求解配置工况名称
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * 获取状态
+     *
+     * @return state - 状态
+     */
+    public Short getState() {
+        return state;
+    }
+
+    /**
+     * 设置状态
+     *
+     * @param state 状态
+     */
+    public void setState(Short state) {
+        this.state = state;
+    }
+
+    /**
+     * 获取求解次数
+     *
+     * @return solver_num - 求解次数
+     */
+    public Long getSolverNum() {
+        return solverNum;
+    }
+
+    /**
+     * 设置求解次数
+     *
+     * @param solverNum 求解次数
+     */
+    public void setSolverNum(Long solverNum) {
+        this.solverNum = solverNum;
+    }
+
+    /**
+     * 获取求解开始时间
+     *
+     * @return solver_stime - 求解开始时间
+     */
+    public Date getSolverStime() {
+        return solverStime;
+    }
+
+    /**
+     * 设置求解开始时间
+     *
+     * @param solverStime 求解开始时间
+     */
+    public void setSolverStime(Date solverStime) {
+        this.solverStime = solverStime;
+    }
+
+    /**
+     * 获取求解结束时间
+     *
+     * @return solver_etime - 求解结束时间
+     */
+    public Date getSolverEtime() {
+        return solverEtime;
+    }
+
+    /**
+     * 设置求解结束时间
+     *
+     * @param solverEtime 求解结束时间
+     */
+    public void setSolverEtime(Date solverEtime) {
+        this.solverEtime = solverEtime;
+    }
 }

modelsrc/com/miniframe/model/system/AdiSolverConfigSQLBuilder.java

@@ -574,6 +574,316 @@ public class AdiSolverConfigSQLBuilder {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Short value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Short value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Short value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Short value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Short value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Short value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Short> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Short> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Short value1, Short value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Short value1, Short value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumIsNull() {
+            addCriterion("solver_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumIsNotNull() {
+            addCriterion("solver_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumEqualTo(Long value) {
+            addCriterion("solver_num =", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumNotEqualTo(Long value) {
+            addCriterion("solver_num <>", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumGreaterThan(Long value) {
+            addCriterion("solver_num >", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumGreaterThanOrEqualTo(Long value) {
+            addCriterion("solver_num >=", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumLessThan(Long value) {
+            addCriterion("solver_num <", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumLessThanOrEqualTo(Long value) {
+            addCriterion("solver_num <=", value, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumIn(List<Long> values) {
+            addCriterion("solver_num in", values, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumNotIn(List<Long> values) {
+            addCriterion("solver_num not in", values, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumBetween(Long value1, Long value2) {
+            addCriterion("solver_num between", value1, value2, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverNumNotBetween(Long value1, Long value2) {
+            addCriterion("solver_num not between", value1, value2, "solverNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeIsNull() {
+            addCriterion("solver_stime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeIsNotNull() {
+            addCriterion("solver_stime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeEqualTo(Date value) {
+            addCriterion("solver_stime =", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeNotEqualTo(Date value) {
+            addCriterion("solver_stime <>", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeGreaterThan(Date value) {
+            addCriterion("solver_stime >", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("solver_stime >=", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeLessThan(Date value) {
+            addCriterion("solver_stime <", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeLessThanOrEqualTo(Date value) {
+            addCriterion("solver_stime <=", value, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeIn(List<Date> values) {
+            addCriterion("solver_stime in", values, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeNotIn(List<Date> values) {
+            addCriterion("solver_stime not in", values, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeBetween(Date value1, Date value2) {
+            addCriterion("solver_stime between", value1, value2, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverStimeNotBetween(Date value1, Date value2) {
+            addCriterion("solver_stime not between", value1, value2, "solverStime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeIsNull() {
+            addCriterion("solver_etime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeIsNotNull() {
+            addCriterion("solver_etime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeEqualTo(Date value) {
+            addCriterion("solver_etime =", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeNotEqualTo(Date value) {
+            addCriterion("solver_etime <>", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeGreaterThan(Date value) {
+            addCriterion("solver_etime >", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("solver_etime >=", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeLessThan(Date value) {
+            addCriterion("solver_etime <", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeLessThanOrEqualTo(Date value) {
+            addCriterion("solver_etime <=", value, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeIn(List<Date> values) {
+            addCriterion("solver_etime in", values, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeNotIn(List<Date> values) {
+            addCriterion("solver_etime not in", values, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeBetween(Date value1, Date value2) {
+            addCriterion("solver_etime between", value1, value2, "solverEtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSolverEtimeNotBetween(Date value1, Date value2) {
+            addCriterion("solver_etime not between", value1, value2, "solverEtime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Wed Aug 10 10:41:39 CST 2022.
+    This file was generated on Mon Oct 17 11:20:21 CST 2022.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/system/B00029Service.java

@@ -4,6 +4,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 
@@ -50,12 +54,16 @@ public class B00029Service extends B00029BaseModel implements ExecProcessFlow {
 			throw new BusinessException("EB4000003");
 		}
 		merge(bfile, sonFiles);
+
+
 		for (SysFile tmp:sonFiles) {
 			File file =new File(XIFileUtils.getRootPathStr()+ MFConstant.separator+tmp.getFilepath());
 			file.delete();
 			sysFileDAO.deleteByPrimaryKey(tmp.getId());
 		}
 		bfile.setNeedop("1");
+		Path path = Paths.get(XIFileUtils.getRootPathStr() + MFConstant.separator + bfile.getFilepath());
+		bfile.setFilesize(BigDecimal.valueOf(Files.size(path)));
 		sysFileDAO.updateByPrimaryKey(bfile);
 	}
 

src/main/java/com/miniframe/bisiness/system/C00003Service.java

@@ -73,6 +73,11 @@ public class C00003Service extends C00003BaseModel implements ExecProcessFlow {
 		getD_c00003().setPid(pid);
 		getD_c00003().setSolverid(solver.getId());
 		getD_c00003().setSolverModel(solverModel);
+		getD_c00003().setName(solverConfig.getName());
+		getD_c00003().setState(solverConfig.getState());
+		getD_c00003().setSolverNum(solverConfig.getSolverNum().intValue());
+		getD_c00003().setSolverStime(XIDateTimeUtils.getStrFromDate(solverConfig.getSolverStime()));
+		getD_c00003().setSolverEtime(XIDateTimeUtils.getStrFromDate(solverConfig.getSolverEtime()));
 	}
 
 	private AdiSolverConfig initSolverConfig(String pid, String company, String solverModel, Date now, AdiSolverConfigMapper configMapper, AdiSolver solver) throws BusinessException {
@@ -97,6 +102,9 @@ public class C00003Service extends C00003BaseModel implements ExecProcessFlow {
 		}
 		solverConfig.setCreateTime(now);
 		solverConfig.setUpdateTime(now);
+		solverConfig.setName("默认工况1");
+        solverConfig.setState(new Short("0"));//未求解
+        solverConfig.setSolverNum(0l);//未求解
 		configMapper.insert(solverConfig);
 		return solverConfig;
 	}

src/main/java/com/miniframe/bisiness/system/C00005Service.java

@@ -0,0 +1,95 @@
+package com.miniframe.bisiness.system;
+
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.C00005BaseModel;
+import com.miniframe.model.system.*;
+import com.miniframe.model.system.dao.AdiModelingMapper;
+import com.miniframe.model.system.dao.AdiProjectMapper;
+import com.miniframe.model.system.dao.AdiSolverConfigMapper;
+import com.miniframe.model.system.dao.AdiSolverMapper;
+import com.miniframe.solveconfig.fem.FEMParam;
+import com.miniframe.solveconfig.hcfd.HcfdParam;
+import com.miniframe.tools.XiJsonUtil;
+
+/**
+ * 基础系统,“求解”逻辑处理（重新生成不覆盖）。
+ */
+public class C00005Service extends C00005BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“求解”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String solverConfigId = getA_c00005().getSolverConfigid();
+		String uid =getA_systemhead().getUserId();
+		AdiSolverConfigMapper configMapper = UtilTools.getBean(AdiSolverConfigMapper.class);
+		AdiSolverConfig config = configMapper.selectByPrimaryKey(solverConfigId);
+		if(null==config){
+			throw  new BusinessException("EB4000007");
+		}
+
+		AdiSolverMapper solverMapper  = UtilTools.getBean(AdiSolverMapper.class);
+		AdiSolver solver = solverMapper.selectByPrimaryKey(config.getSolverid());
+		if(null==solver){
+			throw  new BusinessException("EB4000009");
+		}
+		AdiProjectMapper projectMapper = UtilTools.getBean(AdiProjectMapper.class);
+		AdiProject project = projectMapper.selectByPrimaryKey(config.getPid());
+		if(null==project){
+			throw  new BusinessException("EB4000008");
+		}
+		AdiModelingMapper modelingMapper = UtilTools.getBean(AdiModelingMapper.class);
+		AdiModelingSQLBuilder modelingsb = new AdiModelingSQLBuilder();
+		AdiModelingSQLBuilder.Criteria modelingsc = modelingsb.createCriteria();
+		modelingsc.andPidEqualTo(project.getId());
+		List<AdiModeling> modelingList = modelingMapper.selectByExample(modelingsb);
+		if(null==modelingList||modelingList.isEmpty()){
+			throw  new BusinessException("EB4000010");
+		}
+		AdiModeling modeling = modelingList.get(0);
+		if(solver.getCompany().equals("Adi.SimWork")&& solver.getSolverModel().equals("HCFDLab")){
+			HcfdParam param = XiJsonUtil.jsonToPojo(config.getParameterObj(),HcfdParam.class);
+		}
+		if(solver.getCompany().equals("Adi.SimWork")&& solver.getSolverModel().equals("FEMLab（结构力学）")){
+			FEMParam param =XiJsonUtil.jsonToPojo(config.getParameterObj(),FEMParam.class);
+		}
+
+
+	}
+	
+	/**
+	 * 基础系统,“求解”业务前处理
+ 	 */
+	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();
+	}
+
+}

src/main/java/com/miniframe/service/impl/FileServiceImpl.java

@@ -23,25 +23,25 @@ public class FileServiceImpl implements IMFFileService {
     public MFFileInfo getDownloadFileInfo(String param,Map reqMap) throws Exception{
         MFFileInfo fileInfo=null;
 
-//        String fileId=param;
-//        SysFileMapper fileMapper = UtilTools.getBean(SysFileMapper.class);
-//        SysFile getFile = fileMapper.selectByPrimaryKey(fileId);
-//        if (null != getFile) {
-//            Path path = XIFileUtils.getAbsolutePath(getFile.getFilepath());
-//
-//            fileInfo=new MFFileInfo();
-//            fileInfo.setFileName(getFile.getFilename());
-//            fileInfo.setMimeType(MFMimeTypeUtils.getMimeType(path));
-//            fileInfo.setFilePath(path);
-//
-//        }
+        String fileId=param;
+        SysFileMapper fileMapper = UtilTools.getBean(SysFileMapper.class);
+        SysFile getFile = fileMapper.selectByPrimaryKey(fileId);
+        if (null != getFile) {
+            Path path = XIFileUtils.getAbsolutePath(getFile.getFilepath());
 
-        Path path = XIFileUtils.getAbsolutePath("/opt/files/ca90760bc1fa415dbe774a5d662f1cdc-商标证书.jpg");
+            fileInfo=new MFFileInfo();
+            fileInfo.setFileName(getFile.getFilename());
+            fileInfo.setMimeType(MFMimeTypeUtils.getMimeType(path));
+            fileInfo.setFilePath(path);
 
-        fileInfo=new MFFileInfo();
-        fileInfo.setFileName(path.getFileName().toString());
-        fileInfo.setMimeType(MFMimeTypeUtils.getMimeType(path));
-        fileInfo.setFilePath(path);
+        }
+
+//        Path path = XIFileUtils.getAbsolutePath("/opt/files/ca90760bc1fa415dbe774a5d662f1cdc-商标证书.jpg");
+//
+//        fileInfo=new MFFileInfo();
+//        fileInfo.setFileName(path.getFileName().toString());
+//        fileInfo.setMimeType(MFMimeTypeUtils.getMimeType(path));
+//        fileInfo.setFilePath(path);
 
         return fileInfo;
     }

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

@@ -91,4 +91,12 @@
 4000003,EB4000003,分片文件错误！
 4000004,EB4000004,项目求解器同类型多条！
 4000005,EB4000005,项目统一求解多环境配置不支持！
-4000006,EB4000006,配置参数json 格式错误！
+4000006,EB4000006,配置参数json 格式错误！
+
+4000007,EB4000007,配置ID未查到配置工况数据！
+4000008,EB4000008,配置ID未查到项目数据！
+4000009,EB4000009,配置ID未查到solver数据！
+4000010,EB4000010,无几何数据！
+
+
+

系统设计/系统模块/SYSTEM(基础系统).csv

@@ -26,3 +26,4 @@
 300002,C00002,项目保存,service,,
 300003,C00003,项目求解查询,service,,
 300004,C00004,项目求解配置信息保存,service,,
+300005,C00005,求解,service,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00003_D(项目求解查询).csv

@@ -4,4 +4,9 @@
 3,solverModel,求解器,string,,,,,,,,,,,
 4,solverid,求解器ID,string,,,,,,,,,,,
 5,solverConfigid,求解配置Id,string,,,,,,,,,,,
-6,parameterObj,求解参数,string,,,,,,,,,,,
+6,parameterObj,求解参数,string,,,,,,,,,,,
+7,name,求解工况名称,string,,,,,,,,,,,
+8,solverNum,求解次数,int,,,,,,,,,,,
+9,state,状态,int,,,,,,,,,,,
+10,solverStime,求解开始时间,string,,,,1,2048,,,,,,
+11,solverEtime,q求解结束时间,string,,,,1,128,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00005_A(项目求解).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/C00005_D(项目求解).csv

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