huangxingxing 1 سال پیش
والد
کامیت
47290f1bf5
56فایلهای تغییر یافته به همراه2259 افزوده شده و 5 حذف شده
  1. 3 0
      dbscript/init/generate/03-functionInit.sql
  2. 2 0
      definitionsrc/returncode/returncode-business.properties
  3. 2 0
      definitionsrc/returncode/returncode-business_zh_CN.properties
  4. 112 0
      generated/com/miniframe/generate/business/system/model/D10013BaseModel.java
  5. 112 0
      generated/com/miniframe/generate/business/system/model/D10014BaseModel.java
  6. 112 0
      generated/com/miniframe/generate/business/system/model/D10015BaseModel.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10013Client.java
  8. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10014Client.java
  9. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10015Client.java
  10. 12 0
      generated/com/miniframe/generate/comm/system/A_D10013.java
  11. 90 0
      generated/com/miniframe/generate/comm/system/A_D10014.java
  12. 25 0
      generated/com/miniframe/generate/comm/system/A_D10015.java
  13. 39 0
      generated/com/miniframe/generate/comm/system/D_D10013.java
  14. 90 0
      generated/com/miniframe/generate/comm/system/D_D10013_ROWS_RECODE.java
  15. 25 0
      generated/com/miniframe/generate/comm/system/D_D10014.java
  16. 12 0
      generated/com/miniframe/generate/comm/system/D_D10015.java
  17. 24 0
      generated/validateform/a_d10014Form.xml
  18. 12 0
      generated/validateform/a_d10015Form.xml
  19. 22 0
      generated/validateform/d_d10013Form.xml
  20. 1 0
      generated/validator/resources_a_d10013Form_validator.properties
  21. 1 0
      generated/validator/resources_a_d10013Form_validator_zh_CN.properties
  22. 7 0
      generated/validator/resources_a_d10014Form_validator.properties
  23. 7 0
      generated/validator/resources_a_d10014Form_validator_zh_CN.properties
  24. 2 0
      generated/validator/resources_a_d10015Form_validator.properties
  25. 2 0
      generated/validator/resources_a_d10015Form_validator_zh_CN.properties
  26. 2 0
      generated/validator/resources_d_d10013Form_validator.properties
  27. 2 0
      generated/validator/resources_d_d10013Form_validator_zh_CN.properties
  28. 7 0
      generated/validator/resources_d_d10013_rows_recodeForm_validator.properties
  29. 7 0
      generated/validator/resources_d_d10013_rows_recodeForm_validator_zh_CN.properties
  30. 2 0
      generated/validator/resources_d_d10014Form_validator.properties
  31. 2 0
      generated/validator/resources_d_d10014Form_validator_zh_CN.properties
  32. 1 0
      generated/validator/resources_d_d10015Form_validator.properties
  33. 1 0
      generated/validator/resources_d_d10015Form_validator_zh_CN.properties
  34. 142 0
      modelsrc/com/miniframe/model/system/DCon.java
  35. 580 0
      modelsrc/com/miniframe/model/system/DConSQLBuilder.java
  36. 10 0
      modelsrc/com/miniframe/model/system/dao/DConMapper.java
  37. 2 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  38. 50 0
      modelsrc/com/miniframe/model/system/xml/DConMapper.xml
  39. 69 0
      src/main/java/com/miniframe/bisiness/system/D10013Service.java
  40. 112 0
      src/main/java/com/miniframe/bisiness/system/D10014Service.java
  41. 58 0
      src/main/java/com/miniframe/bisiness/system/D10015Service.java
  42. 23 0
      src/main/java/com/miniframe/dbtransfer/DConDbTransfer.java
  43. 11 0
      src/main/java/com/miniframe/template/TemplateGenerator.java
  44. 1 1
      src/main/resources/templates/fireControl.ftl
  45. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10013Test.java
  46. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10014Test.java
  47. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10015Test.java
  48. 2 1
      系统设计/实体Bean/system(实体列表).csv
  49. 4 1
      系统设计/数据定义/返 回 码/business(业务系统).csv
  50. 5 1
      系统设计/系统模块/SYSTEM(基础系统).csv
  51. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10013_A(物理属性查询).csv
  52. 10 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10013_D(物理属性查询).csv
  53. 7 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10014_A(物理属性添加修改).csv
  54. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10014_D(物理属性添加修改).csv
  55. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10015_A(物理属性删除).csv
  56. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10015_D(物理属性删除).csv

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

