Jelajahi Sumber

传感器数据

huangxingxing 1 tahun lalu
induk
melakukan
f6e7f393c9
54 mengubah file dengan 1996 tambahan dan 4 penghapusan
  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/D10010BaseModel.java
  5. 112 0
      generated/com/miniframe/generate/business/system/model/D10011BaseModel.java
  6. 112 0
      generated/com/miniframe/generate/business/system/model/D10012BaseModel.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10010Client.java
  8. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10011Client.java
  9. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10012Client.java
  10. 25 0
      generated/com/miniframe/generate/comm/system/A_D10010.java
  11. 64 0
      generated/com/miniframe/generate/comm/system/A_D10011.java
  12. 25 0
      generated/com/miniframe/generate/comm/system/A_D10012.java
  13. 39 0
      generated/com/miniframe/generate/comm/system/D_D10010.java
  14. 64 0
      generated/com/miniframe/generate/comm/system/D_D10010_ROWS_RECODE.java
  15. 12 0
      generated/com/miniframe/generate/comm/system/D_D10011.java
  16. 12 0
      generated/com/miniframe/generate/comm/system/D_D10012.java
  17. 18 0
      generated/validateform/a_d10011Form.xml
  18. 12 0
      generated/validateform/a_d10012Form.xml
  19. 22 0
      generated/validateform/d_d10010Form.xml
  20. 2 0
      generated/validator/resources_a_d10010Form_validator.properties
  21. 2 0
      generated/validator/resources_a_d10010Form_validator_zh_CN.properties
  22. 5 0
      generated/validator/resources_a_d10011Form_validator.properties
  23. 5 0
      generated/validator/resources_a_d10011Form_validator_zh_CN.properties
  24. 2 0
      generated/validator/resources_a_d10012Form_validator.properties
  25. 2 0
      generated/validator/resources_a_d10012Form_validator_zh_CN.properties
  26. 2 0
      generated/validator/resources_d_d10010Form_validator.properties
  27. 2 0
      generated/validator/resources_d_d10010Form_validator_zh_CN.properties
  28. 5 0
      generated/validator/resources_d_d10010_rows_recodeForm_validator.properties
  29. 5 0
      generated/validator/resources_d_d10010_rows_recodeForm_validator_zh_CN.properties
  30. 1 0
      generated/validator/resources_d_d10011Form_validator.properties
  31. 1 0
      generated/validator/resources_d_d10011Form_validator_zh_CN.properties
  32. 1 0
      generated/validator/resources_d_d10012Form_validator.properties
  33. 1 0
      generated/validator/resources_d_d10012Form_validator_zh_CN.properties
  34. 96 0
      modelsrc/com/miniframe/model/system/DSensor.java
  35. 450 0
      modelsrc/com/miniframe/model/system/DSensorSQLBuilder.java
  36. 10 0
      modelsrc/com/miniframe/model/system/dao/DSensorMapper.java
  37. 2 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  38. 50 0
      modelsrc/com/miniframe/model/system/xml/DSensorMapper.xml
  39. 76 0
      src/main/java/com/miniframe/bisiness/system/D10010Service.java
  40. 99 0
      src/main/java/com/miniframe/bisiness/system/D10011Service.java
  41. 58 0
      src/main/java/com/miniframe/bisiness/system/D10012Service.java
  42. 23 0
      src/main/java/com/miniframe/dbtransfer/DSensorDbTransfer.java
  43. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10010Test.java
  44. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10011Test.java
  45. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10012Test.java
  46. 2 1
      系统设计/实体Bean/system(实体列表).csv
  47. 4 1
      系统设计/数据定义/返 回 码/business(业务系统).csv
  48. 5 1
      系统设计/系统模块/SYSTEM(基础系统).csv
  49. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10010_A(传感器数据查询).csv
  50. 8 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10010_D(传感器数据查询).csv
  51. 6 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10011_A(传感器添加修改).csv
  52. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10011_D(传感器添加修改).csv
  53. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10012_A(传感器删除).csv
  54. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10012_D(传感器删除).csv

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

