Browse Source

0731 修改系统单位查看接口,添加单位默认值设置,单位系统切换

caizm 1 month ago
parent
commit
aee7e13448
53 changed files with 1313 additions and 30 deletions
  1. 3 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0021BaseModel.java
  3. 112 0
      generated/com/miniframe/generate/business/es/model/ES0022BaseModel.java
  4. 112 0
      generated/com/miniframe/generate/business/es/model/ES0023BaseModel.java
  5. 7 7
      generated/com/miniframe/generate/comm/es/A_ES0019.java
  6. 12 0
      generated/com/miniframe/generate/comm/es/A_ES0021.java
  7. 51 0
      generated/com/miniframe/generate/comm/es/A_ES0022.java
  8. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0023.java
  9. 26 0
      generated/com/miniframe/generate/comm/es/D_ES0021.java
  10. 64 0
      generated/com/miniframe/generate/comm/es/D_ES0021_ROWS_RECODE.java
  11. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0022.java
  12. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0023.java
  13. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0021Client.java
  14. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0022Client.java
  15. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0023Client.java
  16. 2 2
      generated/validateform/a_es0019Form.xml
  17. 18 0
      generated/validateform/a_es0022Form.xml
  18. 12 0
      generated/validateform/a_es0023Form.xml
  19. 12 0
      generated/validateform/d_es0021_rows_recodeForm.xml
  20. 1 1
      generated/validator/resources_a_es0019Form_validator.properties
  21. 1 1
      generated/validator/resources_a_es0019Form_validator_zh_CN.properties
  22. 1 0
      generated/validator/resources_a_es0021Form_validator.properties
  23. 1 0
      generated/validator/resources_a_es0021Form_validator_zh_CN.properties
  24. 4 0
      generated/validator/resources_a_es0022Form_validator.properties
  25. 4 0
      generated/validator/resources_a_es0022Form_validator_zh_CN.properties
  26. 2 0
      generated/validator/resources_a_es0023Form_validator.properties
  27. 2 0
      generated/validator/resources_a_es0023Form_validator_zh_CN.properties
  28. 1 0
      generated/validator/resources_d_es0021Form_validator.properties
  29. 1 0
      generated/validator/resources_d_es0021Form_validator_zh_CN.properties
  30. 5 0
      generated/validator/resources_d_es0021_rows_recodeForm_validator.properties
  31. 5 0
      generated/validator/resources_d_es0021_rows_recodeForm_validator_zh_CN.properties
  32. 1 0
      generated/validator/resources_d_es0022Form_validator.properties
  33. 1 0
      generated/validator/resources_d_es0022Form_validator_zh_CN.properties
  34. 1 0
      generated/validator/resources_d_es0023Form_validator.properties
  35. 1 0
      generated/validator/resources_d_es0023Form_validator_zh_CN.properties
  36. 1 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  37. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  38. 15 5
      src/main/java/com/miniframe/bisiness/es/ES0019Service.java
  39. 23 1
      src/main/java/com/miniframe/bisiness/es/ES0020Service.java
  40. 65 0
      src/main/java/com/miniframe/bisiness/es/ES0021Service.java
  41. 76 0
      src/main/java/com/miniframe/bisiness/es/ES0022Service.java
  42. 61 0
      src/main/java/com/miniframe/bisiness/es/ES0023Service.java
  43. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0021Test.java
  44. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0022Test.java
  45. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0023Test.java
  46. 3 0
      系统设计/系统模块/ES(无锡发动机).csv
  47. 0 10
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0019_D(系统单位查看).csv
  48. 1 1
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0021_A(系统单位列表查看).csv
  49. 6 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0021_D(系统单位列表查看).csv
  50. 4 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0022_A(单位默认值设置).csv
  51. 1 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0022_D(单位默认值设置).csv
  52. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0023_A(单位系统切换).csv
  53. 1 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0023_D(单位系统切换).csv

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