@@ -52,3 +52,6 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D1
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10010', '基础系统','传感器数据查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10011', '基础系统','传感器数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10012', '基础系统','传感器数据删除',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10013', '基础系统','物理属性查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10014', '基础系统','物理属性添加修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10015', '基础系统','物理属性据删除',true);

+ 2 - 0
definitionsrc/returncode/returncode-business.properties

@@ -71,3 +71,5 @@ EB3100005 = \u8BE5\u8282\u70B9\u8FB9\u754C\u4FE1\u606F\u5DF2\u5B58\u5728\uFF01
 EB3100006 = \u8FB9\u754C\u4FE1\u606F\u4E0D\u5B58\u5728\uFF01
 EB3100007 = \u8BE5\u7BA1\u9053\u540C\u4F4D\u7F6E\u5B58\u5728\u76F8\u540C\u4F20\u611F\u5668\uFF01
 EB3100008 = \u4F20\u611F\u5668\u4E0D\u5B58\u5728\uFF01
+EB3100010 = \u5B58\u5728\u76F8\u540C\u7684\u7269\u7406\u5C5E\u6027\uFF01
+EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01

+ 2 - 0
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -71,3 +71,5 @@ EB3100005 = \u8BE5\u8282\u70B9\u8FB9\u754C\u4FE1\u606F\u5DF2\u5B58\u5728\uFF01
 EB3100006 = \u8FB9\u754C\u4FE1\u606F\u4E0D\u5B58\u5728\uFF01
 EB3100007 = \u8BE5\u7BA1\u9053\u540C\u4F4D\u7F6E\u5B58\u5728\u76F8\u540C\u4F20\u611F\u5668\uFF01
 EB3100008 = \u4F20\u611F\u5668\u4E0D\u5B58\u5728\uFF01
+EB3100010 = \u5B58\u5728\u76F8\u540C\u7684\u7269\u7406\u5C5E\u6027\uFF01
+EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10013BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.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.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10013;
+import com.miniframe.generate.comm.system.D_D10013;
+
+/**
+ * 系统服务,“物理属性查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10013BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10013 a_d10013;//上行体
+	D_D10013 d_d10013;//下行体
+
+	public D10013BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10013=new A_D10013();
+		d_d10013=new D_D10013();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10013.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10013.class);
+		this.a_d10013 = UtilTools.map2Obj(bodyMap, A_D10013.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10013));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10013 getA_d10013() {
+		return a_d10013;
+	}
+
+	public void setA_d10013(A_D10013 a_d10013) {
+		this.a_d10013=a_d10013;
+	}
+
+	public D_D10013 getD_d10013() {
+		return this.d_d10013;
+	}
+
+	public void setD_d10013(D_D10013 d_d10013) {
+		this.d_d10013=d_d10013;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10014BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.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.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10014;
+import com.miniframe.generate.comm.system.D_D10014;
+
+/**
+ * 系统服务,“物理属性添加修改”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10014BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10014 a_d10014;//上行体
+	D_D10014 d_d10014;//下行体
+
+	public D10014BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10014=new A_D10014();
+		d_d10014=new D_D10014();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10014.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10014.class);
+		this.a_d10014 = UtilTools.map2Obj(bodyMap, A_D10014.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10014));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10014 getA_d10014() {
+		return a_d10014;
+	}
+
+	public void setA_d10014(A_D10014 a_d10014) {
+		this.a_d10014=a_d10014;
+	}
+
+	public D_D10014 getD_d10014() {
+		return this.d_d10014;
+	}
+
+	public void setD_d10014(D_D10014 d_d10014) {
+		this.d_d10014=d_d10014;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10015BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.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.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10015;
+import com.miniframe.generate.comm.system.D_D10015;
+
+/**
+ * 系统服务,“物理属性删除”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10015BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10015 a_d10015;//上行体
+	D_D10015 d_d10015;//下行体
+
+	public D10015BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10015=new A_D10015();
+		d_d10015=new D_D10015();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10015.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10015.class);
+		this.a_d10015 = UtilTools.map2Obj(bodyMap, A_D10015.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10015));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10015 getA_d10015() {
+		return a_d10015;
+	}
+
+	public void setA_d10015(A_D10015 a_d10015) {
+		this.a_d10015=a_d10015;
+	}
+
+	public D_D10015 getD_d10015() {
+		return this.d_d10015;
+	}
+
+	public void setD_d10015(D_D10015 d_d10015) {
+		this.d_d10015=d_d10015;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10013Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+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.system.D_D10013;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10013BaseModel;
+
+public class D10013Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10013Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->物理属性查询((D10013)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10013BaseModel execute(D10013BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10013BaseModel execute(D10013BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10013BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10013BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10013");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10013()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10013 d_d10013 =  UtilTools.map2Obj(outMap, D_D10013.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10013(d_d10013);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10013BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10013BaseModel execute(D10013BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10014Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+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.system.D_D10014;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10014BaseModel;
+
+public class D10014Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10014Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->物理属性添加修改((D10014)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10014BaseModel execute(D10014BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10014BaseModel execute(D10014BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10014BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10014BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10014");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10014()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10014 d_d10014 =  UtilTools.map2Obj(outMap, D_D10014.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10014(d_d10014);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10014BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10014BaseModel execute(D10014BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10015Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+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.system.D_D10015;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10015BaseModel;
+
+public class D10015Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10015Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->物理属性删除((D10015)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10015BaseModel execute(D10015BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10015BaseModel execute(D10015BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10015BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10015BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10015");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10015()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10015 d_d10015 =  UtilTools.map2Obj(outMap, D_D10015.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10015(d_d10015);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10015BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10015BaseModel execute(D10015BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/A_D10013.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性查询
+ */
+public class A_D10013 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 90 - 0
generated/com/miniframe/generate/comm/system/A_D10014.java