@@ -49,3 +49,6 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D1
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10007', '基础系统','边界数据查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10008', '基础系统','边界数据添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10009', '基础系统','边界数据删除',true);
+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);

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

@@ -69,3 +69,5 @@ EB3100003 = \u5DF2\u5B58\u5728\u76F8\u540C\u4F4D\u7F6E\u7684\u76D1\u6D4B\u70B9\u
 EB3100004 = \u76D1\u6D4B\u70B9\u4E0D\u5B58\u5728\uFF01
 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

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

@@ -69,3 +69,5 @@ EB3100003 = \u5DF2\u5B58\u5728\u76F8\u540C\u4F4D\u7F6E\u7684\u76D1\u6D4B\u70B9\u
 EB3100004 = \u76D1\u6D4B\u70B9\u4E0D\u5B58\u5728\uFF01
 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

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10010BaseModel.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_D10010;
+import com.miniframe.generate.comm.system.D_D10010;
+
+/**
+ * 系统服务,“传感器数据查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10010BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10010 a_d10010;//上行体
+	D_D10010 d_d10010;//下行体
+
+	public D10010BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10010=new A_D10010();
+		d_d10010=new D_D10010();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10010.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_D10010.class);
+		this.a_d10010 = UtilTools.map2Obj(bodyMap, A_D10010.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_d10010));
+
+		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_D10010 getA_d10010() {
+		return a_d10010;
+	}
+
+	public void setA_d10010(A_D10010 a_d10010) {
+		this.a_d10010=a_d10010;
+	}
+
+	public D_D10010 getD_d10010() {
+		return this.d_d10010;
+	}
+
+	public void setD_d10010(D_D10010 d_d10010) {
+		this.d_d10010=d_d10010;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10011BaseModel.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_D10011;
+import com.miniframe.generate.comm.system.D_D10011;
+
+/**
+ * 系统服务,“传感器添加修改”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10011BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10011 a_d10011;//上行体
+	D_D10011 d_d10011;//下行体
+
+	public D10011BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10011=new A_D10011();
+		d_d10011=new D_D10011();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10011.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_D10011.class);
+		this.a_d10011 = UtilTools.map2Obj(bodyMap, A_D10011.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_d10011));
+
+		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_D10011 getA_d10011() {
+		return a_d10011;
+	}
+
+	public void setA_d10011(A_D10011 a_d10011) {
+		this.a_d10011=a_d10011;
+	}
+
+	public D_D10011 getD_d10011() {
+		return this.d_d10011;
+	}
+
+	public void setD_d10011(D_D10011 d_d10011) {
+		this.d_d10011=d_d10011;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10012BaseModel.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_D10012;
+import com.miniframe.generate.comm.system.D_D10012;
+
+/**
+ * 系统服务,“传感器删除”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10012BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10012 a_d10012;//上行体
+	D_D10012 d_d10012;//下行体
+
+	public D10012BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10012=new A_D10012();
+		d_d10012=new D_D10012();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10012.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_D10012.class);
+		this.a_d10012 = UtilTools.map2Obj(bodyMap, A_D10012.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_d10012));
+
+		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_D10012 getA_d10012() {
+		return a_d10012;
+	}
+
+	public void setA_d10012(A_D10012 a_d10012) {
+		this.a_d10012=a_d10012;
+	}
+
+	public D_D10012 getD_d10012() {
+		return this.d_d10012;
+	}
+
+	public void setD_d10012(D_D10012 d_d10012) {
+		this.d_d10012=d_d10012;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10010Client.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_D10010;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10010BaseModel;
+
+public class D10010Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10010Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->传感器数据查询((D10010)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10010BaseModel execute(D10010BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10010BaseModel execute(D10010BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10010BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10010BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10010");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10010()));
+		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_D10010 d_d10010 =  UtilTools.map2Obj(outMap, D_D10010.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10010(d_d10010);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10010BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10010BaseModel execute(D10010BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10011Client.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_D10011;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10011BaseModel;
+
+public class D10011Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10011Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->传感器添加修改((D10011)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10011BaseModel execute(D10011BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10011BaseModel execute(D10011BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10011BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10011BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10011");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10011()));
+		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_D10011 d_d10011 =  UtilTools.map2Obj(outMap, D_D10011.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10011(d_d10011);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10011BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10011BaseModel execute(D10011BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10012Client.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_D10012;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10012BaseModel;
+
+public class D10012Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10012Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->传感器删除((D10012)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10012BaseModel execute(D10012BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10012BaseModel execute(D10012BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10012BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10012BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10012");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10012()));
+		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_D10012 d_d10012 =  UtilTools.map2Obj(outMap, D_D10012.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10012(d_d10012);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10012BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10012BaseModel execute(D10012BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 传感器数据查询
+ */
+public class A_D10010 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;
+	}
+}

