huangxingxing 3 månader sedan
förälder
incheckning
21ade79fc0
21 ändrade filer med 405 tillägg och 2 borttagningar
  1. 1 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0013BaseModel.java
  3. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0013.java
  4. 26 0
      generated/com/miniframe/generate/comm/es/D_ES0004.java
  5. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0013.java
  6. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0013Client.java
  7. 12 0
      generated/validateform/a_es0013Form.xml
  8. 6 0
      generated/validateform/d_es0004Form.xml
  9. 2 0
      generated/validator/resources_a_es0013Form_validator.properties
  10. 2 0
      generated/validator/resources_a_es0013Form_validator_zh_CN.properties
  11. 2 0
      generated/validator/resources_d_es0004Form_validator.properties
  12. 2 0
      generated/validator/resources_d_es0004Form_validator_zh_CN.properties
  13. 1 0
      generated/validator/resources_d_es0013Form_validator.properties
  14. 1 0
      generated/validator/resources_d_es0013Form_validator_zh_CN.properties
  15. 2 0
      src/main/java/com/miniframe/bisiness/es/ES0004Service.java
  16. 48 0
      src/main/java/com/miniframe/bisiness/es/ES0013Service.java
  17. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0013Test.java
  18. 2 1
      系统设计/系统模块/ES(无锡发动机).csv
  19. 3 1
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0004_D(项目添加组件).csv
  20. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0013_A(项目求解).csv
  21. 1 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0013_D(项目求解).csv

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

@@ -14,6 +14,7 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0010', '无锡发动机','项目组件属性值数据查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0011', '无锡发动机','项目组件属性值数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0012', '无锡发动机','项目模拟数据组件属性查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0013', '无锡发动机','项目求解',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES1001', '无锡发动机','组件查询',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0013BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.es.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.es.A_ESHEAD;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+import com.miniframe.generate.comm.es.A_ES0013;
+import com.miniframe.generate.comm.es.D_ES0013;
+
+/**
+ * 无锡发动机,“项目求解”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0013BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0013 a_es0013;//上行体
+	D_ES0013 d_es0013;//下行体
+
+	public ES0013BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0013=new A_ES0013();
+		d_es0013=new D_ES0013();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0013.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_ESHEAD.class);
+		this.a_eshead = UtilTools.map2Obj(headMap, A_ESHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_ES0013.class);
+		this.a_es0013 = UtilTools.map2Obj(bodyMap, A_ES0013.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_eshead).getTransCode())){
+			(this.d_eshead).setTransCode((this.a_eshead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_eshead).getChannelNo())){
+			(this.d_eshead).setChannelNo((this.a_eshead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_eshead).getUserId())){
+			(this.d_eshead).setUserId((this.a_eshead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_eshead).getTransTime())){
+            (this.d_eshead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_eshead));
+		reMap.putAll(UtilTools.obj2Map(this.d_es0013));
+
+		return reMap;
+	}
+
+	public A_ESHEAD getA_eshead() {
+		return this.a_eshead;
+	}
+
+	public void setA_eshead(A_ESHEAD a_eshead) {
+		this.a_eshead=a_eshead;
+	}
+
+	public D_ESHEAD getD_eshead() {
+		return d_eshead;
+	}
+
+	public void setD_eshead(D_ESHEAD d_eshead) {
+		this.d_eshead=d_eshead;
+	}
+
+	public A_ES0013 getA_es0013() {
+		return a_es0013;
+	}
+
+	public void setA_es0013(A_ES0013 a_es0013) {
+		this.a_es0013=a_es0013;
+	}
+
+	public D_ES0013 getD_es0013() {
+		return this.d_es0013;
+	}
+
+	public void setD_es0013(D_ES0013 d_es0013) {
+		this.d_es0013=d_es0013;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 25 - 0
generated/com/miniframe/generate/comm/es/A_ES0013.java

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解
+ */
+public class A_ES0013 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;
+	}
+}

+ 26 - 0
generated/com/miniframe/generate/comm/es/D_ES0004.java

@@ -22,4 +22,30 @@ public class D_ES0004 extends BaseMapModel implements Serializable {
 	public String getPcId() {
 		return this.pcId;
 	}
+	int ser;//序号
+	/**
+	 *序号
+	 */
+	public void setSer(int ser) {
+		this.ser=ser;
+	}
+	/**
+	 *序号
+	 */
+	public int getSer() {
+		return this.ser;
+	}
+	String idCode;//组件id编码
+	/**
+	 *组件id编码
+	 */
+	public void setIdCode(String idCode) {
+		this.idCode=idCode;
+	}
+	/**
+	 *组件id编码
+	 */
+	public String getIdCode() {
+		return this.idCode;
+	}
 }

+ 12 - 0
generated/com/miniframe/generate/comm/es/D_ES0013.java