@@ -0,0 +1,90 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性添加修改
+ */
+public class A_D10014 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int coid;//物理属性ID
+	/**
+	 *物理属性ID
+	 */
+	public void setCoid(int coid) {
+		this.coid=coid;
+	}
+	/**
+	 *物理属性ID
+	 */
+	public int getCoid() {
+		return this.coid;
+	}
+	String code;//物理属性编号
+	/**
+	 *物理属性编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *物理属性编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
+	String name;//名称
+	/**
+	 *名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	double density;//密度
+	/**
+	 *密度
+	 */
+	public void setDensity(double density) {
+		this.density=density;
+	}
+	/**
+	 *密度
+	 */
+	public double getDensity() {
+		return this.density;
+	}
+	double diffcoe;//扩散系数
+	/**
+	 *扩散系数
+	 */
+	public void setDiffcoe(double diffcoe) {
+		this.diffcoe=diffcoe;
+	}
+	/**
+	 *扩散系数
+	 */
+	public double getDiffcoe() {
+		return this.diffcoe;
+	}
+	double speheat;//比热
+	/**
+	 *比热
+	 */
+	public void setSpeheat(double speheat) {
+		this.speheat=speheat;
+	}
+	/**
+	 *比热
+	 */
+	public double getSpeheat() {
+		return this.speheat;
+	}
+}

+ 25 - 0
generated/com/miniframe/generate/comm/system/A_D10015.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性删除
+ */
+public class A_D10015 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int coid;//物理属性ID
+	/**
+	 *物理属性ID
+	 */
+	public void setCoid(int coid) {
+		this.coid=coid;
+	}
+	/**
+	 *物理属性ID
+	 */
+	public int getCoid() {
+		return this.coid;
+	}
+}

+ 39 - 0
generated/com/miniframe/generate/comm/system/D_D10013.java

@@ -0,0 +1,39 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 物理属性查询
+ */
+public class D_D10013 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int total;//总数
+	/**
+	 *总数
+	 */
+	public void setTotal(int total) {
+		this.total=total;
+	}
+	/**
+	 *总数
+	 */
+	public int getTotal() {
+		return this.total;
+	}
+	List <D_D10013_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_D10013_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10013_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

+ 90 - 0
generated/com/miniframe/generate/comm/system/D_D10013_ROWS_RECODE.java

@@ -0,0 +1,90 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性查询->数据
+ */
+public class D_D10013_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int coid;//物理属性ID
+	/**
+	 *物理属性ID
+	 */
+	public void setCoid(int coid) {
+		this.coid=coid;
+	}
+	/**
+	 *物理属性ID
+	 */
+	public int getCoid() {
+		return this.coid;
+	}
+	String code;//物理属性编号
+	/**
+	 *物理属性编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *物理属性编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
+	String name;//名称
+	/**
+	 *名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	double density;//密度
+	/**
+	 *密度
+	 */
+	public void setDensity(double density) {
+		this.density=density;
+	}
+	/**
+	 *密度
+	 */
+	public double getDensity() {
+		return this.density;
+	}
+	double diffcoe;//扩散系数
+	/**
+	 *扩散系数
+	 */
+	public void setDiffcoe(double diffcoe) {
+		this.diffcoe=diffcoe;
+	}
+	/**
+	 *扩散系数
+	 */
+	public double getDiffcoe() {
+		return this.diffcoe;
+	}
+	double speheat;//比热
+	/**
+	 *比热
+	 */
+	public void setSpeheat(double speheat) {
+		this.speheat=speheat;
+	}
+	/**
+	 *比热
+	 */
+	public double getSpeheat() {
+		return this.speheat;
+	}
+}