+ 64 - 0
generated/com/miniframe/generate/comm/system/A_D10011.java

@@ -0,0 +1,64 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 传感器添加修改
+ */
+public class A_D10011 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int seid;//传感器ID
+	/**
+	 *传感器ID
+	 */
+	public void setSeid(int seid) {
+		this.seid=seid;
+	}
+	/**
+	 *传感器ID
+	 */
+	public int getSeid() {
+		return this.seid;
+	}
+	int pid;//管道编号
+	/**
+	 *管道编号
+	 */
+	public void setPid(int pid) {
+		this.pid=pid;
+	}
+	/**
+	 *管道编号
+	 */
+	public int getPid() {
+		return this.pid;
+	}
+	double site;//管道位置
+	/**
+	 *管道位置
+	 */
+	public void setSite(double site) {
+		this.site=site;
+	}
+	/**
+	 *管道位置
+	 */
+	public double getSite() {
+		return this.site;
+	}
+	String type;//传感器类型
+	/**
+	 *传感器类型
+	 */
+	public void setType(String type) {
+		this.type=type;
+	}
+	/**
+	 *传感器类型
+	 */
+	public String getType() {
+		return this.type;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 传感器删除
+ */
+public class A_D10012 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int seid;//传感器ID
+	/**
+	 *传感器ID
+	 */
+	public void setSeid(int seid) {
+		this.seid=seid;
+	}
+	/**
+	 *传感器ID
+	 */
+	public int getSeid() {
+		return this.seid;
+	}
+}

+ 39 - 0
generated/com/miniframe/generate/comm/system/D_D10010.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_D10010 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_D10010_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_D10010_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10010_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

+ 64 - 0
generated/com/miniframe/generate/comm/system/D_D10010_ROWS_RECODE.java

@@ -0,0 +1,64 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 传感器数据查询->数据
+ */
+public class D_D10010_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int seid;//传感器ID
+	/**
+	 *传感器ID
+	 */
+	public void setSeid(int seid) {
+		this.seid=seid;
+	}
+	/**
+	 *传感器ID
+	 */
+	public int getSeid() {
+		return this.seid;
+	}
+	int pid;//管道编号
+	/**
+	 *管道编号
+	 */
+	public void setPid(int pid) {
+		this.pid=pid;
+	}
+	/**
+	 *管道编号
+	 */
+	public int getPid() {
+		return this.pid;
+	}
+	double site;//管道位置
+	/**
+	 *管道位置
+	 */
+	public void setSite(double site) {
+		this.site=site;
+	}
+	/**
+	 *管道位置
+	 */
+	public double getSite() {
+		return this.site;
+	}
+	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_D10011.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 传感器添加修改
+ */
+public class D_D10011 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

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

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

