Browse Source

0804 单位系统查看

caizm 1 tháng trước cách đây
mục cha
commit
dcf4b1883d
29 tập tin đã thay đổi với 411 bổ sung46 xóa
  1. 6 5
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0024BaseModel.java
  3. 12 0
      generated/com/miniframe/generate/comm/es/A_ES0024.java
  4. 0 13
      generated/com/miniframe/generate/comm/es/D_ES0019_ROWS_RECODE.java
  5. 0 13
      generated/com/miniframe/generate/comm/es/D_ES0021_ROWS_RECODE.java
  6. 26 0
      generated/com/miniframe/generate/comm/es/D_ES0024.java
  7. 25 0
      generated/com/miniframe/generate/comm/es/D_ES0024_ROWS_RECODE.java
  8. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0024Client.java
  9. 1 0
      generated/validator/resources_a_es0024Form_validator.properties
  10. 1 0
      generated/validator/resources_a_es0024Form_validator_zh_CN.properties
  11. 0 1
      generated/validator/resources_d_es0019_rows_recodeForm_validator.properties
  12. 0 1
      generated/validator/resources_d_es0019_rows_recodeForm_validator_zh_CN.properties
  13. 2 3
      generated/validator/resources_d_es0021_rows_recodeForm_validator.properties
  14. 2 3
      generated/validator/resources_d_es0021_rows_recodeForm_validator_zh_CN.properties
  15. 1 0
      generated/validator/resources_d_es0024Form_validator.properties
  16. 1 0
      generated/validator/resources_d_es0024Form_validator_zh_CN.properties
  17. 2 0
      generated/validator/resources_d_es0024_rows_recodeForm_validator.properties
  18. 2 0
      generated/validator/resources_d_es0024_rows_recodeForm_validator_zh_CN.properties
  19. 1 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  20. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  21. 1 1
      src/main/java/com/miniframe/bisiness/es/ES0019Service.java
  22. 4 2
      src/main/java/com/miniframe/bisiness/es/ES0021Service.java
  23. 62 0
      src/main/java/com/miniframe/bisiness/es/ES0024Service.java
  24. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0024Test.java
  25. 1 0
      系统设计/系统模块/ES(无锡发动机).csv
  26. 0 1
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0019_D(单位查看).csv
  27. 0 1
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0021_D(单位组查看).csv
  28. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0024_A(单位系统查看).csv
  29. 3 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0024_D(单位系统查看).csv

+ 6 - 5
dbscript/init/generate/03-functionInit.sql

@@ -20,11 +20,12 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0016', '无锡发动机','项目模拟数据组件属性删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0017', '无锡发动机','求解日志获取',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0018', '无锡发动机','文件打包下载',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0019', '无锡发动机','系统单位查看',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0020', '无锡发动机','单位系统添加',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0021', '无锡发动机','系统单位列表查看',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0022', '无锡发动机','单位默认值设置',true);
-INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0023', '无锡发动机','单位系统切换',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0019', '无锡发动机','单位查看',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0020', '无锡发动机','系统单位添加',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0021', '无锡发动机','单位组查看',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0022', '无锡发动机','系统单位默认值设置',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0023', '无锡发动机','系统单位切换',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0024', '无锡发动机','单位系统查看',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES1001', '无锡发动机','组件查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('BES001', '无锡发动机','基础字典查询',true);
 -- 基础系统

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0024BaseModel.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_ES0024;
+import com.miniframe.generate.comm.es.D_ES0024;
+
+/**
+ * 无锡发动机,“单位系统查看”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0024BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0024 a_es0024;//上行体
+	D_ES0024 d_es0024;//下行体
+
+	public ES0024BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0024=new A_ES0024();
+		d_es0024=new D_ES0024();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0024.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_ES0024.class);
+		this.a_es0024 = UtilTools.map2Obj(bodyMap, A_ES0024.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_es0024));
+
+		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_ES0024 getA_es0024() {
+		return a_es0024;
+	}
+
+	public void setA_es0024(A_ES0024 a_es0024) {
+		this.a_es0024=a_es0024;
+	}
+
+	public D_ES0024 getD_es0024() {
+		return this.d_es0024;
+	}
+
+	public void setD_es0024(D_ES0024 d_es0024) {
+		this.d_es0024=d_es0024;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

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

@@ -0,0 +1,12 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 单位系统查看
+ */
+public class A_ES0024 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 0 - 13
generated/com/miniframe/generate/comm/es/D_ES0019_ROWS_RECODE.java