+ 25 - 0
generated/com/miniframe/generate/comm/system/D_D10014.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性添加修改
+ */
+public class D_D10014 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String type;//类型
+	/**
+	 *类型
+	 */
+	public void setType(String type) {
+		this.type=type;
+	}
+	/**
+	 *类型
+	 */
+	public String getType() {
+		return this.type;
+	}
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/D_D10015.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 物理属性删除
+ */
+public class D_D10015 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 24 - 0
generated/validateform/a_d10014Form.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 物理属性添加修改Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="a_d10014Form">
+<field property="code" depends="required">
+    <arg0 key="a_d10014.code"/>
+</field>
+<field property="name" depends="required">
+    <arg0 key="a_d10014.name"/>
+</field>
+<field property="density" depends="required">
+    <arg0 key="a_d10014.density"/>
+</field>
+<field property="diffcoe" depends="required">
+    <arg0 key="a_d10014.diffcoe"/>
+</field>
+<field property="speheat" depends="required">
+    <arg0 key="a_d10014.speheat"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/a_d10015Form.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 物理属性删除Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="a_d10015Form">
+<field property="coid" depends="required">
+    <arg0 key="a_d10015.coid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 22 - 0
generated/validateform/d_d10013Form.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 物理属性查询Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="d_d10013Form">
+<field property="total" depends="range">
+    <arg0 key="d_d10013.total"/>
+    <arg1 name="range" key="${var:max}"/>
+    <arg2 name="range" key="${var:min}"/>
+    <var>
+      <var-name>min</var-name>
+      <var-value>1</var-value>
+    </var>
+    <var>
+      <var-name>max</var-name>
+      <var-value>256</var-value>
+    </var>
+</field>
+</form>
+</formset>
+</form-validation>

+ 1 - 0
generated/validator/resources_a_d10013Form_validator.properties

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

+ 1 - 0
generated/validator/resources_a_d10013Form_validator_zh_CN.properties

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

+ 7 - 0
generated/validator/resources_a_d10014Form_validator.properties

@@ -0,0 +1,7 @@
+a_d10014.coid = \u7269\u7406\u5C5E\u6027ID
+a_d10014.code = \u7269\u7406\u5C5E\u6027\u7F16\u53F7
+a_d10014.name = \u540D\u79F0
+a_d10014.density = \u5BC6\u5EA6
+a_d10014.diffcoe = \u6269\u6563\u7CFB\u6570
+a_d10014.speheat = \u6BD4\u70ED
+a_d10014Form = true

+ 7 - 0
generated/validator/resources_a_d10014Form_validator_zh_CN.properties

@@ -0,0 +1,7 @@
+a_d10014.coid = \u7269\u7406\u5C5E\u6027ID
+a_d10014.code = \u7269\u7406\u5C5E\u6027\u7F16\u53F7
+a_d10014.name = \u540D\u79F0
+a_d10014.density = \u5BC6\u5EA6
+a_d10014.diffcoe = \u6269\u6563\u7CFB\u6570
+a_d10014.speheat = \u6BD4\u70ED
+a_d10014Form = true

+ 2 - 0
generated/validator/resources_a_d10015Form_validator.properties

@@ -0,0 +1,2 @@
+a_d10015.coid = \u7269\u7406\u5C5E\u6027ID
+a_d10015Form = true

+ 2 - 0
generated/validator/resources_a_d10015Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d10015.coid = \u7269\u7406\u5C5E\u6027ID
+a_d10015Form = true

+ 2 - 0
generated/validator/resources_d_d10013Form_validator.properties

@@ -0,0 +1,2 @@
+d_d10013.total = \u603B\u6570
+d_d10013Form = true

+ 2 - 0
generated/validator/resources_d_d10013Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10013.total = \u603B\u6570
+d_d10013Form = true