+ 18 - 0
generated/validateform/a_d10011Form.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 传感器添加修改Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="a_d10011Form">
+<field property="pid" depends="required">
+    <arg0 key="a_d10011.pid"/>
+</field>
+<field property="site" depends="required">
+    <arg0 key="a_d10011.site"/>
+</field>
+<field property="type" depends="required">
+    <arg0 key="a_d10011.type"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/a_d10012Form.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_d10012Form">
+<field property="seid" depends="required">
+    <arg0 key="a_d10012.seid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 22 - 0
generated/validateform/d_d10010Form.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_d10010Form">
+<field property="total" depends="range">
+    <arg0 key="d_d10010.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>

+ 2 - 0
generated/validator/resources_a_d10010Form_validator.properties

@@ -0,0 +1,2 @@
+a_d10010.type = \u7C7B\u578B
+a_d10010Form = true

+ 2 - 0
generated/validator/resources_a_d10010Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d10010.type = \u7C7B\u578B
+a_d10010Form = true

+ 5 - 0
generated/validator/resources_a_d10011Form_validator.properties

@@ -0,0 +1,5 @@
+a_d10011.seid = \u4F20\u611F\u5668ID
+a_d10011.pid = \u7BA1\u9053\u7F16\u53F7
+a_d10011.site = \u7BA1\u9053\u4F4D\u7F6E
+a_d10011.type = \u4F20\u611F\u5668\u7C7B\u578B
+a_d10011Form = true

+ 5 - 0
generated/validator/resources_a_d10011Form_validator_zh_CN.properties

@@ -0,0 +1,5 @@
+a_d10011.seid = \u4F20\u611F\u5668ID
+a_d10011.pid = \u7BA1\u9053\u7F16\u53F7
+a_d10011.site = \u7BA1\u9053\u4F4D\u7F6E
+a_d10011.type = \u4F20\u611F\u5668\u7C7B\u578B
+a_d10011Form = true

+ 2 - 0
generated/validator/resources_a_d10012Form_validator.properties

@@ -0,0 +1,2 @@
+a_d10012.seid = \u4F20\u611F\u5668ID
+a_d10012Form = true

+ 2 - 0
generated/validator/resources_a_d10012Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d10012.seid = \u4F20\u611F\u5668ID
+a_d10012Form = true

+ 2 - 0
generated/validator/resources_d_d10010Form_validator.properties

@@ -0,0 +1,2 @@
+d_d10010.total = \u603B\u6570
+d_d10010Form = true

+ 2 - 0
generated/validator/resources_d_d10010Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10010.total = \u603B\u6570
+d_d10010Form = true

+ 5 - 0
generated/validator/resources_d_d10010_rows_recodeForm_validator.properties

@@ -0,0 +1,5 @@
+d_d10010_rows_recode.seid = \u4F20\u611F\u5668ID
+d_d10010_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
+d_d10010_rows_recode.site = \u7BA1\u9053\u4F4D\u7F6E
+d_d10010_rows_recode.type = \u4F20\u611F\u5668\u7C7B\u578B
+d_d10010_rows_recodeForm = true

+ 5 - 0
generated/validator/resources_d_d10010_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,5 @@
+d_d10010_rows_recode.seid = \u4F20\u611F\u5668ID
+d_d10010_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
+d_d10010_rows_recode.site = \u7BA1\u9053\u4F4D\u7F6E
+d_d10010_rows_recode.type = \u4F20\u611F\u5668\u7C7B\u578B
+d_d10010_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10011Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_d10011Form_validator_zh_CN.properties

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

+ 1 - 0
generated/validator/resources_d_d10012Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_d10012Form_validator_zh_CN.properties

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

+ 96 - 0
modelsrc/com/miniframe/model/system/DSensor.java

