Bladeren bron

0730 新增系统单位查看和单位系统添加接口

caizm 1 maand geleden
bovenliggende
commit
c4e4f8be54
60 gewijzigde bestanden met toevoegingen van 5280 en 3 verwijderingen
  1. 2 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0019BaseModel.java
  3. 112 0
      generated/com/miniframe/generate/business/es/model/ES0020BaseModel.java
  4. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0019.java
  5. 38 0
      generated/com/miniframe/generate/comm/es/A_ES0020.java
  6. 26 0
      generated/com/miniframe/generate/comm/es/D_ES0019.java
  7. 116 0
      generated/com/miniframe/generate/comm/es/D_ES0019_ROWS_RECODE.java
  8. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0020.java
  9. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0019Client.java
  10. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0020Client.java
  11. 12 0
      generated/validateform/a_es0019Form.xml
  12. 15 0
      generated/validateform/a_es0020Form.xml
  13. 12 0
      generated/validateform/d_es0019_rows_recodeForm.xml
  14. 2 0
      generated/validator/resources_a_es0019Form_validator.properties
  15. 2 0
      generated/validator/resources_a_es0019Form_validator_zh_CN.properties
  16. 3 0
      generated/validator/resources_a_es0020Form_validator.properties
  17. 3 0
      generated/validator/resources_a_es0020Form_validator_zh_CN.properties
  18. 1 0
      generated/validator/resources_d_es0019Form_validator.properties
  19. 1 0
      generated/validator/resources_d_es0019Form_validator_zh_CN.properties
  20. 9 0
      generated/validator/resources_d_es0019_rows_recodeForm_validator.properties
  21. 9 0
      generated/validator/resources_d_es0019_rows_recodeForm_validator_zh_CN.properties
  22. 1 0
      generated/validator/resources_d_es0020Form_validator.properties
  23. 1 0
      generated/validator/resources_d_es0020Form_validator_zh_CN.properties
  24. 201 0
      modelsrc/com/miniframe/model/es/EsUnit.java
  25. 106 0
      modelsrc/com/miniframe/model/es/EsUnitGroup.java
  26. 470 0
      modelsrc/com/miniframe/model/es/EsUnitGroupSQLBuilder.java
  27. 731 0
      modelsrc/com/miniframe/model/es/EsUnitSQLBuilder.java
  28. 211 0
      modelsrc/com/miniframe/model/es/EsUnitSys.java
  29. 130 0
      modelsrc/com/miniframe/model/es/EsUnitSysDel.java
  30. 550 0
      modelsrc/com/miniframe/model/es/EsUnitSysDelSQLBuilder.java
  31. 731 0
      modelsrc/com/miniframe/model/es/EsUnitSysSQLBuilder.java
  32. 164 0
      modelsrc/com/miniframe/model/es/EsUnitSysUs.java
  33. 601 0
      modelsrc/com/miniframe/model/es/EsUnitSysUsSQLBuilder.java
  34. 10 0
      modelsrc/com/miniframe/model/es/dao/EsUnitGroupMapper.java
  35. 10 0
      modelsrc/com/miniframe/model/es/dao/EsUnitMapper.java
  36. 10 0
      modelsrc/com/miniframe/model/es/dao/EsUnitSysDelMapper.java
  37. 10 0
      modelsrc/com/miniframe/model/es/dao/EsUnitSysMapper.java
  38. 10 0
      modelsrc/com/miniframe/model/es/dao/EsUnitSysUsMapper.java
  39. 6 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  40. 50 0
      modelsrc/com/miniframe/model/es/xml/EsUnitGroupMapper.xml
  41. 50 0
      modelsrc/com/miniframe/model/es/xml/EsUnitMapper.xml
  42. 50 0
      modelsrc/com/miniframe/model/es/xml/EsUnitSysDelMapper.xml
  43. 50 0
      modelsrc/com/miniframe/model/es/xml/EsUnitSysMapper.xml
  44. 50 0
      modelsrc/com/miniframe/model/es/xml/EsUnitSysUsMapper.xml
  45. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  46. 75 0
      src/main/java/com/miniframe/bisiness/es/ES0019Service.java
  47. 64 0
      src/main/java/com/miniframe/bisiness/es/ES0020Service.java
  48. 23 0
      src/main/java/com/miniframe/dbtransfer/EsUnitDbTransfer.java
  49. 23 0
      src/main/java/com/miniframe/dbtransfer/EsUnitGroupDbTransfer.java
  50. 23 0
      src/main/java/com/miniframe/dbtransfer/EsUnitSysDbTransfer.java
  51. 23 0
      src/main/java/com/miniframe/dbtransfer/EsUnitSysDelDbTransfer.java
  52. 23 0
      src/main/java/com/miniframe/dbtransfer/EsUnitSysUsDbTransfer.java
  53. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0019Test.java
  54. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0020Test.java
  55. 6 1
      系统设计/实体Bean/es(实体列表).csv
  56. 2 0
      系统设计/系统模块/ES(无锡发动机).csv
  57. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0019_A(系统单位查看).csv
  58. 10 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0019_D(系统单位查看).csv
  59. 3 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0020_A(单位系统添加).csv
  60. 1 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0020_D(单位系统添加).csv

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

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

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

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0020BaseModel.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_ES0020;
+import com.miniframe.generate.comm.es.D_ES0020;
+
+/**
+ * 无锡发动机,“单位系统添加”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0020BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0020 a_es0020;//上行体
+	D_ES0020 d_es0020;//下行体
+
+	public ES0020BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0020=new A_ES0020();
+		d_es0020=new D_ES0020();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0020.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_ES0020.class);
+		this.a_es0020 = UtilTools.map2Obj(bodyMap, A_ES0020.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_es0020));
+
+		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_ES0020 getA_es0020() {
+		return a_es0020;
+	}
+
+	public void setA_es0020(A_ES0020 a_es0020) {
+		this.a_es0020=a_es0020;
+	}
+
+	public D_ES0020 getD_es0020() {
+		return this.d_es0020;
+	}
+
+	public void setD_es0020(D_ES0020 d_es0020) {
+		this.d_es0020=d_es0020;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 系统单位查看
+ */
+public class A_ES0019 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String gutId;//单位组Id
+	/**
+	 *单位组Id
+	 */
+	public void setGutId(String gutId) {
+		this.gutId=gutId;
+	}
+	/**
+	 *单位组Id
+	 */
+	public String getGutId() {
+		return this.gutId;
+	}
+}

