Эх сурвалжийг харах

项目组件属性值处理

huangxingxing 3 сар өмнө
parent
commit
1b683bad5d
46 өөрчлөгдсөн 3170 нэмэгдсэн , 7 устгасан
  1. 2 0
      dbscript/init/generate/03-functionInit.sql
  2. 112 0
      generated/com/miniframe/generate/business/es/model/ES0010BaseModel.java
  3. 112 0
      generated/com/miniframe/generate/business/es/model/ES0011BaseModel.java
  4. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0010.java
  5. 25 0
      generated/com/miniframe/generate/comm/es/A_ES0011.java
  6. 13 0
      generated/com/miniframe/generate/comm/es/D_ES0009_ROWS_RECODE.java
  7. 12 0
      generated/com/miniframe/generate/comm/es/D_ES0010.java
  8. 25 0
      generated/com/miniframe/generate/comm/es/D_ES0011.java
  9. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0010Client.java
  10. 99 0
      generated/com/miniframe/generate/comm/httpesapater/ES0011Client.java
  11. 2 0
      generated/validator/resources_a_es0010Form_validator.properties
  12. 2 0
      generated/validator/resources_a_es0010Form_validator_zh_CN.properties
  13. 2 0
      generated/validator/resources_a_es0011Form_validator.properties
  14. 2 0
      generated/validator/resources_a_es0011Form_validator_zh_CN.properties
  15. 1 0
      generated/validator/resources_d_es0009_rows_recodeForm_validator.properties
  16. 1 0
      generated/validator/resources_d_es0009_rows_recodeForm_validator_zh_CN.properties
  17. 1 0
      generated/validator/resources_d_es0010Form_validator.properties
  18. 1 0
      generated/validator/resources_d_es0010Form_validator_zh_CN.properties
  19. 2 0
      generated/validator/resources_d_es0011Form_validator.properties
  20. 2 0
      generated/validator/resources_d_es0011Form_validator_zh_CN.properties
  21. 209 0
      modelsrc/com/miniframe/model/es/EsData.java
  22. 305 0
      modelsrc/com/miniframe/model/es/EsDataAtt.java
  23. 1001 0
      modelsrc/com/miniframe/model/es/EsDataAttSQLBuilder.java
  24. 731 0
      modelsrc/com/miniframe/model/es/EsDataSQLBuilder.java
  25. 10 0
      modelsrc/com/miniframe/model/es/dao/EsDataAttMapper.java
  26. 10 0
      modelsrc/com/miniframe/model/es/dao/EsDataMapper.java
  27. 3 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  28. 50 0
      modelsrc/com/miniframe/model/es/xml/EsDataAttMapper.xml
  29. 50 0
      modelsrc/com/miniframe/model/es/xml/EsDataMapper.xml
  30. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  31. 1 0
      src/main/java/com/miniframe/bisiness/es/ES0009Service.java
  32. 48 0
      src/main/java/com/miniframe/bisiness/es/ES0010Service.java
  33. 48 0
      src/main/java/com/miniframe/bisiness/es/ES0011Service.java
  34. 23 0
      src/main/java/com/miniframe/dbtransfer/EsDataAttDbTransfer.java
  35. 23 0
      src/main/java/com/miniframe/dbtransfer/EsDataDbTransfer.java
  36. 2 1
      src/main/java/com/miniframe/mappers/es/dao/EsMapper.java
  37. 3 1
      src/main/java/com/miniframe/mappers/es/model/ProComAttDto.java
  38. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0010Test.java
  39. 44 0
      src/test/java/com/miniframe/comm/httpesapater/ES0011Test.java
  40. 3 1
      系统设计/实体Bean/es(实体列表).csv
  41. 2 1
      系统设计/系统模块/ES(无锡发动机).csv
  42. 2 1
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0009_D(项目组件属性查询).csv
  43. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0010_A(项目组件属性值数据查询).csv
  44. 11 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0010_D(项目组件属性值数据查询).csv
  45. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0011_A(项目组件属性值数据添加修改).csv
  46. 2 0
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0011_D(项目组件属性值数据添加修改).csv

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