@@ -0,0 +1,96 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_sensor")
+public class DSensor extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    /**
+     * 管道ID
+     */
+    private Integer pid;
+
+    /**
+     * 位置
+     */
+    private Float site;
+
+    /**
+     * 传感器类型
+     */
+    private String type;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取管道ID
+     *
+     * @return pid - 管道ID
+     */
+    public Integer getPid() {
+        return pid;
+    }
+
+    /**
+     * 设置管道ID
+     *
+     * @param pid 管道ID
+     */
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * 获取位置
+     *
+     * @return site - 位置
+     */
+    public Float getSite() {
+        return site;
+    }
+
+    /**
+     * 设置位置
+     *
+     * @param site 位置
+     */
+    public void setSite(Float site) {
+        this.site = site;
+    }
+
+    /**
+     * 获取传感器类型
+     *
+     * @return type - 传感器类型
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 设置传感器类型
+     *
+     * @param type 传感器类型
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+}

+ 450 - 0
modelsrc/com/miniframe/model/system/DSensorSQLBuilder.java

@@ -0,0 +1,450 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DSensorSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DSensorSQLBuilder() {
+        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 andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(Integer value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(Integer value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(Integer value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(Integer value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(Integer value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<Integer> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<Integer> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(Integer value1, Integer value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(Integer value1, Integer value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIsNull() {
+            addCriterion("site is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIsNotNull() {
+            addCriterion("site is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteEqualTo(Float value) {
+            addCriterion("site =", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotEqualTo(Float value) {
+            addCriterion("site <>", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThan(Float value) {
+            addCriterion("site >", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThanOrEqualTo(Float value) {
+            addCriterion("site >=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThan(Float value) {
+            addCriterion("site <", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThanOrEqualTo(Float value) {
+            addCriterion("site <=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIn(List<Float> values) {
+            addCriterion("site in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotIn(List<Float> values) {
+            addCriterion("site not in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteBetween(Float value1, Float value2) {
+            addCriterion("site between", value1, value2, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotBetween(Float value1, Float value2) {
+            addCriterion("site not between", value1, value2, "site");
+            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(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String 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/system/dao/DSensorMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.system.dao;
+
+import com.miniframe.model.system.DSensor;
+import com.miniframe.model.system.DSensorSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface DSensorMapper extends MiniserviceBaseDao, MFBaseMapper<DSensor> {
+    long countByExample(DSensorSQLBuilder 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 09:35:21 CST 2024.
+    This file was generated on Wed Feb 28 11:12:02 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -29,5 +29,6 @@
     <mapper resource="com/miniframe/model/system/xml/DNodeValMapper.xml" />
     <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" />
   </mappers>
 </configuration>

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

+ 76 - 0
src/main/java/com/miniframe/bisiness/system/D10010Service.java

@@ -0,0 +1,76 @@
+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.D10010BaseModel;
+import com.miniframe.generate.comm.system.D_D10010_ROWS_RECODE;
+import com.miniframe.model.system.DSensor;
+import com.miniframe.model.system.DSensorSQLBuilder;
+import com.miniframe.model.system.dao.DSensorMapper;
+import com.miniframe.tools.CommonUtils;
+import tk.mybatis.mapper.util.StringUtil;
+
+/**
+ * 基础系统,“传感器数据查询”逻辑处理(重新生成不覆盖)。
+ */
+public class D10010Service extends D10010BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“传感器数据查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String type =this.getA_d10010().getType();
+		DSensorMapper sensorDao = UtilTools.getBean(DSensorMapper.class);
+		DSensorSQLBuilder sb =new DSensorSQLBuilder();
+		DSensorSQLBuilder.Criteria sc =sb.createCriteria();
+		if(StringUtil.isEmpty(type)){
+			sc.andTypeLike("%"+type+"%");
+		}
+		List<DSensor> dSensorList = sensorDao.selectByExample(sb);
+		List<D_D10010_ROWS_RECODE> rows =new ArrayList<>();
+		for (DSensor s: dSensorList) {
+			D_D10010_ROWS_RECODE row =new D_D10010_ROWS_RECODE();
+			row.setSeid(s.getId());
+			row.setPid(s.getPid());
+			row.setSite(CommonUtils.floatTodobule(s.getSite()));
+			row.setType(s.getType());
+			rows.add(row);
+		}
+		this.getD_d10010().setRows(rows);
+		this.getD_d10010().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();
+	}
+
+}

+ 99 - 0
src/main/java/com/miniframe/bisiness/system/D10011Service.java