@@ -100,17 +100,4 @@ public class D_ES0019_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public double getUtOffset() {
 		return this.utOffset;
 	}
-	int ser;//序号
-	/**
-	 *序号
-	 */
-	public void setSer(int ser) {
-		this.ser=ser;
-	}
-	/**
-	 *序号
-	 */
-	public int getSer() {
-		return this.ser;
-	}
 }

+ 0 - 13
generated/com/miniframe/generate/comm/es/D_ES0021_ROWS_RECODE.java

@@ -48,17 +48,4 @@ public class D_ES0021_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getNameEn() {
 		return this.nameEn;
 	}
-	int ser;//序号
-	/**
-	 *序号
-	 */
-	public void setSer(int ser) {
-		this.ser=ser;
-	}
-	/**
-	 *序号
-	 */
-	public int getSer() {
-		return this.ser;
-	}
 }

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

@@ -0,0 +1,26 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 单位系统查看
+ */
+public class D_ES0024 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_ES0024_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_ES0024_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_ES0024_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 单位系统查看->数据
+ */
+public class D_ES0024_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String nameEn;//单位系统英文名
+	/**
+	 *单位系统英文名
+	 */
+	public void setNameEn(String nameEn) {
+		this.nameEn=nameEn;
+	}
+	/**
+	 *单位系统英文名
+	 */
+	public String getNameEn() {
+		return this.nameEn;
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/ES0024Client.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_ES0024;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+
+import com.miniframe.generate.business.es.model.ES0024BaseModel;
+
+public class ES0024Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0024Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [无锡发动机->单位系统查看((ES0024)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0024BaseModel execute(ES0024BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0024BaseModel execute(ES0024BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(ES0024BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0024BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_eshead().getTransCode())){
+			model.getA_eshead().setTransCode("ES0024");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_eshead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_es0024()));
+		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_ES0024 d_es0024 =  UtilTools.map2Obj(outMap, D_ES0024.class);
+			model.setD_eshead(d_eshead);
+			model.setD_es0024(d_es0024);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0024BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0024BaseModel execute(ES0024BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 1 - 0
generated/validator/resources_a_es0024Form_validator.properties

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

+ 1 - 0
generated/validator/resources_a_es0024Form_validator_zh_CN.properties

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

+ 0 - 1
generated/validator/resources_d_es0019_rows_recodeForm_validator.properties

@@ -5,5 +5,4 @@ d_es0019_rows_recode.nameEn = \u5355\u4F4D\u8868\u82F1\u6587\u540D
 d_es0019_rows_recode.value = \u5355\u4F4D\u8868\u503C
 d_es0019_rows_recode.factor = \u8BA1\u7B97\u56E0\u5B50
 d_es0019_rows_recode.utOffset = \u504F\u5DEE
-d_es0019_rows_recode.ser = \u5E8F\u53F7
 d_es0019_rows_recodeForm = true

+ 0 - 1
generated/validator/resources_d_es0019_rows_recodeForm_validator_zh_CN.properties

@@ -5,5 +5,4 @@ d_es0019_rows_recode.nameEn = \u5355\u4F4D\u8868\u82F1\u6587\u540D
 d_es0019_rows_recode.value = \u5355\u4F4D\u8868\u503C
 d_es0019_rows_recode.factor = \u8BA1\u7B97\u56E0\u5B50
 d_es0019_rows_recode.utOffset = \u504F\u5DEE
-d_es0019_rows_recode.ser = \u5E8F\u53F7
 d_es0019_rows_recodeForm = true

+ 2 - 3
generated/validator/resources_d_es0021_rows_recodeForm_validator.properties

@@ -1,5 +1,4 @@
 d_es0021_rows_recode.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
-d_es0021_rows_recode.nameZh = \u5355\u4F4D\u8868\u4E2D\u6587\u540D
-d_es0021_rows_recode.nameEn = \u5355\u4F4D\u8868\u82F1\u6587\u540D
-d_es0021_rows_recode.ser = \u5E8F\u53F7
+d_es0021_rows_recode.nameZh = \u5355\u4F4D\u7EC4\u4E2D\u6587\u540D
+d_es0021_rows_recode.nameEn = \u5355\u4F4D\u7EC4\u82F1\u6587\u540D
 d_es0021_rows_recodeForm = true

+ 2 - 3
generated/validator/resources_d_es0021_rows_recodeForm_validator_zh_CN.properties

@@ -1,5 +1,4 @@
 d_es0021_rows_recode.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
-d_es0021_rows_recode.nameZh = \u5355\u4F4D\u8868\u4E2D\u6587\u540D
-d_es0021_rows_recode.nameEn = \u5355\u4F4D\u8868\u82F1\u6587\u540D
-d_es0021_rows_recode.ser = \u5E8F\u53F7
+d_es0021_rows_recode.nameZh = \u5355\u4F4D\u7EC4\u4E2D\u6587\u540D
+d_es0021_rows_recode.nameEn = \u5355\u4F4D\u7EC4\u82F1\u6587\u540D
 d_es0021_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_es0024Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0024Form_validator_zh_CN.properties

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

+ 2 - 0
generated/validator/resources_d_es0024_rows_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_es0024_rows_recode.nameEn = \u5355\u4F4D\u7CFB\u7EDF\u82F1\u6587\u540D
+d_es0024_rows_recodeForm = true

+ 2 - 0
generated/validator/resources_d_es0024_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_es0024_rows_recode.nameEn = \u5355\u4F4D\u7CFB\u7EDF\u82F1\u6587\u540D
+d_es0024_rows_recodeForm = true

+ 1 - 1
modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.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 Thu Jul 31 16:29:57 CST 2025.
+    This file was generated on Mon Aug 04 10:27:45 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />

+ 1 - 1
modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Thu Jul 31 16:29:57 CST 2025.
+    This file was generated on Mon Aug 04 10:27:46 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 1 - 1
src/main/java/com/miniframe/bisiness/es/ES0019Service.java

@@ -30,6 +30,7 @@ public class ES0019Service extends ES0019BaseModel implements ExecProcessFlow {
 		EsUnitSQLBuilder esUnitSQLBuilder = new EsUnitSQLBuilder();
 		EsUnitSQLBuilder.Criteria esusql = esUnitSQLBuilder.createCriteria();
 		esusql.andGutIdEqualTo(gutId);
+		esUnitSQLBuilder.setOrderByClause("ser asc");
 		EsUnitMapper esUnitMapper = UtilTools.getBean(EsUnitMapper.class);
 		List<EsUnit> esUnitList = esUnitMapper.selectByExample(esUnitSQLBuilder);
 		List<D_ES0019_ROWS_RECODE>  rowList = new ArrayList<D_ES0019_ROWS_RECODE>();
@@ -42,7 +43,6 @@ public class ES0019Service extends ES0019BaseModel implements ExecProcessFlow {
 			esu.setValue(esUnit.getValue());
 			esu.setFactor(esUnit.getFactor().doubleValue());
 			esu.setUtOffset(esUnit.getUtOffset().doubleValue());
-			esu.setSer(esUnit.getSer());
 			rowList.add(esu);
 		}
 		this.getD_es0019().setRows(rowList);

+ 4 - 2
src/main/java/com/miniframe/bisiness/es/ES0021Service.java

@@ -8,6 +8,7 @@ import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.es.model.ES0021BaseModel;
 import com.miniframe.generate.comm.es.D_ES0021_ROWS_RECODE;
 import com.miniframe.model.es.EsUnitGroup;
+import com.miniframe.model.es.EsUnitGroupSQLBuilder;
 import com.miniframe.model.es.dao.EsUnitGroupMapper;
 
 /**
@@ -21,15 +22,16 @@ public class ES0021Service extends ES0021BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“系统单位列表查看”业务核心处理
  	 */
 	public void transExecute() throws Exception {
+		EsUnitGroupSQLBuilder esUnitGroupSQLBuilder = new EsUnitGroupSQLBuilder();
+		esUnitGroupSQLBuilder.setOrderByClause("ser asc");
 		EsUnitGroupMapper esUnitGroupMapper = UtilTools.getBean(EsUnitGroupMapper.class);
-		List<EsUnitGroup> esUnitGroupList = esUnitGroupMapper.selectAll();
+		List<EsUnitGroup> esUnitGroupList = esUnitGroupMapper.selectByExample(esUnitGroupSQLBuilder);
 		List<D_ES0021_ROWS_RECODE>  rowList = new ArrayList<D_ES0021_ROWS_RECODE>();
 		for(EsUnitGroup esUnitGroup:esUnitGroupList){
 			D_ES0021_ROWS_RECODE esu = new D_ES0021_ROWS_RECODE();
 			esu.setGutId(esUnitGroup.getGutId());
 			esu.setNameEn(esUnitGroup.getNameEn());
 			esu.setNameZh(esUnitGroup.getNameZh());
-			esu.setSer(esUnitGroup.getSer());
 			rowList.add(esu);
 		}
 		this.getD_es0021().setRows(rowList);

+ 62 - 0
src/main/java/com/miniframe/bisiness/es/ES0024Service.java

@@ -0,0 +1,62 @@
+package com.miniframe.bisiness.es;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.es.model.ES0024BaseModel;
+import com.miniframe.generate.comm.es.D_ES0024_ROWS_RECODE;
+import com.miniframe.model.es.EsUnitSys;
+import com.miniframe.model.es.dao.EsUnitSysMapper;
+
+/**
+ * 无锡发动机,“单位系统查看”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0024Service extends ES0024BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“单位系统查看”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		EsUnitSysMapper esUnitSysMapper = UtilTools.getBean(EsUnitSysMapper.class);
+		List<EsUnitSys> esUnitSysList = esUnitSysMapper.selectAll();
+		List<D_ES0024_ROWS_RECODE> dEs0024RowsRecodes = new ArrayList<D_ES0024_ROWS_RECODE>();
+		for(EsUnitSys esUnitSys:esUnitSysList){
+			D_ES0024_ROWS_RECODE dEs0024RowsRecode = new D_ES0024_ROWS_RECODE();
+			dEs0024RowsRecode.setNameEn(esUnitSys.getNameEn());
+			dEs0024RowsRecodes.add(dEs0024RowsRecode);
+		}
+		this.getD_es0024().setRows(dEs0024RowsRecodes);
+	}
+	
+	/**
+	 * 无锡发动机,“单位系统查看”业务前处理
+ 	 */
+	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/ES0024Test.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_ES0024;
+import com.miniframe.generate.comm.httpesapater.ES0024Client;
+import com.miniframe.generate.business.es.model.ES0024BaseModel;
+
+public class ES0024Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0024Test.class);
+
+	/**
+	 * 单位系统查看,获取报文体
+	 * @return
+	 */
+	public static A_ES0024 getA_es0024() {
+		A_ES0024 a_es0024 = new A_ES0024();
+
+		// ----------以下增加【单位系统查看】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0024;
+	}
+	
+	/**
+	 * 运行客户端测试,单位系统查看
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0024BaseModel model = new ES0024BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0024"));
+		model.setA_es0024(ES0024Test.getA_es0024());
+		ES0024Client client = new ES0024Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -23,6 +23,7 @@
 100021,ES0021,单位组查看,service,
 100022,ES0022,系统单位默认值设置,service,
 100023,ES0023,系统单位切换,service,
+100024,ES0024,单位系统查看,service,
 
 110001,ES1001,组件查询,service,
 110002,BES001,基础字典查询,service,

+ 0 - 1
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0019_D(单位查看).csv

@@ -7,4 +7,3 @@
 1.5,value,单位表值,string,,,,,,,,,,,
 1.6,factor,计算因子,double,,,,,,,,,,,
 1.7,utOffset,偏差,double,,,,,,,,,,,
-1.8,ser,序号,int,,,是,,,,,,,,

+ 0 - 1
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0021_D(单位组查看).csv

@@ -3,4 +3,3 @@
 1.1,gutId,单位组编号,string,,,,,,,,,,,
 1.2,nameZh,单位组中文名,string,,,,,,,,,,,
 1.3,nameEn,单位组英文名,string,,,,,,,,,,,
-1.4,ser,序号,int,,,是,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0024_A(单位系统查看).csv

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

+ 3 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0024_D(单位系统查看).csv

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