@@ -11,6 +11,8 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0007', '无锡发动机','项目组件连线删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0008', '无锡发动机','项目组件属性修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0009', '无锡发动机','项目组件属性查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0010', '无锡发动机','项目组件属性值数据查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES0011', '无锡发动机','项目组件属性值数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('ES1001', '无锡发动机','组件查询',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0010BaseModel.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_ES0010;
+import com.miniframe.generate.comm.es.D_ES0010;
+
+/**
+ * 无锡发动机,“项目组件属性值数据查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0010BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0010 a_es0010;//上行体
+	D_ES0010 d_es0010;//下行体
+
+	public ES0010BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0010=new A_ES0010();
+		d_es0010=new D_ES0010();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0010.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_ES0010.class);
+		this.a_es0010 = UtilTools.map2Obj(bodyMap, A_ES0010.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_es0010));
+
+		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_ES0010 getA_es0010() {
+		return a_es0010;
+	}
+
+	public void setA_es0010(A_ES0010 a_es0010) {
+		this.a_es0010=a_es0010;
+	}
+
+	public D_ES0010 getD_es0010() {
+		return this.d_es0010;
+	}
+
+	public void setD_es0010(D_ES0010 d_es0010) {
+		this.d_es0010=d_es0010;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/es/model/ES0011BaseModel.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_ES0011;
+import com.miniframe.generate.comm.es.D_ES0011;
+
+/**
+ * 无锡发动机,“项目组件属性值数据添加修改”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ES0011BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_ESHEAD a_eshead;//上行头
+	D_ESHEAD d_eshead;//下行头
+	A_ES0011 a_es0011;//上行体
+	D_ES0011 d_es0011;//下行体
+
+	public ES0011BaseModel(){
+		a_eshead=new A_ESHEAD();
+		d_eshead=new D_ESHEAD();
+		a_es0011=new A_ES0011();
+		d_es0011=new D_ES0011();
+	}
+
+	public void validater() throws Exception {
+		this.a_eshead.validater();
+		this.a_es0011.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_ES0011.class);
+		this.a_es0011 = UtilTools.map2Obj(bodyMap, A_ES0011.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_es0011));
+
+		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_ES0011 getA_es0011() {
+		return a_es0011;
+	}
+
+	public void setA_es0011(A_ES0011 a_es0011) {
+		this.a_es0011=a_es0011;
+	}
+
+	public D_ES0011 getD_es0011() {
+		return this.d_es0011;
+	}
+
+	public void setD_es0011(D_ES0011 d_es0011) {
+		this.d_es0011=d_es0011;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据查询
+ */
+public class A_ES0010 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcaId;//项目组件属性ID
+	/**
+	 *项目组件属性ID
+	 */
+	public void setPcaId(String pcaId) {
+		this.pcaId=pcaId;
+	}
+	/**
+	 *项目组件属性ID
+	 */
+	public String getPcaId() {
+		return this.pcaId;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据添加修改
+ */
+public class A_ES0011 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcaId;//项目组件属性ID
+	/**
+	 *项目组件属性ID
+	 */
+	public void setPcaId(String pcaId) {
+		this.pcaId=pcaId;
+	}
+	/**
+	 *项目组件属性ID
+	 */
+	public String getPcaId() {
+		return this.pcaId;
+	}
+}

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

@@ -113,4 +113,17 @@ public class D_ES0009_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getValueDef() {
 		return this.valueDef;
 	}
+	int dataType;//值数据类型
+	/**
+	 *值数据类型
+	 */
+	public void setDataType(int dataType) {
+		this.dataType=dataType;
+	}
+	/**
+	 *值数据类型
+	 */
+	public int getDataType() {
+		return this.dataType;
+	}
 }

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