@@ -22,6 +22,9 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES
 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 ('ES1001', '无锡发动机','组件查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('BES001', '无锡发动机','基础字典查询',true);
 -- 基础系统

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

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0022BaseModel.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_ES0022;
+import com.miniframe.generate.comm.es.D_ES0022;
+
+/**
+ * 无锡发动机,“单位默认值设置”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0022BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0022 a_es0022;//上行体
+	D_ES0022 d_es0022;//下行体
+
+	public ES0022BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0022=new A_ES0022();
+		d_es0022=new D_ES0022();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0022.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_ES0022.class);
+		this.a_es0022 = UtilTools.map2Obj(bodyMap, A_ES0022.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_es0022));
+
+		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_ES0022 getA_es0022() {
+		return a_es0022;
+	}
+
+	public void setA_es0022(A_ES0022 a_es0022) {
+		this.a_es0022=a_es0022;
+	}
+
+	public D_ES0022 getD_es0022() {
+		return this.d_es0022;
+	}
+
+	public void setD_es0022(D_ES0022 d_es0022) {
+		this.d_es0022=d_es0022;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0023BaseModel.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_ES0023;
+import com.miniframe.generate.comm.es.D_ES0023;
+
+/**
+ * 无锡发动机,“单位系统切换”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0023BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0023 a_es0023;//上行体
+	D_ES0023 d_es0023;//下行体
+
+	public ES0023BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0023=new A_ES0023();
+		d_es0023=new D_ES0023();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0023.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_ES0023.class);
+		this.a_es0023 = UtilTools.map2Obj(bodyMap, A_ES0023.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_es0023));
+
+		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_ES0023 getA_es0023() {
+		return a_es0023;
+	}
+
+	public void setA_es0023(A_ES0023 a_es0023) {
+		this.a_es0023=a_es0023;
+	}
+
+	public D_ES0023 getD_es0023() {
+		return this.d_es0023;
+	}
+
+	public void setD_es0023(D_ES0023 d_es0023) {
+		this.d_es0023=d_es0023;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 7 - 7
generated/com/miniframe/generate/comm/es/A_ES0019.java

@@ -9,17 +9,17 @@ import java.io.Serializable;
  */
 public class A_ES0019 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	String gutId;//单位组Id
+	String nameEn;//单位英文名
 	/**
-	 *单位组Id
+	 *单位英文名
 	 */
-	public void setGutId(String gutId) {
-		this.gutId=gutId;
+	public void setNameEn(String nameEn) {
+		this.nameEn=nameEn;
 	}
 	/**
-	 *单位组Id
+	 *单位英文名
 	 */
-	public String getGutId() {
-		return this.gutId;
+	public String getNameEn() {
+		return this.nameEn;
 	}
 }

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

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

+ 51 - 0
generated/com/miniframe/generate/comm/es/A_ES0022.java

@@ -0,0 +1,51 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 单位默认值设置
+ */
+public class A_ES0022 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String value;//单位值
+	/**
+	 *单位值
+	 */
+	public void setValue(String value) {
+		this.value=value;
+	}
+	/**
+	 *单位值
+	 */
+	public String getValue() {
+		return this.value;
+	}
+	String gutId;//单位组编号
+	/**
+	 *单位组编号
+	 */
+	public void setGutId(String gutId) {
+		this.gutId=gutId;
+	}
+	/**
+	 *单位组编号
+	 */
+	public String getGutId() {
+		return this.gutId;
+	}
+	String sutId;//系统单位编号
+	/**
+	 *系统单位编号
+	 */
+	public void setSutId(String sutId) {
+		this.sutId=sutId;
+	}
+	/**
+	 *系统单位编号
+	 */
+	public String getSutId() {
+		return this.sutId;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 单位系统切换
+ */
+public class A_ES0023 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String sutId;//系统单位编号
+	/**
+	 *系统单位编号
+	 */
+	public void setSutId(String sutId) {
+		this.sutId=sutId;
+	}
+	/**
+	 *系统单位编号
+	 */
+	public String getSutId() {
+		return this.sutId;
+	}
+}

+ 26 - 0
generated/com/miniframe/generate/comm/es/D_ES0021.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_ES0021 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_ES0021_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_ES0021_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_ES0021_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

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

@@ -0,0 +1,64 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 系统单位列表查看->数据
+ */
+public class D_ES0021_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String gutId;//单位组编号
+	/**
+	 *单位组编号
+	 */
+	public void setGutId(String gutId) {
+		this.gutId=gutId;
+	}
+	/**
+	 *单位组编号
+	 */
+	public String getGutId() {
+		return this.gutId;
+	}
+	String nameZh;//单位表中文名
+	/**
+	 *单位表中文名
+	 */
+	public void setNameZh(String nameZh) {
+		this.nameZh=nameZh;
+	}
+	/**
+	 *单位表中文名
+	 */
+	public String getNameZh() {
+		return this.nameZh;
+	}
+	String nameEn;//单位表英文名
+	/**
+	 *单位表英文名
+	 */
+	public void setNameEn(String nameEn) {
+		this.nameEn=nameEn;
+	}
+	/**
+	 *单位表英文名
+	 */
+	public String getNameEn() {
+		return this.nameEn;
+	}
+	int ser;//序号
+	/**
+	 *序号
+	 */
+	public void setSer(int ser) {
+		this.ser=ser;
+	}
+	/**
+	 *序号
+	 */
+	public int getSer() {
+		return this.ser;
+	}
+}

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

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

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

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

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

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

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

+ 2 - 2
generated/validateform/a_es0019Form.xml

@@ -4,8 +4,8 @@
 <form-validation>
 <formset>
 <form name="a_es0019Form">
-<field property="gutId" depends="required">
-    <arg0 key="a_es0019.gutId"/>
+<field property="nameEn" depends="required">
+    <arg0 key="a_es0019.nameEn"/>
 </field>
 </form>
 </formset>

+ 18 - 0
generated/validateform/a_es0022Form.xml

@@ -0,0 +1,18 @@
+<?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_es0022Form">
+<field property="value" depends="required">
+    <arg0 key="a_es0022.value"/>
+</field>
+<field property="gutId" depends="required">
+    <arg0 key="a_es0022.gutId"/>
+</field>
+<field property="sutId" depends="required">
+    <arg0 key="a_es0022.sutId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/a_es0023Form.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_es0023Form">
+<field property="sutId" depends="required">
+    <arg0 key="a_es0023.sutId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/d_es0021_rows_recodeForm.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="d_es0021_rows_recodeForm">
+<field property="ser" depends="required">
+    <arg0 key="d_es0021_rows_recode.ser"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 1 - 1
generated/validator/resources_a_es0019Form_validator.properties

@@ -1,2 +1,2 @@
-a_es0019.gutId = \u5355\u4F4D\u7EC4Id
+a_es0019.nameEn = \u5355\u4F4D\u82F1\u6587\u540D
 a_es0019Form = true

+ 1 - 1
generated/validator/resources_a_es0019Form_validator_zh_CN.properties

@@ -1,2 +1,2 @@
-a_es0019.gutId = \u5355\u4F4D\u7EC4Id
+a_es0019.nameEn = \u5355\u4F4D\u82F1\u6587\u540D
 a_es0019Form = true

+ 1 - 0
generated/validator/resources_a_es0021Form_validator.properties

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

+ 1 - 0
generated/validator/resources_a_es0021Form_validator_zh_CN.properties

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

+ 4 - 0
generated/validator/resources_a_es0022Form_validator.properties

@@ -0,0 +1,4 @@
+a_es0022.value = \u5355\u4F4D\u503C
+a_es0022.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
+a_es0022.sutId = \u7CFB\u7EDF\u5355\u4F4D\u7F16\u53F7
+a_es0022Form = true

+ 4 - 0
generated/validator/resources_a_es0022Form_validator_zh_CN.properties

@@ -0,0 +1,4 @@
+a_es0022.value = \u5355\u4F4D\u503C
+a_es0022.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
+a_es0022.sutId = \u7CFB\u7EDF\u5355\u4F4D\u7F16\u53F7
+a_es0022Form = true

+ 2 - 0
generated/validator/resources_a_es0023Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0023.sutId = \u7CFB\u7EDF\u5355\u4F4D\u7F16\u53F7
+a_es0023Form = true

+ 2 - 0
generated/validator/resources_a_es0023Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0023.sutId = \u7CFB\u7EDF\u5355\u4F4D\u7F16\u53F7
+a_es0023Form = true

+ 1 - 0
generated/validator/resources_d_es0021Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0021Form_validator_zh_CN.properties

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

+ 5 - 0
generated/validator/resources_d_es0021_rows_recodeForm_validator.properties

@@ -0,0 +1,5 @@
+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_recodeForm = true

+ 5 - 0
generated/validator/resources_d_es0021_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,5 @@
+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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_es0022Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0022Form_validator_zh_CN.properties

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

+ 1 - 0
generated/validator/resources_d_es0023Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0023Form_validator_zh_CN.properties

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

+ 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 Tue Jul 29 17:15:47 CST 2025.
+    This file was generated on Thu Jul 31 16:29:57 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 Tue Jul 29 17:15:48 CST 2025.
+    This file was generated on Thu Jul 31 16:29:57 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -9,7 +9,10 @@ import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.es.model.ES0019BaseModel;
 import com.miniframe.generate.comm.es.D_ES0019_ROWS_RECODE;
 import com.miniframe.model.es.EsUnit;
+import com.miniframe.model.es.EsUnitGroup;
+import com.miniframe.model.es.EsUnitGroupSQLBuilder;
 import com.miniframe.model.es.EsUnitSQLBuilder;
+import com.miniframe.model.es.dao.EsUnitGroupMapper;
 import com.miniframe.model.es.dao.EsUnitMapper;
 
 /**
@@ -23,12 +26,19 @@ public class ES0019Service extends ES0019BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“系统单位查看”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-		String gutId = this.getA_es0019().getGutId();
-		EsUnitSQLBuilder sqlBuilder = new EsUnitSQLBuilder();
-		EsUnitSQLBuilder.Criteria esb = sqlBuilder.createCriteria();
-		esb.andGutIdEqualTo(gutId);
+		String nameEn = this.getA_es0019().getNameEn();
+		EsUnitGroupSQLBuilder  esUnitGroupSQLBuilder = new EsUnitGroupSQLBuilder();
+		EsUnitGroupSQLBuilder.Criteria esg = esUnitGroupSQLBuilder.createCriteria();
+		esg.andNameEnEqualTo(nameEn);
+		EsUnitGroupMapper esUnitGroupMapper = UtilTools.getBean(EsUnitGroupMapper.class);
+		EsUnitGroup esUnitGroup = esUnitGroupMapper.selectOneByExample(esUnitGroupSQLBuilder);
+		String gutId = esUnitGroup.getGutId();
+
+		EsUnitSQLBuilder esUnitSQLBuilder = new EsUnitSQLBuilder();
+		EsUnitSQLBuilder.Criteria esusql = esUnitSQLBuilder.createCriteria();
+		esusql.andGutIdEqualTo(gutId);
 		EsUnitMapper esUnitMapper = UtilTools.getBean(EsUnitMapper.class);
-		List<EsUnit> esUnitList =esUnitMapper.selectByExample(sqlBuilder);
+		List<EsUnit> esUnitList = esUnitMapper.selectByExample(esUnitSQLBuilder);
 		List<D_ES0019_ROWS_RECODE>  rowList = new ArrayList<D_ES0019_ROWS_RECODE>();
 		for(EsUnit esUnit:esUnitList){
 			D_ES0019_ROWS_RECODE esu = new D_ES0019_ROWS_RECODE();

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

@@ -1,11 +1,17 @@
 package com.miniframe.bisiness.es;
 
 import java.util.Date;
+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.ES0020BaseModel;
+import com.miniframe.model.es.EsUnitGroup;
+import com.miniframe.model.es.EsUnitGroupSQLBuilder;
 import com.miniframe.model.es.EsUnitSys;
+import com.miniframe.model.es.EsUnitSysDel;
+import com.miniframe.model.es.dao.EsUnitGroupMapper;
+import com.miniframe.model.es.dao.EsUnitSysDelMapper;
 import com.miniframe.model.es.dao.EsUnitSysMapper;
 
 /**
@@ -19,11 +25,13 @@ public class ES0020Service extends ES0020BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“单位系统添加”业务核心处理
  	 */
 	public void transExecute() throws Exception {
+		//es_unit_sys表插入数据
 		String nameEn = this.getA_es0020().getNameEn();
 		String nameZh = this.getA_es0020().getNameZh();
 		EsUnitSysMapper esUnitSysMapper = UtilTools.getBean(EsUnitSysMapper.class);
 		EsUnitSys  esUnitSys = new EsUnitSys();
-		esUnitSys.setSutId(UtilTools.getUUid());
+		String sutId = UtilTools.getUUid();
+		esUnitSys.setSutId(sutId);
 		esUnitSys.setNameZh(nameZh);
 		esUnitSys.setNameEn(nameEn);
 		esUnitSys.setType(0);
@@ -32,6 +40,20 @@ public class ES0020Service extends ES0020BaseModel implements ExecProcessFlow {
 		esUnitSys.setUpdateTime(new Date());
 		esUnitSys.setRemark("");
 		esUnitSysMapper.insert(esUnitSys);
+
+		//es_unit_sys_del表插入数据
+		EsUnitGroupMapper esUnitGroupMapper = UtilTools.getBean(EsUnitGroupMapper.class);
+		List<EsUnitGroup> esUnitGroupList = esUnitGroupMapper.selectAll();
+		EsUnitSysDelMapper esUnitSysDelMapper = UtilTools.getBean(EsUnitSysDelMapper.class);
+		for(EsUnitGroup esUnitGroup:esUnitGroupList){
+			EsUnitSysDel esUnitSysDel = new EsUnitSysDel();
+			esUnitSysDel.setGsutId(UtilTools.getUUid());
+			esUnitSysDel.setSutId(sutId);
+			esUnitSysDel.setGutId(esUnitGroup.getGutId());
+			esUnitSysDel.setUtId("");
+			esUnitSysDel.setValue("");
+			esUnitSysDelMapper.insert(esUnitSysDel);
+		}
 	}
 	
 	/**

+ 65 - 0
src/main/java/com/miniframe/bisiness/es/ES0021Service.java

@@ -0,0 +1,65 @@
+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.ES0021BaseModel;
+import com.miniframe.generate.comm.es.D_ES0021_ROWS_RECODE;
+import com.miniframe.model.es.EsUnitGroup;
+import com.miniframe.model.es.dao.EsUnitGroupMapper;
+
+/**
+ * 无锡发动机,“系统单位列表查看”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0021Service extends ES0021BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“系统单位列表查看”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		EsUnitGroupMapper esUnitGroupMapper = UtilTools.getBean(EsUnitGroupMapper.class);
+		List<EsUnitGroup> esUnitGroupList = esUnitGroupMapper.selectAll();
+		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);
+	}
+	
+	/**
+	 * 无锡发动机,“系统单位列表查看”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 76 - 0
src/main/java/com/miniframe/bisiness/es/ES0022Service.java

@@ -0,0 +1,76 @@
+package com.miniframe.bisiness.es;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.es.model.ES0022BaseModel;
+import com.miniframe.model.es.EsUnit;
+import com.miniframe.model.es.EsUnitSQLBuilder;
+import com.miniframe.model.es.EsUnitSysDel;
+import com.miniframe.model.es.EsUnitSysDelSQLBuilder;
+import com.miniframe.model.es.dao.EsUnitMapper;
+import com.miniframe.model.es.dao.EsUnitSysDelMapper;
+
+/**
+ * 无锡发动机,“单位默认值设置”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0022Service extends ES0022BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“单位默认值设置”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String value = this.getA_es0022().getValue();
+		String gutId = this.getA_es0022().getGutId();
+		String sutId = this.getA_es0022().getSutId();
+		EsUnitSQLBuilder esUnitSQLBuilder = new EsUnitSQLBuilder();
+		EsUnitSQLBuilder.Criteria esUnitSQLBuilderCriteria = esUnitSQLBuilder.createCriteria();
+		esUnitSQLBuilderCriteria.andValueEqualTo(value);
+		esUnitSQLBuilderCriteria.andGutIdEqualTo(gutId);
+		EsUnitMapper esUnitMapper = UtilTools.getBean(EsUnitMapper.class);
+		EsUnit eu = esUnitMapper.selectOneByExample(esUnitSQLBuilder);
+		String utId = eu.getUtId();
+
+		EsUnitSysDelSQLBuilder  esUnitSysDelSQLBuilder = new EsUnitSysDelSQLBuilder();
+		EsUnitSysDelSQLBuilder.Criteria esUnitSysDelSQLBuilderCriteria = esUnitSysDelSQLBuilder.createCriteria();
+		esUnitSysDelSQLBuilderCriteria.andGutIdEqualTo(gutId);
+		esUnitSysDelSQLBuilderCriteria.andSutIdEqualTo(sutId);
+
+		EsUnitSysDel esUnitSysDel = new EsUnitSysDel();
+		esUnitSysDel.setUtId(utId);
+		esUnitSysDel.setValue(value);
+
+		EsUnitSysDelMapper  esUnitSysDelMapper = UtilTools.getBean(EsUnitSysDelMapper.class);
+		esUnitSysDelMapper.updateByExampleSelective(esUnitSysDel, esUnitSysDelSQLBuilder);
+	}
+	
+	/**
+	 * 无锡发动机,“单位默认值设置”业务前处理
+ 	 */
+	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/es/ES0023Service.java

@@ -0,0 +1,61 @@
+package com.miniframe.bisiness.es;
+
+import java.util.Date;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.es.model.ES0023BaseModel;
+import com.miniframe.model.es.EsUnitSysUs;
+import com.miniframe.model.es.dao.EsUnitSysUsMapper;
+
+/**
+ * 无锡发动机,“单位系统切换”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0023Service extends ES0023BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“单位系统切换”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String sutId = this.getA_es0023().getSutId();
+		EsUnitSysUsMapper esUnitSysUsMapper = UtilTools.getBean(EsUnitSysUsMapper.class);
+		EsUnitSysUs esUnitSysUs = new  EsUnitSysUs();
+		esUnitSysUs.setPerUtId(UtilTools.getUUid());
+		esUnitSysUs.setSutId(sutId);
+		esUnitSysUs.setUid(this.getA_eshead().getUserId());
+		esUnitSysUs.setCreateTime(new Date());
+		esUnitSysUs.setUpdateTime(new Date());
+		esUnitSysUs.setRemark("");
+		esUnitSysUsMapper.insert(esUnitSysUs);
+	}
+	
+	/**
+	 * 无锡发动机,“单位系统切换”业务前处理
+ 	 */
+	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/ES0021Test.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_ES0021;
+import com.miniframe.generate.comm.httpesapater.ES0021Client;
+import com.miniframe.generate.business.es.model.ES0021BaseModel;
+
+public class ES0021Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0021Test.class);
+
+	/**
+	 * 系统单位列表查看,获取报文体
+	 * @return
+	 */
+	public static A_ES0021 getA_es0021() {
+		A_ES0021 a_es0021 = new A_ES0021();
+
+		// ----------以下增加【系统单位列表查看】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0021;
+	}
+	
+	/**
+	 * 运行客户端测试,系统单位列表查看
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0021BaseModel model = new ES0021BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0021"));
+		model.setA_es0021(ES0021Test.getA_es0021());
+		ES0021Client client = new ES0021Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/ES0022Test.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_ES0022;
+import com.miniframe.generate.comm.httpesapater.ES0022Client;
+import com.miniframe.generate.business.es.model.ES0022BaseModel;
+
+public class ES0022Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0022Test.class);
+
+	/**
+	 * 单位默认值设置,获取报文体
+	 * @return
+	 */
+	public static A_ES0022 getA_es0022() {
+		A_ES0022 a_es0022 = new A_ES0022();
+
+		// ----------以下增加【单位默认值设置】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0022;
+	}
+	
+	/**
+	 * 运行客户端测试,单位默认值设置
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0022BaseModel model = new ES0022BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0022"));
+		model.setA_es0022(ES0022Test.getA_es0022());
+		ES0022Client client = new ES0022Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/ES0023Test.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_ES0023;
+import com.miniframe.generate.comm.httpesapater.ES0023Client;
+import com.miniframe.generate.business.es.model.ES0023BaseModel;
+
+public class ES0023Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0023Test.class);
+
+	/**
+	 * 单位系统切换,获取报文体
+	 * @return
+	 */
+	public static A_ES0023 getA_es0023() {
+		A_ES0023 a_es0023 = new A_ES0023();
+
+		// ----------以下增加【单位系统切换】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0023;
+	}
+	
+	/**
+	 * 运行客户端测试,单位系统切换
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0023BaseModel model = new ES0023BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0023"));
+		model.setA_es0023(ES0023Test.getA_es0023());
+		ES0023Client client = new ES0023Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -19,6 +19,9 @@
 100018,ES0018,文件打包下载,service,
 100019,ES0019,系统单位查看,service,
 100020,ES0020,单位系统添加,service,
+100021,ES0021,系统单位列表查看,service,
+100022,ES0022,单位默认值设置,service,
+100023,ES0023,单位系统切换,service,
 
 110001,ES1001,组件查询,service,
 110002,BES001,基础字典查询,service,

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

@@ -1,10 +0,0 @@
-"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
-1,rows,数据,list,,,,0,,,,,,,
-1.1,utId,单位表编号,string,,,,,,,,,,,
-1.2,gutId,单位组编号,string,,,,,,,,,,,
-1.3,nameZh,单位表中文名,string,,,,,,,,,,,
-1.4,nameEn,单位表英文名,string,,,,,,,,,,,
-1.5,value,单位表值,string,,,,,,,,,,,
-1.6,factor,计算因子,double,,,,,,,,,,,
-1.7,utOffset,偏差,double,,,,,,,,,,,
-1.8,ser,序号,int,,,是,,,,,,,,

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

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

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

@@ -0,0 +1,6 @@
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,rows,数据,list,,,,0,,,,,,,
+1.1,gutId,单位组编号,string,,,,,,,,,,,
+1.2,nameZh,单位表中文名,string,,,,,,,,,,,
+1.3,nameEn,单位表英文名,string,,,,,,,,,,,
+1.4,ser,序号,int,,,是,,,,,,,,

+ 4 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0022_A(单位默认值设置).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0022_D(单位默认值设置).csv

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

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

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

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

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