@@ -0,0 +1,99 @@
+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.D10011BaseModel;
+import com.miniframe.model.system.DSensor;
+import com.miniframe.model.system.DSensorSQLBuilder;
+import com.miniframe.model.system.dao.DSensorMapper;
+
+/**
+ * 基础系统,“传感器数据添加修改”逻辑处理(重新生成不覆盖)。
+ */
+public class D10011Service extends D10011BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“传感器数据添加修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer seid =this.getA_d10011().getSeid();
+		Integer pid =this.getA_d10011().getPid();
+		double site =this.getA_d10011().getSite();
+		String type =this.getA_d10011().getType();
+		DSensorMapper sensorMapper = UtilTools.getBean(DSensorMapper.class);
+		if(seid==null||seid<=0){//添加
+			pdPidSiteType(pid, (float) site, type, sensorMapper);
+			DSensor s =new DSensor();
+			s.setPid(pid);
+			s.setSite((float)seid);
+			s.setType(type);
+			sensorMapper.insertSelective(s);
+		}else{
+			DSensor s = sensorMapper.selectByPrimaryKey(seid);
+			if (s == null) {
+				throw  new BusinessException("EB3100008");
+			}
+			pdPidSiteTypeBySeid(pid, (float) site, type,seid, sensorMapper);
+			s.setPid(pid);
+			s.setSite((float)seid);
+			s.setType(type);
+			sensorMapper.updateByPrimaryKey(s);
+		}
+	}
+
+	private void pdPidSiteTypeBySeid(Integer pid, float site, String type,Integer seid, DSensorMapper sensorMapper) throws BusinessException {
+		DSensorSQLBuilder sb =new DSensorSQLBuilder();
+		DSensorSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andPidEqualTo(pid);
+		sc.andSiteEqualTo(site);
+		sc.andTypeEqualTo(type);
+		sc.andIdNotEqualTo(seid);
+		int count = sensorMapper.selectCountByExample(sb);
+		if(count>0){
+			throw new BusinessException("EB3100007");
+		}
+	}
+	private void pdPidSiteType(Integer pid, float site, String type, DSensorMapper sensorMapper) throws BusinessException {
+		DSensorSQLBuilder sb =new DSensorSQLBuilder();
+		DSensorSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andPidEqualTo(pid);
+		sc.andSiteEqualTo(site);
+		sc.andTypeEqualTo(type);
+		int count = sensorMapper.selectCountByExample(sb);
+		if(count>0){
+			throw new BusinessException("EB3100007");
+		}
+	}
+
+	/**
+	 * 基础系统,“传感器数据添加修改”业务前处理
+ 	 */
+	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/D10012Service.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.D10012BaseModel;
+import com.miniframe.model.system.DSensor;
+import com.miniframe.model.system.dao.DSensorMapper;
+
+/**
+ * 基础系统,“传感器数据删除”逻辑处理(重新生成不覆盖)。
+ */
+public class D10012Service extends D10012BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“传感器数据删除”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer seid =this.getA_d10012().getSeid();
+		DSensorMapper sensorMapper = UtilTools.getBean(DSensorMapper.class);
+		DSensor s = sensorMapper.selectByPrimaryKey(seid);
+		if (s == null) {
+			throw  new BusinessException("EB3100008");
+		}
+		sensorMapper.deleteByPrimaryKey(seid);
+	}
+	
+	/**
+	 * 基础系统,“传感器数据删除”业务前处理
+ 	 */
+	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/DSensorDbTransfer.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.DSensor;
+
+/**
+ * 实体列表,“D_SENSOR”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class DSensorDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DSensor> list=l;
+		return list;
+	};
+
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10010Test.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_D10010;
+import com.miniframe.generate.comm.httpclientapater.D10010Client;
+import com.miniframe.generate.business.system.model.D10010BaseModel;
+
+public class D10010Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10010Test.class);
+
+	/**
+	 * 传感器数据查询,获取报文体
+	 * @return
+	 */
+	public static A_D10010 getA_d10010() {
+		A_D10010 a_d10010 = new A_D10010();
+
+		// ----------以下增加【传感器数据查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10010;
+	}
+	
+	/**
+	 * 运行客户端测试,传感器数据查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10010BaseModel model = new D10010BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10010"));
+		model.setA_d10010(D10010Test.getA_d10010());
+		D10010Client client = new D10010Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10011Test.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_D10011;
+import com.miniframe.generate.comm.httpclientapater.D10011Client;
+import com.miniframe.generate.business.system.model.D10011BaseModel;
+
+public class D10011Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10011Test.class);
+
+	/**
+	 * 传感器添加修改,获取报文体
+	 * @return
+	 */
+	public static A_D10011 getA_d10011() {
+		A_D10011 a_d10011 = new A_D10011();
+
+		// ----------以下增加【传感器添加修改】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10011;
+	}
+	
+	/**
+	 * 运行客户端测试,传感器添加修改
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10011BaseModel model = new D10011BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10011"));
+		model.setA_d10011(D10011Test.getA_d10011());
+		D10011Client client = new D10011Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10012Test.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_D10012;
+import com.miniframe.generate.comm.httpclientapater.D10012Client;
+import com.miniframe.generate.business.system.model.D10012BaseModel;
+
+public class D10012Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10012Test.class);
+
+	/**
+	 * 传感器删除,获取报文体
+	 * @return
+	 */
+	public static A_D10012 getA_d10012() {
+		A_D10012 a_d10012 = new A_D10012();
+
+		// ----------以下增加【传感器删除】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10012;
+	}
+	
+	/**
+	 * 运行客户端测试,传感器删除
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10012BaseModel model = new D10012BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10012"));
+		model.setA_d10012(D10012Test.getA_d10012());
+		D10012Client client = new D10012Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

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

@@ -20,4 +20,5 @@
 18,D_BOUNDARY,边界数据,,
 19,D_NODE_VAL,节点观测数据,,
 20,D_JOB,求解任务,,
-21,D_CHECKNODE,监测点,,
+21,D_CHECKNODE,监测点,,
+21,D_SENSOR,传感器,,

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

@@ -75,4 +75,7 @@
 3100004,EB3100004,监测点不存在!,
 
 3100005,EB3100005,该节点边界信息已存在!,
-3100006,EB3100006,边界信息不存在!,
+3100006,EB3100006,边界信息不存在!,
+
+3100007,EB3100007,该管道同位置存在相同传感器!,
+3100008,EB3100008,传感器不存在!,

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

@@ -54,4 +54,8 @@
 
 310007,D10007,边界数据查询,service,,
 310008,D10008,边界数据添加修改,service,,
-310009,D10009,边界数据删除,service,,
+310009,D10009,边界数据删除,service,,
+
+310010,D10010,传感器数据查询,service,,
+310011,D10011,传感器数据添加修改,service,,
+310012,D10012,传感器数据删除,service,,

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10010_A(传感器数据查询).csv

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

+ 8 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10010_D(传感器数据查询).csv

@@ -0,0 +1,8 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,total,总数,int,,,,1,256,,,,,,
+2,rows,数据,list,,,,0,,,,,,,
+2.1,seid,传感器ID,int,,,,,,,,,,,
+2.2,pid,管道编号,int,,,,,,,,,,,
+2.3,site,管道位置,double,,,,,,,,,,,
+2.4,type,传感器类型,string,,,,,,,,,,,
+

+ 6 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10011_A(传感器添加修改).csv

@@ -0,0 +1,6 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,seid,传感器ID,int,,,,,,,,,,,
+2,pid,管道编号,int,,,是,,,,,,,,
+3,site,管道位置,double,0,,是,,,,,,,,
+4,type,传感器类型,string,,,是,,,,,,,,
+

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10011_D(传感器添加修改).csv

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

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10012_A(传感器删除).csv

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

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10012_D(传感器删除).csv

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