@@ -0,0 +1,12 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目求解
+ */
+public class D_ES0013 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/ES0013Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpesapater;
+
+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.es.D_ES0013;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+
+import com.miniframe.generate.business.es.model.ES0013BaseModel;
+
+public class ES0013Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0013Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [无锡发动机->项目求解((ES0013)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0013BaseModel execute(ES0013BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0013BaseModel execute(ES0013BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(ES0013BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0013BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_eshead().getTransCode())){
+			model.getA_eshead().setTransCode("ES0013");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_eshead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_es0013()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpesApater = (Transmitter) UtilTools.getBean("httpesApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpesApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpesApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_ESHEAD d_eshead =  UtilTools.map2Obj(outMap, D_ESHEAD.class);
+			D_ES0013 d_es0013 =  UtilTools.map2Obj(outMap, D_ES0013.class);
+			model.setD_eshead(d_eshead);
+			model.setD_es0013(d_es0013);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0013BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0013BaseModel execute(ES0013BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

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

+ 6 - 0
generated/validateform/d_es0004Form.xml

@@ -7,6 +7,12 @@
 <field property="pcId" depends="required">
     <arg0 key="d_es0004.pcId"/>
 </field>
+<field property="ser" depends="required">
+    <arg0 key="d_es0004.ser"/>
+</field>
+<field property="idCode" depends="required">
+    <arg0 key="d_es0004.idCode"/>
+</field>
 </form>
 </formset>
 </form-validation>

+ 2 - 0
generated/validator/resources_a_es0013Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0013.pid = \u9879\u76EEId
+a_es0013Form = true

+ 2 - 0
generated/validator/resources_a_es0013Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0013.pid = \u9879\u76EEId
+a_es0013Form = true

+ 2 - 0
generated/validator/resources_d_es0004Form_validator.properties

@@ -1,2 +1,4 @@
 d_es0004.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+d_es0004.ser = \u5E8F\u53F7
+d_es0004.idCode = \u7EC4\u4EF6id\u7F16\u7801
 d_es0004Form = true

+ 2 - 0
generated/validator/resources_d_es0004Form_validator_zh_CN.properties

@@ -1,2 +1,4 @@
 d_es0004.pcId = \u9879\u76EE\u7EC4\u4EF6Id
+d_es0004.ser = \u5E8F\u53F7
+d_es0004.idCode = \u7EC4\u4EF6id\u7F16\u7801
 d_es0004Form = true

+ 1 - 0
generated/validator/resources_d_es0013Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0013Form_validator_zh_CN.properties

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

+ 2 - 0
src/main/java/com/miniframe/bisiness/es/ES0004Service.java

@@ -39,6 +39,8 @@ public class ES0004Service extends ES0004BaseModel implements ExecProcessFlow {
 		EsProCom pc =savePc(pid, c, uid);
 		savePca(pid, uid, pc);
 		this.getD_es0004().setPcId(pc.getPcId());
+		this.getD_es0004().setSer(pc.getSer());
+		this.getD_es0004().setIdCode(pc.getIdCode());
 	}
 
 	private void savePca(String pid, String uid, EsProCom pc) {

+ 48 - 0
src/main/java/com/miniframe/bisiness/es/ES0013Service.java

@@ -0,0 +1,48 @@
+package com.miniframe.bisiness.es;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.generate.business.es.model.ES0013BaseModel;
+
+/**
+ * 无锡发动机,“项目求解”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“项目求解”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+	
+	}
+	
+	/**
+	 * 无锡发动机,“项目求解”业务前处理
+ 	 */
+	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/httpesapater/ES0013Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpesapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpesapater.HttpesapaterUtil;
+import com.miniframe.generate.comm.es.A_ES0013;
+import com.miniframe.generate.comm.httpesapater.ES0013Client;
+import com.miniframe.generate.business.es.model.ES0013BaseModel;
+
+public class ES0013Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0013Test.class);
+
+	/**
+	 * 项目求解,获取报文体
+	 * @return
+	 */
+	public static A_ES0013 getA_es0013() {
+		A_ES0013 a_es0013 = new A_ES0013();
+
+		// ----------以下增加【项目求解】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0013;
+	}
+	
+	/**
+	 * 运行客户端测试,项目求解
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0013BaseModel model = new ES0013BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0013"));
+		model.setA_es0013(ES0013Test.getA_es0013());
+		ES0013Client client = new ES0013Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 2 - 1
系统设计/系统模块/ES(无锡发动机).csv

@@ -10,5 +10,6 @@
 100008,ES0009,项目组件属性查询,service,
 100010,ES0010,项目组件属性值数据查询,service,
 100011,ES0011,项目组件属性值数据添加修改,service,
-100011,ES0012,项目模拟数据组件属性查询,service,
+100012,ES0012,项目模拟数据组件属性查询,service,
+100013,ES0013,项目求解,service,
 110001,ES1001,组件查询,service,

+ 3 - 1
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0004_D(项目添加组件).csv

@@ -1,2 +1,4 @@
 "序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
-1,pcId,项目组件Id,string,,,是,,,,,,,,
+1,pcId,项目组件Id,string,,,是,,,,,,,,
+2,ser,序号,int,,,是,,,,,,,,
+3,idCode,组件id编码,string,,,是,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0013_A(项目求解).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0013_D(项目求解).csv

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