+ 7 - 0
generated/validator/resources_d_d10013_rows_recodeForm_validator.properties

@@ -0,0 +1,7 @@
+d_d10013_rows_recode.coid = \u7269\u7406\u5C5E\u6027ID
+d_d10013_rows_recode.code = \u7269\u7406\u5C5E\u6027\u7F16\u53F7
+d_d10013_rows_recode.name = \u540D\u79F0
+d_d10013_rows_recode.density = \u5BC6\u5EA6
+d_d10013_rows_recode.diffcoe = \u6269\u6563\u7CFB\u6570
+d_d10013_rows_recode.speheat = \u6BD4\u70ED
+d_d10013_rows_recodeForm = true

+ 7 - 0
generated/validator/resources_d_d10013_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,7 @@
+d_d10013_rows_recode.coid = \u7269\u7406\u5C5E\u6027ID
+d_d10013_rows_recode.code = \u7269\u7406\u5C5E\u6027\u7F16\u53F7
+d_d10013_rows_recode.name = \u540D\u79F0
+d_d10013_rows_recode.density = \u5BC6\u5EA6
+d_d10013_rows_recode.diffcoe = \u6269\u6563\u7CFB\u6570
+d_d10013_rows_recode.speheat = \u6BD4\u70ED
+d_d10013_rows_recodeForm = true

+ 2 - 0
generated/validator/resources_d_d10014Form_validator.properties

@@ -0,0 +1,2 @@
+d_d10014.type = \u7C7B\u578B
+d_d10014Form = true

+ 2 - 0
generated/validator/resources_d_d10014Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10014.type = \u7C7B\u578B
+d_d10014Form = true

+ 1 - 0
generated/validator/resources_d_d10015Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_d10015Form_validator_zh_CN.properties

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

+ 142 - 0
modelsrc/com/miniframe/model/system/DCon.java

@@ -0,0 +1,142 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_con")
+public class DCon extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    /**
+     * 英文编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 密度
+     */
+    private Float density;
+
+    /**
+     * 扩散系数
+     */
+    private Float diffcoe;
+
+    /**
+     * 比热
+     */
+    private Float speheat;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取英文编码
+     *
+     * @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 density - 密度
+     */
+    public Float getDensity() {
+        return density;
+    }
+
+    /**
+     * 设置密度
+     *
+     * @param density 密度
+     */
+    public void setDensity(Float density) {
+        this.density = density;
+    }
+
+    /**
+     * 获取扩散系数
+     *
+     * @return diffcoe - 扩散系数
+     */
+    public Float getDiffcoe() {
+        return diffcoe;
+    }
+
+    /**
+     * 设置扩散系数
+     *
+     * @param diffcoe 扩散系数
+     */
+    public void setDiffcoe(Float diffcoe) {
+        this.diffcoe = diffcoe;
+    }
+
+    /**
+     * 获取比热
+     *
+     * @return speheat - 比热
+     */
+    public Float getSpeheat() {
+        return speheat;
+    }
+
+    /**
+     * 设置比热
+     *
+     * @param speheat 比热
+     */
+    public void setSpeheat(Float speheat) {
+        this.speheat = speheat;
+    }
+}

+ 580 - 0
modelsrc/com/miniframe/model/system/DConSQLBuilder.java