+ 38 - 0
generated/com/miniframe/generate/comm/es/A_ES0020.java

@@ -0,0 +1,38 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 单位系统添加
+ */
+public class A_ES0020 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	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;
+	}
+}

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

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

@@ -0,0 +1,116 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 系统单位查看->数据
+ */
+public class D_ES0019_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String utId;//单位表编号
+	/**
+	 *单位表编号
+	 */
+	public void setUtId(String utId) {
+		this.utId=utId;
+	}
+	/**
+	 *单位表编号
+	 */
+	public String getUtId() {
+		return this.utId;
+	}
+	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;
+	}
+	String value;//单位表值
+	/**
+	 *单位表值
+	 */
+	public void setValue(String value) {
+		this.value=value;
+	}
+	/**
+	 *单位表值
+	 */
+	public String getValue() {
+		return this.value;
+	}
+	double factor;//计算因子
+	/**
+	 *计算因子
+	 */
+	public void setFactor(double factor) {
+		this.factor=factor;
+	}
+	/**
+	 *计算因子
+	 */
+	public double getFactor() {
+		return this.factor;
+	}
+	double utOffset;//偏差
+	/**
+	 *偏差
+	 */
+	public void setUtOffset(double utOffset) {
+		this.utOffset=utOffset;
+	}
+	/**
+	 *偏差
+	 */
+	public double getUtOffset() {
+		return this.utOffset;
+	}
+	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_ES0020.java

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

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

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

+ 12 - 0
generated/validateform/a_es0019Form.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_es0019Form">
+<field property="gutId" depends="required">
+    <arg0 key="a_es0019.gutId"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 15 - 0
generated/validateform/a_es0020Form.xml

@@ -0,0 +1,15 @@
+<?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_es0020Form">
+<field property="nameZh" depends="required">
+    <arg0 key="a_es0020.nameZh"/>
+</field>
+<field property="nameEn" depends="required">
+    <arg0 key="a_es0020.nameEn"/>
+</field>
+</form>
+</formset>
+</form-validation>

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

+ 2 - 0
generated/validator/resources_a_es0019Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0019.gutId = \u5355\u4F4D\u7EC4Id
+a_es0019Form = true

+ 2 - 0
generated/validator/resources_a_es0019Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0019.gutId = \u5355\u4F4D\u7EC4Id
+a_es0019Form = true

+ 3 - 0
generated/validator/resources_a_es0020Form_validator.properties

@@ -0,0 +1,3 @@
+a_es0020.nameZh = \u5355\u4F4D\u4E2D\u6587\u540D
+a_es0020.nameEn = \u5355\u4F4D\u82F1\u6587\u540D
+a_es0020Form = true

+ 3 - 0
generated/validator/resources_a_es0020Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_es0020.nameZh = \u5355\u4F4D\u4E2D\u6587\u540D
+a_es0020.nameEn = \u5355\u4F4D\u82F1\u6587\u540D
+a_es0020Form = true

+ 1 - 0
generated/validator/resources_d_es0019Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0019Form_validator_zh_CN.properties

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

+ 9 - 0
generated/validator/resources_d_es0019_rows_recodeForm_validator.properties

@@ -0,0 +1,9 @@
+d_es0019_rows_recode.utId = \u5355\u4F4D\u8868\u7F16\u53F7
+d_es0019_rows_recode.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
+d_es0019_rows_recode.nameZh = \u5355\u4F4D\u8868\u4E2D\u6587\u540D
+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

+ 9 - 0
generated/validator/resources_d_es0019_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,9 @@
+d_es0019_rows_recode.utId = \u5355\u4F4D\u8868\u7F16\u53F7
+d_es0019_rows_recode.gutId = \u5355\u4F4D\u7EC4\u7F16\u53F7
+d_es0019_rows_recode.nameZh = \u5355\u4F4D\u8868\u4E2D\u6587\u540D
+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

+ 1 - 0
generated/validator/resources_d_es0020Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0020Form_validator_zh_CN.properties

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

+ 201 - 0
modelsrc/com/miniframe/model/es/EsUnit.java

@@ -0,0 +1,201 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import javax.persistence.*;
+
+@Table(name = "es_unit")
+public class EsUnit extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 单位表编号
+     */
+    @Id
+    @Column(name = "ut_id")
+    private String utId;
+
+    /**
+     * 单位组编号
+     */
+    @Column(name = "gut_id")
+    private String gutId;
+
+    /**
+     * 单位表中文名
+     */
+    @Column(name = "name_zh")
+    private String nameZh;
+
+    /**
+     * 单位表英文名
+     */
+    @Column(name = "name_en")
+    private String nameEn;
+
+    /**
+     * 单位表值
+     */
+    private String value;
+
+    /**
+     * 计算因子
+     */
+    private BigDecimal factor;
+
+    /**
+     * 偏差
+     */
+    @Column(name = "ut_offset")
+    private BigDecimal utOffset;
+
+    /**
+     * 序号
+     */
+    private Integer ser;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取单位表编号
+     *
+     * @return ut_id - 单位表编号
+     */
+    public String getUtId() {
+        return utId;
+    }
+
+    /**
+     * 设置单位表编号
+     *
+     * @param utId 单位表编号
+     */
+    public void setUtId(String utId) {
+        this.utId = utId == null ? null : utId.trim();
+    }
+
+    /**
+     * 获取单位组编号
+     *
+     * @return gut_id - 单位组编号
+     */
+    public String getGutId() {
+        return gutId;
+    }
+
+    /**
+     * 设置单位组编号
+     *
+     * @param gutId 单位组编号
+     */
+    public void setGutId(String gutId) {
+        this.gutId = gutId == null ? null : gutId.trim();
+    }
+
+    /**
+     * 获取单位表中文名
+     *
+     * @return name_zh - 单位表中文名
+     */
+    public String getNameZh() {
+        return nameZh;
+    }
+
+    /**
+     * 设置单位表中文名
+     *
+     * @param nameZh 单位表中文名
+     */
+    public void setNameZh(String nameZh) {
+        this.nameZh = nameZh == null ? null : nameZh.trim();
+    }
+
+    /**
+     * 获取单位表英文名
+     *
+     * @return name_en - 单位表英文名
+     */
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    /**
+     * 设置单位表英文名
+     *
+     * @param nameEn 单位表英文名
+     */
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn == null ? null : nameEn.trim();
+    }
+
+    /**
+     * 获取单位表值
+     *
+     * @return value - 单位表值
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 设置单位表值
+     *
+     * @param value 单位表值
+     */
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+
+    /**
+     * 获取计算因子
+     *
+     * @return factor - 计算因子
+     */
+    public BigDecimal getFactor() {
+        return factor;
+    }
+
+    /**
+     * 设置计算因子
+     *
+     * @param factor 计算因子
+     */
+    public void setFactor(BigDecimal factor) {
+        this.factor = factor;
+    }
+
+    /**
+     * 获取偏差
+     *
+     * @return ut_offset - 偏差
+     */
+    public BigDecimal getUtOffset() {
+        return utOffset;
+    }
+
+    /**
+     * 设置偏差
+     *
+     * @param utOffset 偏差
+     */
+    public void setUtOffset(BigDecimal utOffset) {
+        this.utOffset = utOffset;
+    }
+
+    /**
+     * 获取序号
+     *
+     * @return ser - 序号
+     */
+    public Integer getSer() {
+        return ser;
+    }
+
+    /**
+     * 设置序号
+     *
+     * @param ser 序号
+     */
+    public void setSer(Integer ser) {
+        this.ser = ser;
+    }
+}