@@ -0,0 +1,12 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据查询
+ */
+public class D_ES0010 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据添加修改
+ */
+public class D_ES0011 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcaId;//项目组件属性ID
+	/**
+	 *项目组件属性ID
+	 */
+	public void setPcaId(String pcaId) {
+		this.pcaId=pcaId;
+	}
+	/**
+	 *项目组件属性ID
+	 */
+	public String getPcaId() {
+		return this.pcaId;
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/ES0010Client.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_ES0010;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+
+import com.miniframe.generate.business.es.model.ES0010BaseModel;
+
+public class ES0010Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0010Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [无锡发动机->项目组件属性值数据查询((ES0010)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0010BaseModel execute(ES0010BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0010BaseModel execute(ES0010BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(ES0010BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0010BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_eshead().getTransCode())){
+			model.getA_eshead().setTransCode("ES0010");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_eshead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_es0010()));
+		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_ES0010 d_es0010 =  UtilTools.map2Obj(outMap, D_ES0010.class);
+			model.setD_eshead(d_eshead);
+			model.setD_es0010(d_es0010);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0010BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0010BaseModel execute(ES0010BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpesapater/ES0011Client.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_ES0011;
+import com.miniframe.generate.comm.es.D_ESHEAD;
+
+import com.miniframe.generate.business.es.model.ES0011BaseModel;
+
+public class ES0011Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0011Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [无锡发动机->项目组件属性值数据添加修改((ES0011)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0011BaseModel execute(ES0011BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0011BaseModel execute(ES0011BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(ES0011BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0011BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_eshead().getTransCode())){
+			model.getA_eshead().setTransCode("ES0011");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_eshead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_es0011()));
+		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_ES0011 d_es0011 =  UtilTools.map2Obj(outMap, D_ES0011.class);
+			model.setD_eshead(d_eshead);
+			model.setD_es0011(d_es0011);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(ES0011BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public ES0011BaseModel execute(ES0011BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 2 - 0
generated/validator/resources_a_es0010Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0010.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0010Form = true

+ 2 - 0
generated/validator/resources_a_es0010Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0010.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0010Form = true

+ 2 - 0
generated/validator/resources_a_es0011Form_validator.properties

@@ -0,0 +1,2 @@
+a_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0011Form = true

+ 2 - 0
generated/validator/resources_a_es0011Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+a_es0011Form = true

+ 1 - 0
generated/validator/resources_d_es0009_rows_recodeForm_validator.properties

@@ -6,4 +6,5 @@ d_es0009_rows_recode.name = \u5C5E\u6027\u540D\u79F0
 d_es0009_rows_recode.code = \u5C5E\u6027\u7F16\u7801
 d_es0009_rows_recode.valueType = \u503C\u7C7B\u578B
 d_es0009_rows_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0009_rows_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
 d_es0009_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_es0009_rows_recodeForm_validator_zh_CN.properties

@@ -6,4 +6,5 @@ d_es0009_rows_recode.name = \u5C5E\u6027\u540D\u79F0
 d_es0009_rows_recode.code = \u5C5E\u6027\u7F16\u7801
 d_es0009_rows_recode.valueType = \u503C\u7C7B\u578B
 d_es0009_rows_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0009_rows_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
 d_es0009_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_es0010Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_es0010Form_validator_zh_CN.properties

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

+ 2 - 0
generated/validator/resources_d_es0011Form_validator.properties

@@ -0,0 +1,2 @@
+d_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0011Form = true

+ 2 - 0
generated/validator/resources_d_es0011Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_es0011.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0011Form = true

+ 209 - 0
modelsrc/com/miniframe/model/es/EsData.java

@@ -0,0 +1,209 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "es_data")
+public class EsData extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 数据配置id
+     */
+    @Id
+    @Column(name = "cd_id")
+    private String cdId;
+
+    /**
+     * 数据配置编码
+     */
+    private String code;
+
+    /**
+     * 数据配置名称
+     */
+    private String name;
+
+    /**
+     * 用户编码
+     */
+    private String uid;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 1-列表 2-键值对
+     */
+    private Short type;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取数据配置id
+     *
+     * @return cd_id - 数据配置id
+     */
+    public String getCdId() {
+        return cdId;
+    }
+
+    /**
+     * 设置数据配置id
+     *
+     * @param cdId 数据配置id
+     */
+    public void setCdId(String cdId) {
+        this.cdId = cdId == null ? null : cdId.trim();
+    }
+
+    /**
+     * 获取数据配置编码
+     *
+     * @return code - 数据配置编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置数据配置编码
+     *
+     * @param code 数据配置编码
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * 获取数据配置名称
+     *
+     * @return name - 数据配置名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置数据配置名称
+     *
+     * @param name 数据配置名称
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * 获取用户编码
+     *
+     * @return uid - 用户编码
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户编码
+     *
+     * @param uid 用户编码
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return remark - 描述
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param remark 描述
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.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;
+    }
+
+    /**
+     * 获取1-列表 2-键值对
+     *
+     * @return type - 1-列表 2-键值对
+     */
+    public Short getType() {
+        return type;
+    }
+
+    /**
+     * 设置1-列表 2-键值对
+     *
+     * @param type 1-列表 2-键值对
+     */
+    public void setType(Short type) {
+        this.type = type;
+    }
+}

+ 305 - 0
modelsrc/com/miniframe/model/es/EsDataAtt.java

@@ -0,0 +1,305 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "es_data_att")
+public class EsDataAtt extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 数据属性ID
+     */
+    @Id
+    @Column(name = "cdv_id")
+    private String cdvId;
+
+    /**
+     * 数据属性Code
+     */
+    private String code;
+
+    /**
+     * 数据属性名称
+     */
+    private String name;
+
+    /**
+     * 单位类型
+     */
+    @Column(name = "unit_type")
+    private String unitType;
+
+    /**
+     * 数值类型
+     */
+    @Column(name = "value_type")
+    private Short valueType;
+
+    /**
+     * 数值默认
+     */
+    @Column(name = "value_def")
+    private String valueDef;
+
+    /**
+     * 用户编码
+     */
+    private String uid;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 序号
+     */
+    private Integer ser;
+
+    /**
+     * 数据配置id
+     */
+    @Column(name = "cd_id")
+    private String cdId;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取数据属性ID
+     *
+     * @return cdv_id - 数据属性ID
+     */
+    public String getCdvId() {
+        return cdvId;
+    }
+
+    /**
+     * 设置数据属性ID
+     *
+     * @param cdvId 数据属性ID
+     */
+    public void setCdvId(String cdvId) {
+        this.cdvId = cdvId == null ? null : cdvId.trim();
+    }
+
+    /**
+     * 获取数据属性Code
+     *
+     * @return code - 数据属性Code
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置数据属性Code
+     *
+     * @param code 数据属性Code
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * 获取数据属性名称
+     *
+     * @return name - 数据属性名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置数据属性名称
+     *
+     * @param name 数据属性名称
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * 获取单位类型
+     *
+     * @return unit_type - 单位类型
+     */
+    public String getUnitType() {
+        return unitType;
+    }
+
+    /**
+     * 设置单位类型
+     *
+     * @param unitType 单位类型
+     */
+    public void setUnitType(String unitType) {
+        this.unitType = unitType == null ? null : unitType.trim();
+    }
+
+    /**
+     * 获取数值类型
+     *
+     * @return value_type - 数值类型
+     */
+    public Short getValueType() {
+        return valueType;
+    }
+
+    /**
+     * 设置数值类型
+     *
+     * @param valueType 数值类型
+     */
+    public void setValueType(Short valueType) {
+        this.valueType = valueType;
+    }
+
+    /**
+     * 获取数值默认
+     *
+     * @return value_def - 数值默认
+     */
+    public String getValueDef() {
+        return valueDef;
+    }
+
+    /**
+     * 设置数值默认
+     *
+     * @param valueDef 数值默认
+     */
+    public void setValueDef(String valueDef) {
+        this.valueDef = valueDef == null ? null : valueDef.trim();
+    }
+
+    /**
+     * 获取用户编码
+     *
+     * @return uid - 用户编码
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户编码
+     *
+     * @param uid 用户编码
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return remark - 描述
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param remark 描述
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.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 ser - 序号
+     */
+    public Integer getSer() {
+        return ser;
+    }
+
+    /**
+     * 设置序号
+     *
+     * @param ser 序号
+     */
+    public void setSer(Integer ser) {
+        this.ser = ser;
+    }
+
+    /**
+     * 获取数据配置id
+     *
+     * @return cd_id - 数据配置id
+     */
+    public String getCdId() {
+        return cdId;
+    }
+
+    /**
+     * 设置数据配置id
+     *
+     * @param cdId 数据配置id
+     */
+    public void setCdId(String cdId) {
+        this.cdId = cdId == null ? null : cdId.trim();
+    }
+}

+ 1001 - 0
modelsrc/com/miniframe/model/es/EsDataAttSQLBuilder.java

@@ -0,0 +1,1001 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EsDataAttSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsDataAttSQLBuilder() {
+        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 andCdvIdIsNull() {
+            addCriterion("cdv_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdIsNotNull() {
+            addCriterion("cdv_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdEqualTo(String value) {
+            addCriterion("cdv_id =", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotEqualTo(String value) {
+            addCriterion("cdv_id <>", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdGreaterThan(String value) {
+            addCriterion("cdv_id >", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdGreaterThanOrEqualTo(String value) {
+            addCriterion("cdv_id >=", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLessThan(String value) {
+            addCriterion("cdv_id <", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLessThanOrEqualTo(String value) {
+            addCriterion("cdv_id <=", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLike(String value) {
+            addCriterion("cdv_id like", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotLike(String value) {
+            addCriterion("cdv_id not like", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdIn(List<String> values) {
+            addCriterion("cdv_id in", values, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotIn(List<String> values) {
+            addCriterion("cdv_id not in", values, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdBetween(String value1, String value2) {
+            addCriterion("cdv_id between", value1, value2, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotBetween(String value1, String value2) {
+            addCriterion("cdv_id not between", value1, value2, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeIsNull() {
+            addCriterion("unit_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeIsNotNull() {
+            addCriterion("unit_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeEqualTo(String value) {
+            addCriterion("unit_type =", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeNotEqualTo(String value) {
+            addCriterion("unit_type <>", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeGreaterThan(String value) {
+            addCriterion("unit_type >", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("unit_type >=", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeLessThan(String value) {
+            addCriterion("unit_type <", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeLessThanOrEqualTo(String value) {
+            addCriterion("unit_type <=", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeLike(String value) {
+            addCriterion("unit_type like", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeNotLike(String value) {
+            addCriterion("unit_type not like", value, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeIn(List<String> values) {
+            addCriterion("unit_type in", values, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeNotIn(List<String> values) {
+            addCriterion("unit_type not in", values, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeBetween(String value1, String value2) {
+            addCriterion("unit_type between", value1, value2, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitTypeNotBetween(String value1, String value2) {
+            addCriterion("unit_type not between", value1, value2, "unitType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeIsNull() {
+            addCriterion("value_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeIsNotNull() {
+            addCriterion("value_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeEqualTo(Short value) {
+            addCriterion("value_type =", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeNotEqualTo(Short value) {
+            addCriterion("value_type <>", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeGreaterThan(Short value) {
+            addCriterion("value_type >", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeGreaterThanOrEqualTo(Short value) {
+            addCriterion("value_type >=", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeLessThan(Short value) {
+            addCriterion("value_type <", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeLessThanOrEqualTo(Short value) {
+            addCriterion("value_type <=", value, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeIn(List<Short> values) {
+            addCriterion("value_type in", values, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeNotIn(List<Short> values) {
+            addCriterion("value_type not in", values, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeBetween(Short value1, Short value2) {
+            addCriterion("value_type between", value1, value2, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueTypeNotBetween(Short value1, Short value2) {
+            addCriterion("value_type not between", value1, value2, "valueType");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefIsNull() {
+            addCriterion("value_def is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefIsNotNull() {
+            addCriterion("value_def is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefEqualTo(String value) {
+            addCriterion("value_def =", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefNotEqualTo(String value) {
+            addCriterion("value_def <>", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefGreaterThan(String value) {
+            addCriterion("value_def >", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefGreaterThanOrEqualTo(String value) {
+            addCriterion("value_def >=", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefLessThan(String value) {
+            addCriterion("value_def <", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefLessThanOrEqualTo(String value) {
+            addCriterion("value_def <=", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefLike(String value) {
+            addCriterion("value_def like", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefNotLike(String value) {
+            addCriterion("value_def not like", value, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefIn(List<String> values) {
+            addCriterion("value_def in", values, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefNotIn(List<String> values) {
+            addCriterion("value_def not in", values, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefBetween(String value1, String value2) {
+            addCriterion("value_def between", value1, value2, "valueDef");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueDefNotBetween(String value1, String value2) {
+            addCriterion("value_def not between", value1, value2, "valueDef");
+            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 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 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 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 Criteria andCdIdIsNull() {
+            addCriterion("cd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIsNotNull() {
+            addCriterion("cd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdEqualTo(String value) {
+            addCriterion("cd_id =", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotEqualTo(String value) {
+            addCriterion("cd_id <>", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThan(String value) {
+            addCriterion("cd_id >", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("cd_id >=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThan(String value) {
+            addCriterion("cd_id <", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThanOrEqualTo(String value) {
+            addCriterion("cd_id <=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLike(String value) {
+            addCriterion("cd_id like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotLike(String value) {
+            addCriterion("cd_id not like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIn(List<String> values) {
+            addCriterion("cd_id in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotIn(List<String> values) {
+            addCriterion("cd_id not in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdBetween(String value1, String value2) {
+            addCriterion("cd_id between", value1, value2, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotBetween(String value1, String value2) {
+            addCriterion("cd_id not between", value1, value2, "cdId");
+            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/EsDataSQLBuilder.java

@@ -0,0 +1,731 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EsDataSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsDataSQLBuilder() {
+        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 andCdIdIsNull() {
+            addCriterion("cd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIsNotNull() {
+            addCriterion("cd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdEqualTo(String value) {
+            addCriterion("cd_id =", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotEqualTo(String value) {
+            addCriterion("cd_id <>", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThan(String value) {
+            addCriterion("cd_id >", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("cd_id >=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThan(String value) {
+            addCriterion("cd_id <", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThanOrEqualTo(String value) {
+            addCriterion("cd_id <=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLike(String value) {
+            addCriterion("cd_id like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotLike(String value) {
+            addCriterion("cd_id not like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIn(List<String> values) {
+            addCriterion("cd_id in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotIn(List<String> values) {
+            addCriterion("cd_id not in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdBetween(String value1, String value2) {
+            addCriterion("cd_id between", value1, value2, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotBetween(String value1, String value2) {
+            addCriterion("cd_id not between", value1, value2, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria 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 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 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 andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Short value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Short value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Short value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Short value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Short value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Short value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Short> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Short> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Short value1, Short value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Short value1, Short value2) {
+            addCriterion("type not between", value1, value2, "type");
+            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/EsDataAttMapper.java

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

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

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

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

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Tue May 27 10:26:14 CST 2025.
+    This file was generated on Thu May 29 17:43:19 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />
@@ -14,5 +14,7 @@
     <mapper resource="com/miniframe/model/es/xml/EsProComMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsProComAttMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsProComConMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsDataMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsDataAttMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsDataAttMapper.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.EsDataAttMapper">
+  <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.EsDataAttSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_data_att
+    <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/EsDataMapper.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.EsDataMapper">
+  <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.EsDataSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_data
+    <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 Tue May 27 10:26:15 CST 2025.
+    This file was generated on Thu May 29 17:43:20 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -41,6 +41,7 @@ public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
 			row.setCode(dto.getCode());
 			row.setValueType(dto.getValueType());
 			row.setValueDef(dto.getValueDef());
+			row.setDataType(dto.getDataType());
 			rows.add(row);
 		}
 		this.getD_es0009().setRows(rows);

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

@@ -0,0 +1,48 @@
+package com.miniframe.bisiness.es;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.generate.business.es.model.ES0010BaseModel;
+
+/**
+ * 无锡发动机,“项目组件属性值数据查询”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“项目组件属性值数据查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+	
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据查询”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据查询”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据查询”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

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

@@ -0,0 +1,48 @@
+package com.miniframe.bisiness.es;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.generate.business.es.model.ES0011BaseModel;
+
+/**
+ * 无锡发动机,“项目组件属性值数据添加修改”逻辑处理(重新生成不覆盖)。
+ */
+public class ES0011Service extends ES0011BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 无锡发动机,“项目组件属性值数据添加修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+	
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据添加修改”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据添加修改”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 无锡发动机,“项目组件属性值数据添加修改”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsDataAttDbTransfer.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.system.EsDataAtt;
+
+/**
+ * 实体列表,“ES_DATA_ATT”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsDataAttDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsDataAtt> list=l;
+		return list;
+	};
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsDataDbTransfer.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.system.EsData;
+
+/**
+ * 实体列表,“ES_DATA”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsDataDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsData> list=l;
+		return list;
+	};
+
+}

+ 2 - 1
src/main/java/com/miniframe/mappers/es/dao/EsMapper.java

@@ -24,7 +24,8 @@ public interface EsMapper extends MiniserviceBaseDao {
             "b.name as name," +
             "b.code as code," +
             "b.value_def as valueDef," +
-            "b.value_type as valueType " +
+            "b.value_type as valueType, " +
+            "(select max(c.type) from es_data as c where c.code = b.value_def) as dataType " +
             "from es_pro_com_att a,es_att b where a.att_id=b.att_id and pc_id=#{pcId} ORDER BY ser asc;")
     List<ProComAttDto> selectPrComAttList(String pcId);
 }

+ 3 - 1
src/main/java/com/miniframe/mappers/es/model/ProComAttDto.java

@@ -15,6 +15,7 @@ public class ProComAttDto {
     private String code;
     private Integer valueType;
     private String valueDef;
+    private Integer dataType;
 
     @Override
     public String toString() {
@@ -22,11 +23,12 @@ public class ProComAttDto {
                 "pcaId='" + pcaId + '\'' +
                 ", value='" + value + '\'' +
                 ", unit='" + unit + '\'' +
-                ", unitType=" + unitType +
+                ", unitType='" + unitType + '\'' +
                 ", name='" + name + '\'' +
                 ", code='" + code + '\'' +
                 ", valueType=" + valueType +
                 ", valueDef='" + valueDef + '\'' +
+                ", dataType=" + dataType +
                 '}';
     }
 }

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/ES0010Test.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_ES0010;
+import com.miniframe.generate.comm.httpesapater.ES0010Client;
+import com.miniframe.generate.business.es.model.ES0010BaseModel;
+
+public class ES0010Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0010Test.class);
+
+	/**
+	 * 项目组件属性值数据查询,获取报文体
+	 * @return
+	 */
+	public static A_ES0010 getA_es0010() {
+		A_ES0010 a_es0010 = new A_ES0010();
+
+		// ----------以下增加【项目组件属性值数据查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0010;
+	}
+	
+	/**
+	 * 运行客户端测试,项目组件属性值数据查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0010BaseModel model = new ES0010BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0010"));
+		model.setA_es0010(ES0010Test.getA_es0010());
+		ES0010Client client = new ES0010Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpesapater/ES0011Test.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_ES0011;
+import com.miniframe.generate.comm.httpesapater.ES0011Client;
+import com.miniframe.generate.business.es.model.ES0011BaseModel;
+
+public class ES0011Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(ES0011Test.class);
+
+	/**
+	 * 项目组件属性数据查询,获取报文体
+	 * @return
+	 */
+	public static A_ES0011 getA_es0011() {
+		A_ES0011 a_es0011 = new A_ES0011();
+
+		// ----------以下增加【项目组件属性数据查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_es0011;
+	}
+	
+	/**
+	 * 运行客户端测试,项目组件属性数据查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		ES0011BaseModel model = new ES0011BaseModel();
+		model.setA_eshead(HttpesapaterUtil.getA_eshead("ES0011"));
+		model.setA_es0011(ES0011Test.getA_es0011());
+		ES0011Client client = new ES0011Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -4,4 +4,6 @@
 3,ES_ATT,属性表,FALSE,
 4,ES_PRO_COM,项目组件表,FALSE,
 5,ES_PRO_COM_ATT,项目组件属性表,FALSE,
-6,ES_PRO_COM_CON,项目组件链接表,FALSE,
+6,ES_PRO_COM_CON,项目组件链接表,FALSE,
+7,ES_DATA,数据配置表,FALSE,
+8,ES_DATA_ATT,数据属性配置表,FALSE,

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

@@ -9,6 +9,7 @@
 100007,ES0007,项目组件连线删除,service,
 100008,ES0008,项目组件属性修改,service,
 100008,ES0009,项目组件属性查询,service,
-
+100010,ES0010,项目组件属性值数据查询,service,
+100011,ES0011,项目组件属性值数据添加修改,service,
 
 110001,ES1001,组件查询,service,

+ 2 - 1
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0009_D(项目组件属性查询).csv

@@ -7,4 +7,5 @@
 1.5,name,属性名称,string,,,,,,,,,,,
 1.6,code,属性编码,string,,,,,,,,,,,
 1.7,valueType,值类型,int,,,,,,,,,,,
-1.8,valueDef,默认值,string,,,,,,,,,,,
+1.8,valueDef,默认值,string,,,,,,,,,,,
+1.9,dataType,值数据类型,int,,,,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0010_A(项目组件属性值数据查询).csv

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

+ 11 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0010_D(项目组件属性值数据查询).csv

@@ -0,0 +1,11 @@
+"序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
+1,pcaId,项目组件属性ID,string,,,,,,,,,,,
+2,rows,数据,list,,,,0,,,,,,,
+2.1,pcadgId,项目组件属性数据分组ID,string,,,,,,,,,,,
+2.2,vals,数据,list,,,,0,,,,,,,
+2.2.1,pcadId,项目组件属性数据ID,string,,,,,,,,,,,
+2.2.2,name,数据属性名称,string,,,,,,,,,,,
+2.2.3,code,数据属性Code,string,,,,,,,,,,,
+2.2.4,valueType,值类型,int,,,,,,,,,,,
+2.2.5,valueDef,默认值,string,,,,,,,,,,,
+3,dataType,值数据类型,int,,,,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0011_A(项目组件属性值数据添加修改).csv

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

+ 2 - 0
系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0011_D(项目组件属性值数据添加修改).csv

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