@@ -0,0 +1,580 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DConSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DConSQLBuilder() {
+        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 andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            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 andDensityIsNull() {
+            addCriterion("density is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityIsNotNull() {
+            addCriterion("density is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityEqualTo(Float value) {
+            addCriterion("density =", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityNotEqualTo(Float value) {
+            addCriterion("density <>", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityGreaterThan(Float value) {
+            addCriterion("density >", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityGreaterThanOrEqualTo(Float value) {
+            addCriterion("density >=", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityLessThan(Float value) {
+            addCriterion("density <", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityLessThanOrEqualTo(Float value) {
+            addCriterion("density <=", value, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityIn(List<Float> values) {
+            addCriterion("density in", values, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityNotIn(List<Float> values) {
+            addCriterion("density not in", values, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityBetween(Float value1, Float value2) {
+            addCriterion("density between", value1, value2, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDensityNotBetween(Float value1, Float value2) {
+            addCriterion("density not between", value1, value2, "density");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeIsNull() {
+            addCriterion("diffcoe is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeIsNotNull() {
+            addCriterion("diffcoe is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeEqualTo(Float value) {
+            addCriterion("diffcoe =", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeNotEqualTo(Float value) {
+            addCriterion("diffcoe <>", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeGreaterThan(Float value) {
+            addCriterion("diffcoe >", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeGreaterThanOrEqualTo(Float value) {
+            addCriterion("diffcoe >=", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeLessThan(Float value) {
+            addCriterion("diffcoe <", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeLessThanOrEqualTo(Float value) {
+            addCriterion("diffcoe <=", value, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeIn(List<Float> values) {
+            addCriterion("diffcoe in", values, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeNotIn(List<Float> values) {
+            addCriterion("diffcoe not in", values, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeBetween(Float value1, Float value2) {
+            addCriterion("diffcoe between", value1, value2, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andDiffcoeNotBetween(Float value1, Float value2) {
+            addCriterion("diffcoe not between", value1, value2, "diffcoe");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatIsNull() {
+            addCriterion("speheat is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatIsNotNull() {
+            addCriterion("speheat is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatEqualTo(Float value) {
+            addCriterion("speheat =", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatNotEqualTo(Float value) {
+            addCriterion("speheat <>", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatGreaterThan(Float value) {
+            addCriterion("speheat >", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatGreaterThanOrEqualTo(Float value) {
+            addCriterion("speheat >=", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatLessThan(Float value) {
+            addCriterion("speheat <", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatLessThanOrEqualTo(Float value) {
+            addCriterion("speheat <=", value, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatIn(List<Float> values) {
+            addCriterion("speheat in", values, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatNotIn(List<Float> values) {
+            addCriterion("speheat not in", values, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatBetween(Float value1, Float value2) {
+            addCriterion("speheat between", value1, value2, "speheat");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpeheatNotBetween(Float value1, Float value2) {
+            addCriterion("speheat not between", value1, value2, "speheat");
+            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/system/dao/DConMapper.java

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

+ 2 - 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 Wed Feb 28 11:12:02 CST 2024.
+    This file was generated on Wed Feb 28 17:12:06 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -30,5 +30,6 @@
     <mapper resource="com/miniframe/model/system/xml/DJobMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DChecknodeMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DSensorMapper.xml" />
+    <mapper resource="com/miniframe/model/system/xml/DConMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/system/xml/DConMapper.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.system.dao.DConMapper">
+  <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.system.DConSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from d_con
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 69 - 0
src/main/java/com/miniframe/bisiness/system/D10013Service.java

@@ -0,0 +1,69 @@
+package com.miniframe.bisiness.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10013BaseModel;
+import com.miniframe.generate.comm.system.D_D10013_ROWS_RECODE;
+import com.miniframe.model.system.DCon;
+import com.miniframe.model.system.dao.DConMapper;
+import com.miniframe.tools.CommonUtils;
+
+/**
+ * 基础系统,“物理属性查询”逻辑处理(重新生成不覆盖)。
+ */
+public class D10013Service extends D10013BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“物理属性查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		DConMapper conMapper = UtilTools.getBean(DConMapper.class);
+		List<DCon> conList =conMapper.selectAll();
+		List<D_D10013_ROWS_RECODE> rows = new ArrayList<>();
+		for (DCon con: conList) {
+			D_D10013_ROWS_RECODE row =new D_D10013_ROWS_RECODE();
+			row.setCode(con.getCode());
+			row.setCoid(con.getId());
+			row.setName(con.getName());
+			row.setDensity(CommonUtils.floatTodobule(con.getDensity()));
+			row.setDiffcoe(CommonUtils.floatTodobule(con.getDiffcoe()));
+			row.setSpeheat(CommonUtils.floatTodobule(con.getSpeheat()));
+			rows.add(row);
+		}
+		this.getD_d10013().setRows(rows);
+		this.getD_d10013().setTotal(rows.size());
+	}
+	
+	/**
+	 * 基础系统,“物理属性查询”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 112 - 0
src/main/java/com/miniframe/bisiness/system/D10014Service.java

@@ -0,0 +1,112 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10014BaseModel;
+import com.miniframe.model.system.DCon;
+import com.miniframe.model.system.DConSQLBuilder;
+import com.miniframe.model.system.dao.DConMapper;
+
+/**
+ * 基础系统,“物理属性添加修改”逻辑处理(重新生成不覆盖)。
+ */
+public class D10014Service extends D10014BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“物理属性添加修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer coid =this.getA_d10014().getCoid();
+		String code =this.getA_d10014().getCode();
+		String name =this.getA_d10014().getName();
+		double density=this.getA_d10014().getDensity();
+		double diffcoe =this.getA_d10014().getDiffcoe();
+		double speheat=this.getA_d10014().getSpeheat();
+		DConMapper conMapper = UtilTools.getBean(DConMapper.class);
+		if(coid==null||coid<=0){//添加
+			pdCode(code, conMapper);
+			saveCon(code, name, (float) density, (float) diffcoe, (float) speheat, conMapper);
+		}else{
+			DCon con = conMapper.selectByPrimaryKey(coid);
+			if(con==null){
+				throw  new BusinessException("EB3100011");
+			}
+			pdCodeByCoid(code,coid, conMapper);
+			updateCon(code, name, (float) density, (float) diffcoe, (float) speheat, conMapper, con);
+
+		}
+
+	
+	}
+
+	private void updateCon(String code, String name, float density, float diffcoe, float speheat, DConMapper conMapper, DCon con) {
+		con.setCode(code);
+		con.setName(name);
+		con.setDensity(density);
+		con.setDiffcoe(diffcoe);
+		con.setSpeheat(speheat);
+		conMapper.updateByPrimaryKey(con);
+	}
+
+	private void pdCodeByCoid(String code, Integer coid, DConMapper conMapper) throws BusinessException {
+		DConSQLBuilder sb = new DConSQLBuilder();
+		DConSQLBuilder.Criteria sc = sb.createCriteria();
+		sc.andCodeEqualTo(code);
+		sc.andIdNotEqualTo(coid);
+		int count = conMapper.selectCountByExample(sb);
+		if(count>0){
+			throw  new BusinessException("3100010");
+		}
+	}
+	private void saveCon(String code, String name, float density, float diffcoe, float speheat, DConMapper conMapper) {
+		DCon con =new DCon();
+		con.setCode(code);
+		con.setName(name);
+		con.setDensity(density);
+		con.setDiffcoe(diffcoe);
+		con.setSpeheat(speheat);
+		conMapper.insertSelective(con);
+	}
+
+	private void pdCode(String code, DConMapper conMapper) throws BusinessException {
+		DConSQLBuilder sb = new DConSQLBuilder();
+		DConSQLBuilder.Criteria sc = sb.createCriteria();
+		sc.andCodeEqualTo(code);
+		int count = conMapper.selectCountByExample(sb);
+		if(count>0){
+			throw  new BusinessException("3100010");
+		}
+	}
+
+	/**
+	 * 基础系统,“物理属性添加修改”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 58 - 0
src/main/java/com/miniframe/bisiness/system/D10015Service.java

@@ -0,0 +1,58 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10015BaseModel;
+import com.miniframe.model.system.DCon;
+import com.miniframe.model.system.dao.DConMapper;
+
+/**
+ * 基础系统,“物理属性据删除”逻辑处理(重新生成不覆盖)。
+ */
+public class D10015Service extends D10015BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“物理属性据删除”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		DConMapper conMapper = UtilTools.getBean(DConMapper.class);
+		Integer coid =this.getA_d10015().getCoid();
+		DCon con = conMapper.selectByPrimaryKey(coid);
+		if(con==null){
+			throw new BusinessException("EB3100011");
+		}
+		conMapper.deleteByPrimaryKey(coid);
+	}
+	
+	/**
+	 * 基础系统,“物理属性据删除”业务前处理
+ 	 */
+	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/DConDbTransfer.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.DCon;
+
+/**
+ * 实体列表,“D_CON”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class DConDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DCon> list=l;
+		return list;
+	};
+
+}

+ 11 - 0
src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -177,6 +177,17 @@ public class TemplateGenerator {
         List<DSource>  dources =dsm.selectByExample(dss);
         //fireSourceNum  灾源数量
         dataModel.put("fireSourceNum", dources.size());
+        //边界
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb =new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
+        //边界数量
+        dataModel.put("boundarynum", boundaries.size());
+
+
+
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);

+ 1 - 1
src/main/resources/templates/fireControl.ftl

@@ -8,7 +8,7 @@ dt: ${dt}
 dx: ${dx}
 report step: ${reportstep}
 interactionstep : ${interactionstep}
-Boundary number :3
+Boundary number :${boundarynum}
 FireSource number:${fireSourceNum}
 Number Con:2
 Con name: SO2 CO2

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10013Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10013;
+import com.miniframe.generate.comm.httpclientapater.D10013Client;
+import com.miniframe.generate.business.system.model.D10013BaseModel;
+
+public class D10013Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10013Test.class);
+
+	/**
+	 * 物理属性查询,获取报文体
+	 * @return
+	 */
+	public static A_D10013 getA_d10013() {
+		A_D10013 a_d10013 = new A_D10013();
+
+		// ----------以下增加【物理属性查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10013;
+	}
+	
+	/**
+	 * 运行客户端测试,物理属性查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10013BaseModel model = new D10013BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10013"));
+		model.setA_d10013(D10013Test.getA_d10013());
+		D10013Client client = new D10013Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10014Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10014;
+import com.miniframe.generate.comm.httpclientapater.D10014Client;
+import com.miniframe.generate.business.system.model.D10014BaseModel;
+
+public class D10014Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10014Test.class);
+
+	/**
+	 * 物理属性添加修改,获取报文体
+	 * @return
+	 */
+	public static A_D10014 getA_d10014() {
+		A_D10014 a_d10014 = new A_D10014();
+
+		// ----------以下增加【物理属性添加修改】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10014;
+	}
+	
+	/**
+	 * 运行客户端测试,物理属性添加修改
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10014BaseModel model = new D10014BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10014"));
+		model.setA_d10014(D10014Test.getA_d10014());
+		D10014Client client = new D10014Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10015Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10015;
+import com.miniframe.generate.comm.httpclientapater.D10015Client;
+import com.miniframe.generate.business.system.model.D10015BaseModel;
+
+public class D10015Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10015Test.class);
+
+	/**
+	 * 物理属性删除,获取报文体
+	 * @return
+	 */
+	public static A_D10015 getA_d10015() {
+		A_D10015 a_d10015 = new A_D10015();
+
+		// ----------以下增加【物理属性删除】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10015;
+	}
+	
+	/**
+	 * 运行客户端测试,物理属性删除
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10015BaseModel model = new D10015BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10015"));
+		model.setA_d10015(D10015Test.getA_d10015());
+		D10015Client client = new D10015Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -21,4 +21,5 @@
 19,D_NODE_VAL,节点观测数据,,
 20,D_JOB,求解任务,,
 21,D_CHECKNODE,监测点,,
-21,D_SENSOR,传感器,,
+21,D_SENSOR,传感器,,
+22,D_CON,物理属性,,

+ 4 - 1
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -78,4 +78,7 @@
 3100006,EB3100006,边界信息不存在!,
 
 3100007,EB3100007,该管道同位置存在相同传感器!,
-3100008,EB3100008,传感器不存在!,
+3100008,EB3100008,传感器不存在!,
+
+3100010,EB3100010,存在相同的物理属性!,
+3100011,EB3100011,物理属性不存在!,

+ 5 - 1
系统设计/系统模块/SYSTEM(基础系统).csv

@@ -58,4 +58,8 @@
 
 310010,D10010,传感器数据查询,service,,
 310011,D10011,传感器数据添加修改,service,,
-310012,D10012,传感器数据删除,service,,
+310012,D10012,传感器数据删除,service,,
+
+310013,D10013,物理属性查询,service,,
+310014,D10014,物理属性添加修改,service,,
+310015,D10015,物理属性据删除,service,,

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10013_A(物理属性查询).csv

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

+ 10 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10013_D(物理属性查询).csv

@@ -0,0 +1,10 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,total,总数,int,,,,1,256,,,,,,
+2,rows,数据,list,,,,0,,,,,,,
+2.1,coid,物理属性ID,int,,,,,,,,,,,
+2.2,code,物理属性编号,string,,,,,,,,,,,
+2.3,name,名称,string,,,,,,,,,,,
+2.4,density,密度,double,,,,,,,,,,,
+2.5,diffcoe,扩散系数,double,,,,,,,,,,,
+2.6,speheat,比热,double,,,,,,,,,,,
+

+ 7 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10014_A(物理属性添加修改).csv

@@ -0,0 +1,7 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,coid,物理属性ID,int,,,,,,,,,,,
+2,code,物理属性编号,string,,,是,,,,,,,,
+3,name,名称,string,,,是,,,,,,,,
+4,density,密度,double,0,,是,,,,,,,,
+5,diffcoe,扩散系数,double,0,,是,,,,,,,,
+6,speheat,比热,double,0,,是,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10014_D(物理属性添加修改).csv

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

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10015_A(物理属性删除).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10015_D(物理属性删除).csv

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