+ 106 - 0
modelsrc/com/miniframe/model/es/EsUnitGroup.java

@@ -0,0 +1,106 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "es_unit_group")
+public class EsUnitGroup extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 单位组编号
+     */
+    @Id
+    @Column(name = "gut_id")
+    private String gutId;
+
+    /**
+     * 单位组中文名
+     */
+    @Column(name = "name__zh")
+    private String nameZh;
+
+    /**
+     * 单位组英文名
+     */
+    @Column(name = "name__en")
+    private String nameEn;
+
+    /**
+     * 单位组序号
+     */
+    private Integer ser;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取单位组编号
+     *
+     * @return gut_id - 单位组编号
+     */
+    public String getGutId() {
+        return gutId;
+    }
+
+    /**
+     * 设置单位组编号
+     *
+     * @param gutId 单位组编号
+     */
+    public void setGutId(String gutId) {
+        this.gutId = gutId == null ? null : gutId.trim();
+    }
+
+    /**
+     * 获取单位组中文名
+     *
+     * @return name__zh - 单位组中文名
+     */
+    public String getNameZh() {
+        return nameZh;
+    }
+
+    /**
+     * 设置单位组中文名
+     *
+     * @param nameZh 单位组中文名
+     */
+    public void setNameZh(String nameZh) {
+        this.nameZh = nameZh == null ? null : nameZh.trim();
+    }
+
+    /**
+     * 获取单位组英文名
+     *
+     * @return name__en - 单位组英文名
+     */
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    /**
+     * 设置单位组英文名
+     *
+     * @param nameEn 单位组英文名
+     */
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn == null ? null : nameEn.trim();
+    }
+
+    /**
+     * 获取单位组序号
+     *
+     * @return ser - 单位组序号
+     */
+    public Integer getSer() {
+        return ser;
+    }
+
+    /**
+     * 设置单位组序号
+     *
+     * @param ser 单位组序号
+     */
+    public void setSer(Integer ser) {
+        this.ser = ser;
+    }
+}

+ 470 - 0
modelsrc/com/miniframe/model/es/EsUnitGroupSQLBuilder.java

@@ -0,0 +1,470 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EsUnitGroupSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsUnitGroupSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andGutIdIsNull() {
+            addCriterion("gut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIsNotNull() {
+            addCriterion("gut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdEqualTo(String value) {
+            addCriterion("gut_id =", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotEqualTo(String value) {
+            addCriterion("gut_id <>", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThan(String value) {
+            addCriterion("gut_id >", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("gut_id >=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThan(String value) {
+            addCriterion("gut_id <", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThanOrEqualTo(String value) {
+            addCriterion("gut_id <=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLike(String value) {
+            addCriterion("gut_id like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotLike(String value) {
+            addCriterion("gut_id not like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIn(List<String> values) {
+            addCriterion("gut_id in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotIn(List<String> values) {
+            addCriterion("gut_id not in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdBetween(String value1, String value2) {
+            addCriterion("gut_id between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotBetween(String value1, String value2) {
+            addCriterion("gut_id not between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNull() {
+            addCriterion("name__zh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNotNull() {
+            addCriterion("name__zh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhEqualTo(String value) {
+            addCriterion("name__zh =", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotEqualTo(String value) {
+            addCriterion("name__zh <>", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThan(String value) {
+            addCriterion("name__zh >", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThanOrEqualTo(String value) {
+            addCriterion("name__zh >=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThan(String value) {
+            addCriterion("name__zh <", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThanOrEqualTo(String value) {
+            addCriterion("name__zh <=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLike(String value) {
+            addCriterion("name__zh like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotLike(String value) {
+            addCriterion("name__zh not like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIn(List<String> values) {
+            addCriterion("name__zh in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotIn(List<String> values) {
+            addCriterion("name__zh not in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhBetween(String value1, String value2) {
+            addCriterion("name__zh between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotBetween(String value1, String value2) {
+            addCriterion("name__zh not between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNull() {
+            addCriterion("name__en is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNotNull() {
+            addCriterion("name__en is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnEqualTo(String value) {
+            addCriterion("name__en =", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotEqualTo(String value) {
+            addCriterion("name__en <>", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThan(String value) {
+            addCriterion("name__en >", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThanOrEqualTo(String value) {
+            addCriterion("name__en >=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThan(String value) {
+            addCriterion("name__en <", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThanOrEqualTo(String value) {
+            addCriterion("name__en <=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLike(String value) {
+            addCriterion("name__en like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotLike(String value) {
+            addCriterion("name__en not like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIn(List<String> values) {
+            addCriterion("name__en in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotIn(List<String> values) {
+            addCriterion("name__en not in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnBetween(String value1, String value2) {
+            addCriterion("name__en between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotBetween(String value1, String value2) {
+            addCriterion("name__en not between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNull() {
+            addCriterion("ser is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNotNull() {
+            addCriterion("ser is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerEqualTo(Integer value) {
+            addCriterion("ser =", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotEqualTo(Integer value) {
+            addCriterion("ser <>", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThan(Integer value) {
+            addCriterion("ser >", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ser >=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThan(Integer value) {
+            addCriterion("ser <", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThanOrEqualTo(Integer value) {
+            addCriterion("ser <=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIn(List<Integer> values) {
+            addCriterion("ser in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotIn(List<Integer> values) {
+            addCriterion("ser not in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerBetween(Integer value1, Integer value2) {
+            addCriterion("ser between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotBetween(Integer value1, Integer value2) {
+            addCriterion("ser not between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 731 - 0
modelsrc/com/miniframe/model/es/EsUnitSQLBuilder.java

@@ -0,0 +1,731 @@
+package com.miniframe.model.es;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class EsUnitSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsUnitSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andUtIdIsNull() {
+            addCriterion("ut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdIsNotNull() {
+            addCriterion("ut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdEqualTo(String value) {
+            addCriterion("ut_id =", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotEqualTo(String value) {
+            addCriterion("ut_id <>", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdGreaterThan(String value) {
+            addCriterion("ut_id >", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ut_id >=", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLessThan(String value) {
+            addCriterion("ut_id <", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLessThanOrEqualTo(String value) {
+            addCriterion("ut_id <=", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLike(String value) {
+            addCriterion("ut_id like", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotLike(String value) {
+            addCriterion("ut_id not like", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdIn(List<String> values) {
+            addCriterion("ut_id in", values, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotIn(List<String> values) {
+            addCriterion("ut_id not in", values, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdBetween(String value1, String value2) {
+            addCriterion("ut_id between", value1, value2, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotBetween(String value1, String value2) {
+            addCriterion("ut_id not between", value1, value2, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIsNull() {
+            addCriterion("gut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIsNotNull() {
+            addCriterion("gut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdEqualTo(String value) {
+            addCriterion("gut_id =", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotEqualTo(String value) {
+            addCriterion("gut_id <>", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThan(String value) {
+            addCriterion("gut_id >", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("gut_id >=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThan(String value) {
+            addCriterion("gut_id <", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThanOrEqualTo(String value) {
+            addCriterion("gut_id <=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLike(String value) {
+            addCriterion("gut_id like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotLike(String value) {
+            addCriterion("gut_id not like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIn(List<String> values) {
+            addCriterion("gut_id in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotIn(List<String> values) {
+            addCriterion("gut_id not in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdBetween(String value1, String value2) {
+            addCriterion("gut_id between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotBetween(String value1, String value2) {
+            addCriterion("gut_id not between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNull() {
+            addCriterion("name_zh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNotNull() {
+            addCriterion("name_zh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhEqualTo(String value) {
+            addCriterion("name_zh =", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotEqualTo(String value) {
+            addCriterion("name_zh <>", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThan(String value) {
+            addCriterion("name_zh >", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThanOrEqualTo(String value) {
+            addCriterion("name_zh >=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThan(String value) {
+            addCriterion("name_zh <", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThanOrEqualTo(String value) {
+            addCriterion("name_zh <=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLike(String value) {
+            addCriterion("name_zh like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotLike(String value) {
+            addCriterion("name_zh not like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIn(List<String> values) {
+            addCriterion("name_zh in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotIn(List<String> values) {
+            addCriterion("name_zh not in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhBetween(String value1, String value2) {
+            addCriterion("name_zh between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotBetween(String value1, String value2) {
+            addCriterion("name_zh not between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNull() {
+            addCriterion("name_en is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNotNull() {
+            addCriterion("name_en is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnEqualTo(String value) {
+            addCriterion("name_en =", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotEqualTo(String value) {
+            addCriterion("name_en <>", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThan(String value) {
+            addCriterion("name_en >", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThanOrEqualTo(String value) {
+            addCriterion("name_en >=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThan(String value) {
+            addCriterion("name_en <", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThanOrEqualTo(String value) {
+            addCriterion("name_en <=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLike(String value) {
+            addCriterion("name_en like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotLike(String value) {
+            addCriterion("name_en not like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIn(List<String> values) {
+            addCriterion("name_en in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotIn(List<String> values) {
+            addCriterion("name_en not in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnBetween(String value1, String value2) {
+            addCriterion("name_en between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotBetween(String value1, String value2) {
+            addCriterion("name_en not between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(String value) {
+            addCriterion("value =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(String value) {
+            addCriterion("value <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(String value) {
+            addCriterion("value >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(String value) {
+            addCriterion("value >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(String value) {
+            addCriterion("value <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(String value) {
+            addCriterion("value <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLike(String value) {
+            addCriterion("value like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotLike(String value) {
+            addCriterion("value not like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<String> values) {
+            addCriterion("value in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<String> values) {
+            addCriterion("value not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(String value1, String value2) {
+            addCriterion("value between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(String value1, String value2) {
+            addCriterion("value not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorIsNull() {
+            addCriterion("factor is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorIsNotNull() {
+            addCriterion("factor is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorEqualTo(BigDecimal value) {
+            addCriterion("factor =", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorNotEqualTo(BigDecimal value) {
+            addCriterion("factor <>", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorGreaterThan(BigDecimal value) {
+            addCriterion("factor >", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("factor >=", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorLessThan(BigDecimal value) {
+            addCriterion("factor <", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("factor <=", value, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorIn(List<BigDecimal> values) {
+            addCriterion("factor in", values, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorNotIn(List<BigDecimal> values) {
+            addCriterion("factor not in", values, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("factor between", value1, value2, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactorNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("factor not between", value1, value2, "factor");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetIsNull() {
+            addCriterion("ut_offset is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetIsNotNull() {
+            addCriterion("ut_offset is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetEqualTo(BigDecimal value) {
+            addCriterion("ut_offset =", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetNotEqualTo(BigDecimal value) {
+            addCriterion("ut_offset <>", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetGreaterThan(BigDecimal value) {
+            addCriterion("ut_offset >", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ut_offset >=", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetLessThan(BigDecimal value) {
+            addCriterion("ut_offset <", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ut_offset <=", value, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetIn(List<BigDecimal> values) {
+            addCriterion("ut_offset in", values, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetNotIn(List<BigDecimal> values) {
+            addCriterion("ut_offset not in", values, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ut_offset between", value1, value2, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtOffsetNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ut_offset not between", value1, value2, "utOffset");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNull() {
+            addCriterion("ser is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNotNull() {
+            addCriterion("ser is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerEqualTo(Integer value) {
+            addCriterion("ser =", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotEqualTo(Integer value) {
+            addCriterion("ser <>", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThan(Integer value) {
+            addCriterion("ser >", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ser >=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThan(Integer value) {
+            addCriterion("ser <", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThanOrEqualTo(Integer value) {
+            addCriterion("ser <=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIn(List<Integer> values) {
+            addCriterion("ser in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotIn(List<Integer> values) {
+            addCriterion("ser not in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerBetween(Integer value1, Integer value2) {
+            addCriterion("ser between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotBetween(Integer value1, Integer value2) {
+            addCriterion("ser not between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 211 - 0
modelsrc/com/miniframe/model/es/EsUnitSys.java

@@ -0,0 +1,211 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "es_unit_sys")
+public class EsUnitSys extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 系统单位编号
+     */
+    @Id
+    @Column(name = "sut_id")
+    private String sutId;
+
+    /**
+     * 系统单位中文名
+     */
+    @Column(name = "name_zh")
+    private String nameZh;
+
+    /**
+     * 系统单位英文名
+     */
+    @Column(name = "name_en")
+    private String nameEn;
+
+    /**
+     * 系统单位类型
+     */
+    private Integer type;
+
+    /**
+     * 用户编码
+     */
+    private String uid;
+
+    /**
+     * 创建时间
+
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取系统单位编号
+     *
+     * @return sut_id - 系统单位编号
+     */
+    public String getSutId() {
+        return sutId;
+    }
+
+    /**
+     * 设置系统单位编号
+     *
+     * @param sutId 系统单位编号
+     */
+    public void setSutId(String sutId) {
+        this.sutId = sutId == null ? null : sutId.trim();
+    }
+
+    /**
+     * 获取系统单位中文名
+     *
+     * @return name_zh - 系统单位中文名
+     */
+    public String getNameZh() {
+        return nameZh;
+    }
+
+    /**
+     * 设置系统单位中文名
+     *
+     * @param nameZh 系统单位中文名
+     */
+    public void setNameZh(String nameZh) {
+        this.nameZh = nameZh == null ? null : nameZh.trim();
+    }
+
+    /**
+     * 获取系统单位英文名
+     *
+     * @return name_en - 系统单位英文名
+     */
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    /**
+     * 设置系统单位英文名
+     *
+     * @param nameEn 系统单位英文名
+     */
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn == null ? null : nameEn.trim();
+    }
+
+    /**
+     * 获取系统单位类型
+     *
+     * @return type - 系统单位类型
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 设置系统单位类型
+     *
+     * @param type 系统单位类型
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取用户编码
+     *
+     * @return uid - 用户编码
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户编码
+     *
+     * @param uid 用户编码
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取创建时间
+
+     *
+     * @return create_time - 创建时间
+
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+
+     *
+     * @param createTime 创建时间
+
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+
+     *
+     * @return update_time - 更新时间
+
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+
+     *
+     * @param updateTime 更新时间
+
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return remark - 描述
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param remark 描述
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

+ 130 - 0
modelsrc/com/miniframe/model/es/EsUnitSysDel.java

@@ -0,0 +1,130 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "es_unit_sys_del")
+public class EsUnitSysDel extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 单位系统组编号
+     */
+    @Id
+    @Column(name = "gsut_id")
+    private String gsutId;
+
+    /**
+     * 系统单位编号
+     */
+    @Column(name = "sut_id")
+    private String sutId;
+
+    /**
+     * 单位组编号
+     */
+    @Column(name = "gut_id")
+    private String gutId;
+
+    /**
+     * 单位表编号
+     */
+    @Column(name = "ut_id")
+    private String utId;
+
+    /**
+     * 默认单位表值
+     */
+    private String value;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取单位系统组编号
+     *
+     * @return gsut_id - 单位系统组编号
+     */
+    public String getGsutId() {
+        return gsutId;
+    }
+
+    /**
+     * 设置单位系统组编号
+     *
+     * @param gsutId 单位系统组编号
+     */
+    public void setGsutId(String gsutId) {
+        this.gsutId = gsutId == null ? null : gsutId.trim();
+    }
+
+    /**
+     * 获取系统单位编号
+     *
+     * @return sut_id - 系统单位编号
+     */
+    public String getSutId() {
+        return sutId;
+    }
+
+    /**
+     * 设置系统单位编号
+     *
+     * @param sutId 系统单位编号
+     */
+    public void setSutId(String sutId) {
+        this.sutId = sutId == null ? null : sutId.trim();
+    }
+
+    /**
+     * 获取单位组编号
+     *
+     * @return gut_id - 单位组编号
+     */
+    public String getGutId() {
+        return gutId;
+    }
+
+    /**
+     * 设置单位组编号
+     *
+     * @param gutId 单位组编号
+     */
+    public void setGutId(String gutId) {
+        this.gutId = gutId == null ? null : gutId.trim();
+    }
+
+    /**
+     * 获取单位表编号
+     *
+     * @return ut_id - 单位表编号
+     */
+    public String getUtId() {
+        return utId;
+    }
+
+    /**
+     * 设置单位表编号
+     *
+     * @param utId 单位表编号
+     */
+    public void setUtId(String utId) {
+        this.utId = utId == null ? null : utId.trim();
+    }
+
+    /**
+     * 获取默认单位表值
+     *
+     * @return value - 默认单位表值
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 设置默认单位表值
+     *
+     * @param value 默认单位表值
+     */
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+}

+ 550 - 0
modelsrc/com/miniframe/model/es/EsUnitSysDelSQLBuilder.java

@@ -0,0 +1,550 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EsUnitSysDelSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsUnitSysDelSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andGsutIdIsNull() {
+            addCriterion("gsut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdIsNotNull() {
+            addCriterion("gsut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdEqualTo(String value) {
+            addCriterion("gsut_id =", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdNotEqualTo(String value) {
+            addCriterion("gsut_id <>", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdGreaterThan(String value) {
+            addCriterion("gsut_id >", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("gsut_id >=", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdLessThan(String value) {
+            addCriterion("gsut_id <", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdLessThanOrEqualTo(String value) {
+            addCriterion("gsut_id <=", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdLike(String value) {
+            addCriterion("gsut_id like", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdNotLike(String value) {
+            addCriterion("gsut_id not like", value, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdIn(List<String> values) {
+            addCriterion("gsut_id in", values, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdNotIn(List<String> values) {
+            addCriterion("gsut_id not in", values, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdBetween(String value1, String value2) {
+            addCriterion("gsut_id between", value1, value2, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGsutIdNotBetween(String value1, String value2) {
+            addCriterion("gsut_id not between", value1, value2, "gsutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIsNull() {
+            addCriterion("sut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIsNotNull() {
+            addCriterion("sut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdEqualTo(String value) {
+            addCriterion("sut_id =", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotEqualTo(String value) {
+            addCriterion("sut_id <>", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThan(String value) {
+            addCriterion("sut_id >", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("sut_id >=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThan(String value) {
+            addCriterion("sut_id <", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThanOrEqualTo(String value) {
+            addCriterion("sut_id <=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLike(String value) {
+            addCriterion("sut_id like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotLike(String value) {
+            addCriterion("sut_id not like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIn(List<String> values) {
+            addCriterion("sut_id in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotIn(List<String> values) {
+            addCriterion("sut_id not in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdBetween(String value1, String value2) {
+            addCriterion("sut_id between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotBetween(String value1, String value2) {
+            addCriterion("sut_id not between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIsNull() {
+            addCriterion("gut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIsNotNull() {
+            addCriterion("gut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdEqualTo(String value) {
+            addCriterion("gut_id =", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotEqualTo(String value) {
+            addCriterion("gut_id <>", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThan(String value) {
+            addCriterion("gut_id >", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("gut_id >=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThan(String value) {
+            addCriterion("gut_id <", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLessThanOrEqualTo(String value) {
+            addCriterion("gut_id <=", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdLike(String value) {
+            addCriterion("gut_id like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotLike(String value) {
+            addCriterion("gut_id not like", value, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdIn(List<String> values) {
+            addCriterion("gut_id in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotIn(List<String> values) {
+            addCriterion("gut_id not in", values, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdBetween(String value1, String value2) {
+            addCriterion("gut_id between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGutIdNotBetween(String value1, String value2) {
+            addCriterion("gut_id not between", value1, value2, "gutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdIsNull() {
+            addCriterion("ut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdIsNotNull() {
+            addCriterion("ut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdEqualTo(String value) {
+            addCriterion("ut_id =", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotEqualTo(String value) {
+            addCriterion("ut_id <>", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdGreaterThan(String value) {
+            addCriterion("ut_id >", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ut_id >=", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLessThan(String value) {
+            addCriterion("ut_id <", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLessThanOrEqualTo(String value) {
+            addCriterion("ut_id <=", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdLike(String value) {
+            addCriterion("ut_id like", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotLike(String value) {
+            addCriterion("ut_id not like", value, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdIn(List<String> values) {
+            addCriterion("ut_id in", values, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotIn(List<String> values) {
+            addCriterion("ut_id not in", values, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdBetween(String value1, String value2) {
+            addCriterion("ut_id between", value1, value2, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUtIdNotBetween(String value1, String value2) {
+            addCriterion("ut_id not between", value1, value2, "utId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(String value) {
+            addCriterion("value =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(String value) {
+            addCriterion("value <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(String value) {
+            addCriterion("value >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(String value) {
+            addCriterion("value >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(String value) {
+            addCriterion("value <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(String value) {
+            addCriterion("value <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLike(String value) {
+            addCriterion("value like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotLike(String value) {
+            addCriterion("value not like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<String> values) {
+            addCriterion("value in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<String> values) {
+            addCriterion("value not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(String value1, String value2) {
+            addCriterion("value between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(String value1, String value2) {
+            addCriterion("value not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 731 - 0
modelsrc/com/miniframe/model/es/EsUnitSysSQLBuilder.java

@@ -0,0 +1,731 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EsUnitSysSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsUnitSysSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andSutIdIsNull() {
+            addCriterion("sut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIsNotNull() {
+            addCriterion("sut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdEqualTo(String value) {
+            addCriterion("sut_id =", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotEqualTo(String value) {
+            addCriterion("sut_id <>", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThan(String value) {
+            addCriterion("sut_id >", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("sut_id >=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThan(String value) {
+            addCriterion("sut_id <", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThanOrEqualTo(String value) {
+            addCriterion("sut_id <=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLike(String value) {
+            addCriterion("sut_id like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotLike(String value) {
+            addCriterion("sut_id not like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIn(List<String> values) {
+            addCriterion("sut_id in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotIn(List<String> values) {
+            addCriterion("sut_id not in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdBetween(String value1, String value2) {
+            addCriterion("sut_id between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotBetween(String value1, String value2) {
+            addCriterion("sut_id not between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNull() {
+            addCriterion("name_zh is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIsNotNull() {
+            addCriterion("name_zh is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhEqualTo(String value) {
+            addCriterion("name_zh =", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotEqualTo(String value) {
+            addCriterion("name_zh <>", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThan(String value) {
+            addCriterion("name_zh >", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhGreaterThanOrEqualTo(String value) {
+            addCriterion("name_zh >=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThan(String value) {
+            addCriterion("name_zh <", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLessThanOrEqualTo(String value) {
+            addCriterion("name_zh <=", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhLike(String value) {
+            addCriterion("name_zh like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotLike(String value) {
+            addCriterion("name_zh not like", value, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhIn(List<String> values) {
+            addCriterion("name_zh in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotIn(List<String> values) {
+            addCriterion("name_zh not in", values, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhBetween(String value1, String value2) {
+            addCriterion("name_zh between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameZhNotBetween(String value1, String value2) {
+            addCriterion("name_zh not between", value1, value2, "nameZh");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNull() {
+            addCriterion("name_en is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIsNotNull() {
+            addCriterion("name_en is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnEqualTo(String value) {
+            addCriterion("name_en =", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotEqualTo(String value) {
+            addCriterion("name_en <>", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThan(String value) {
+            addCriterion("name_en >", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnGreaterThanOrEqualTo(String value) {
+            addCriterion("name_en >=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThan(String value) {
+            addCriterion("name_en <", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLessThanOrEqualTo(String value) {
+            addCriterion("name_en <=", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnLike(String value) {
+            addCriterion("name_en like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotLike(String value) {
+            addCriterion("name_en not like", value, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnIn(List<String> values) {
+            addCriterion("name_en in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotIn(List<String> values) {
+            addCriterion("name_en not in", values, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnBetween(String value1, String value2) {
+            addCriterion("name_en between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEnNotBetween(String value1, String value2) {
+            addCriterion("name_en not between", value1, value2, "nameEn");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 164 - 0
modelsrc/com/miniframe/model/es/EsUnitSysUs.java

@@ -0,0 +1,164 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "es_unit_sys_us")
+public class EsUnitSysUs extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 个人单位系统编号
+     */
+    @Id
+    @Column(name = "per_ut_id")
+    private String perUtId;
+
+    /**
+     * 系统单位编号
+     */
+    @Column(name = "sut_id")
+    private String sutId;
+
+    /**
+     * 用户编码
+     */
+    private String uid;
+
+    /**
+     * 创建时间
+
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取个人单位系统编号
+     *
+     * @return per_ut_id - 个人单位系统编号
+     */
+    public String getPerUtId() {
+        return perUtId;
+    }
+
+    /**
+     * 设置个人单位系统编号
+     *
+     * @param perUtId 个人单位系统编号
+     */
+    public void setPerUtId(String perUtId) {
+        this.perUtId = perUtId == null ? null : perUtId.trim();
+    }
+
+    /**
+     * 获取系统单位编号
+     *
+     * @return sut_id - 系统单位编号
+     */
+    public String getSutId() {
+        return sutId;
+    }
+
+    /**
+     * 设置系统单位编号
+     *
+     * @param sutId 系统单位编号
+     */
+    public void setSutId(String sutId) {
+        this.sutId = sutId == null ? null : sutId.trim();
+    }
+
+    /**
+     * 获取用户编码
+     *
+     * @return uid - 用户编码
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户编码
+     *
+     * @param uid 用户编码
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取创建时间
+
+     *
+     * @return create_time - 创建时间
+
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+
+     *
+     * @param createTime 创建时间
+
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+
+     *
+     * @return update_time - 更新时间
+
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+
+     *
+     * @param updateTime 更新时间
+
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return remark - 描述
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param remark 描述
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

+ 601 - 0
modelsrc/com/miniframe/model/es/EsUnitSysUsSQLBuilder.java

@@ -0,0 +1,601 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EsUnitSysUsSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsUnitSysUsSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPerUtIdIsNull() {
+            addCriterion("per_ut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdIsNotNull() {
+            addCriterion("per_ut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdEqualTo(String value) {
+            addCriterion("per_ut_id =", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdNotEqualTo(String value) {
+            addCriterion("per_ut_id <>", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdGreaterThan(String value) {
+            addCriterion("per_ut_id >", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdGreaterThanOrEqualTo(String value) {
+            addCriterion("per_ut_id >=", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdLessThan(String value) {
+            addCriterion("per_ut_id <", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdLessThanOrEqualTo(String value) {
+            addCriterion("per_ut_id <=", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdLike(String value) {
+            addCriterion("per_ut_id like", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdNotLike(String value) {
+            addCriterion("per_ut_id not like", value, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdIn(List<String> values) {
+            addCriterion("per_ut_id in", values, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdNotIn(List<String> values) {
+            addCriterion("per_ut_id not in", values, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdBetween(String value1, String value2) {
+            addCriterion("per_ut_id between", value1, value2, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPerUtIdNotBetween(String value1, String value2) {
+            addCriterion("per_ut_id not between", value1, value2, "perUtId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIsNull() {
+            addCriterion("sut_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIsNotNull() {
+            addCriterion("sut_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdEqualTo(String value) {
+            addCriterion("sut_id =", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotEqualTo(String value) {
+            addCriterion("sut_id <>", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThan(String value) {
+            addCriterion("sut_id >", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdGreaterThanOrEqualTo(String value) {
+            addCriterion("sut_id >=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThan(String value) {
+            addCriterion("sut_id <", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLessThanOrEqualTo(String value) {
+            addCriterion("sut_id <=", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdLike(String value) {
+            addCriterion("sut_id like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotLike(String value) {
+            addCriterion("sut_id not like", value, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdIn(List<String> values) {
+            addCriterion("sut_id in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotIn(List<String> values) {
+            addCriterion("sut_id not in", values, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdBetween(String value1, String value2) {
+            addCriterion("sut_id between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSutIdNotBetween(String value1, String value2) {
+            addCriterion("sut_id not between", value1, value2, "sutId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsUnitGroupMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsUnitGroup;
+import com.miniframe.model.es.EsUnitGroupSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsUnitGroupMapper extends MiniserviceBaseDao, MFBaseMapper<EsUnitGroup> {
+    long countByExample(EsUnitGroupSQLBuilder example);
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsUnitMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsUnit;
+import com.miniframe.model.es.EsUnitSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsUnitMapper extends MiniserviceBaseDao, MFBaseMapper<EsUnit> {
+    long countByExample(EsUnitSQLBuilder example);
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsUnitSysDelMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsUnitSysDel;
+import com.miniframe.model.es.EsUnitSysDelSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsUnitSysDelMapper extends MiniserviceBaseDao, MFBaseMapper<EsUnitSysDel> {
+    long countByExample(EsUnitSysDelSQLBuilder example);
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsUnitSysMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsUnitSys;
+import com.miniframe.model.es.EsUnitSysSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsUnitSysMapper extends MiniserviceBaseDao, MFBaseMapper<EsUnitSys> {
+    long countByExample(EsUnitSysSQLBuilder example);
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsUnitSysUsMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsUnitSysUs;
+import com.miniframe.model.es.EsUnitSysUsSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsUnitSysUsMapper extends MiniserviceBaseDao, MFBaseMapper<EsUnitSysUs> {
+    long countByExample(EsUnitSysUsSQLBuilder example);
+}

+ 6 - 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 03 17:42:32 CST 2025.
+    This file was generated on Tue Jul 29 17:15:47 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />
@@ -20,5 +20,10 @@
     <mapper resource="com/miniframe/model/es/xml/EsProJobMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsProResultKeyMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsProResultValueMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsUnitMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsUnitGroupMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsUnitSysMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsUnitSysDelMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsUnitSysUsMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsUnitGroupMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsUnitGroupMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsUnitGroupSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_unit_group
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsUnitMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsUnitMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsUnitSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_unit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsUnitSysDelMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsUnitSysDelMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsUnitSysDelSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_unit_sys_del
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsUnitSysMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsUnitSysMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsUnitSysSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_unit_sys
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsUnitSysUsMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsUnitSysUsMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsUnitSysUsSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_unit_sys_us
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

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

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

@@ -0,0 +1,75 @@
+package com.miniframe.bisiness.es;
+
+import java.math.BigDecimal;
+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.ES0019BaseModel;
+import com.miniframe.generate.comm.es.D_ES0019_ROWS_RECODE;
+import com.miniframe.model.es.EsUnit;
+import com.miniframe.model.es.EsUnitSQLBuilder;
+import com.miniframe.model.es.dao.EsUnitMapper;
+
+/**
+ * 无锡发动机,“系统单位查看”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0019Service extends ES0019BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“系统单位查看”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String gutId = this.getA_es0019().getGutId();
+		EsUnitSQLBuilder sqlBuilder = new EsUnitSQLBuilder();
+		EsUnitSQLBuilder.Criteria esb = sqlBuilder.createCriteria();
+		esb.andGutIdEqualTo(gutId);
+		EsUnitMapper esUnitMapper = UtilTools.getBean(EsUnitMapper.class);
+		List<EsUnit> esUnitList =esUnitMapper.selectByExample(sqlBuilder);
+		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();
+			esu.setUtId(esUnit.getUtId());
+			esu.setGutId(esUnit.getGutId());
+			esu.setNameZh(esUnit.getNameZh());
+			esu.setNameEn(esUnit.getNameEn());
+			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);
+	}
+	
+	/**
+	 * 无锡发动机,“系统单位查看”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 64 - 0
src/main/java/com/miniframe/bisiness/es/ES0020Service.java

@@ -0,0 +1,64 @@
+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.ES0020BaseModel;
+import com.miniframe.model.es.EsUnitSys;
+import com.miniframe.model.es.dao.EsUnitSysMapper;
+
+/**
+ * 无锡发动机,“单位系统添加”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0020Service extends ES0020BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“单位系统添加”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		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());
+		esUnitSys.setNameZh(nameZh);
+		esUnitSys.setNameEn(nameEn);
+		esUnitSys.setType(0);
+		esUnitSys.setUid(this.getA_eshead().getUserId());
+		esUnitSys.setCreateTime(new Date());
+		esUnitSys.setUpdateTime(new Date());
+		esUnitSys.setRemark("");
+		esUnitSysMapper.insert(esUnitSys);
+	}
+	
+	/**
+	 * 无锡发动机,“单位系统添加”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsUnitDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsUnit;
+
+/**
+ * 实体列表,“ES_UNIT”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsUnitDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsUnit> list=l;
+		return list;
+	};
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsUnitGroupDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsUnitGroup;
+
+/**
+ * 实体列表,“ES_UNIT_GROUP”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsUnitGroupDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsUnitGroup> list=l;
+		return list;
+	};
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsUnitSysDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsUnitSys;
+
+/**
+ * 实体列表,“ES_UNIT_SYS”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsUnitSysDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsUnitSys> list=l;
+		return list;
+	};
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsUnitSysDelDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsUnitSysDel;
+
+/**
+ * 实体列表,“ES_UNIT_SYS_DEL”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsUnitSysDelDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsUnitSysDel> list=l;
+		return list;
+	};
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsUnitSysUsDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsUnitSysUs;
+
+/**
+ * 实体列表,“ES_UNIT_SYS_US”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsUnitSysUsDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsUnitSysUs> list=l;
+		return list;
+	};
+
+}

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

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

+ 6 - 1
系统设计/实体Bean/es(实体列表).csv

@@ -10,4 +10,9 @@
 9,ES_PRO_COM_ATT_DATA,项目组件属性值数据表,FALSE,
 10,ES_PRO_JOB,项目任务表,FALSE,
 11,ES_PRO_RESULT_KEY,项目组件结果键表,FALSE,
-12,ES_PRO_RESULT_VALUE,项目组件结果值表,FLASE,
+12,ES_PRO_RESULT_VALUE,项目组件结果值表,FALSE,
+13,ES_UNIT,单位表,FALSE,
+14,ES_UNIT_GROUP,单位组表,FALSE,
+15,ES_UNIT_SYS,系统单位表,FALSE,
+16,ES_UNIT_SYS_DEL,单位系统组表,FALSE,
+17,ES_UNIT_SYS_US,个人单位系统组表,FALSE,

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

@@ -17,6 +17,8 @@
 100016,ES0016,项目模拟数据组件属性删除,service,
 100017,ES0017,求解日志获取,service,
 100018,ES0018,文件打包下载,service,
+100019,ES0019,系统单位查看,service,
+100020,ES0020,单位系统添加,service,
 
 110001,ES1001,组件查询,service,
 110002,BES001,基础字典查询,service,

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

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

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

@@ -0,0 +1,10 @@
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据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,,,是,,,,,,,,

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

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

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

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