传感器数据

modelsrc/com/miniframe/model/system/DSensor.java

@@ -2,6 +2,7 @@ package com.miniframe.model.system;
 
 import com.miniframe.system.MiniserviceBaseModel;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import javax.persistence.*;
 
 @Table(name = "d_sensor")
@@ -29,6 +30,32 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
      */
     private String pname;
 
+    @Column(name = "x_coordinate")
+    private BigDecimal xCoordinate;
+
+    @Column(name = "y_coordinate")
+    private BigDecimal yCoordinate;
+
+    @Column(name = "z_coordinate")
+    private BigDecimal zCoordinate;
+
+    @Column(name = "point_code")
+    private String pointCode;
+
+    /**
+     * 测点名称
+     */
+    @Column(name = "point_name")
+    private String pointName;
+
+    private Short deleted;
+
+    /**
+     * 传感器编码
+     */
+    @Column(name = "type_code")
+    private String typeCode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -116,4 +143,110 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     public void setPname(String pname) {
         this.pname = pname == null ? null : pname.trim();
     }
+
+    /**
+     * @return x_coordinate
+     */
+    public BigDecimal getxCoordinate() {
+        return xCoordinate;
+    }
+
+    /**
+     * @param xCoordinate
+     */
+    public void setxCoordinate(BigDecimal xCoordinate) {
+        this.xCoordinate = xCoordinate;
+    }
+
+    /**
+     * @return y_coordinate
+     */
+    public BigDecimal getyCoordinate() {
+        return yCoordinate;
+    }
+
+    /**
+     * @param yCoordinate
+     */
+    public void setyCoordinate(BigDecimal yCoordinate) {
+        this.yCoordinate = yCoordinate;
+    }
+
+    /**
+     * @return z_coordinate
+     */
+    public BigDecimal getzCoordinate() {
+        return zCoordinate;
+    }
+
+    /**
+     * @param zCoordinate
+     */
+    public void setzCoordinate(BigDecimal zCoordinate) {
+        this.zCoordinate = zCoordinate;
+    }
+
+    /**
+     * @return point_code
+     */
+    public String getPointCode() {
+        return pointCode;
+    }
+
+    /**
+     * @param pointCode
+     */
+    public void setPointCode(String pointCode) {
+        this.pointCode = pointCode == null ? null : pointCode.trim();
+    }
+
+    /**
+     * 获取测点名称
+     *
+     * @return point_name - 测点名称
+     */
+    public String getPointName() {
+        return pointName;
+    }
+
+    /**
+     * 设置测点名称
+     *
+     * @param pointName 测点名称
+     */
+    public void setPointName(String pointName) {
+        this.pointName = pointName == null ? null : pointName.trim();
+    }
+
+    /**
+     * @return deleted
+     */
+    public Short getDeleted() {
+        return deleted;
+    }
+
+    /**
+     * @param deleted
+     */
+    public void setDeleted(Short deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * 获取传感器编码
+     *
+     * @return type_code - 传感器编码
+     */
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    /**
+     * 设置传感器编码
+     *
+     * @param typeCode 传感器编码
+     */
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode == null ? null : typeCode.trim();
+    }
 }

modelsrc/com/miniframe/model/system/DSensorSQLBuilder.java

@@ -1,5 +1,6 @@
 package com.miniframe.model.system;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -423,6 +424,456 @@ public class DSensorSQLBuilder {
             addCriterion("pname not between", value1, value2, "pname");
             return (Criteria) this;
         }
+
+        public Criteria andXCoordinateIsNull() {
+            addCriterion("x_coordinate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateIsNotNull() {
+            addCriterion("x_coordinate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateEqualTo(BigDecimal value) {
+            addCriterion("x_coordinate =", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateNotEqualTo(BigDecimal value) {
+            addCriterion("x_coordinate <>", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateGreaterThan(BigDecimal value) {
+            addCriterion("x_coordinate >", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("x_coordinate >=", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateLessThan(BigDecimal value) {
+            addCriterion("x_coordinate <", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("x_coordinate <=", value, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateIn(List<BigDecimal> values) {
+            addCriterion("x_coordinate in", values, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateNotIn(List<BigDecimal> values) {
+            addCriterion("x_coordinate not in", values, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("x_coordinate between", value1, value2, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andXCoordinateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("x_coordinate not between", value1, value2, "xCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateIsNull() {
+            addCriterion("y_coordinate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateIsNotNull() {
+            addCriterion("y_coordinate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateEqualTo(BigDecimal value) {
+            addCriterion("y_coordinate =", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateNotEqualTo(BigDecimal value) {
+            addCriterion("y_coordinate <>", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateGreaterThan(BigDecimal value) {
+            addCriterion("y_coordinate >", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("y_coordinate >=", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateLessThan(BigDecimal value) {
+            addCriterion("y_coordinate <", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("y_coordinate <=", value, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateIn(List<BigDecimal> values) {
+            addCriterion("y_coordinate in", values, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateNotIn(List<BigDecimal> values) {
+            addCriterion("y_coordinate not in", values, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("y_coordinate between", value1, value2, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYCoordinateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("y_coordinate not between", value1, value2, "yCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateIsNull() {
+            addCriterion("z_coordinate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateIsNotNull() {
+            addCriterion("z_coordinate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateEqualTo(BigDecimal value) {
+            addCriterion("z_coordinate =", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateNotEqualTo(BigDecimal value) {
+            addCriterion("z_coordinate <>", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateGreaterThan(BigDecimal value) {
+            addCriterion("z_coordinate >", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("z_coordinate >=", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateLessThan(BigDecimal value) {
+            addCriterion("z_coordinate <", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("z_coordinate <=", value, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateIn(List<BigDecimal> values) {
+            addCriterion("z_coordinate in", values, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateNotIn(List<BigDecimal> values) {
+            addCriterion("z_coordinate not in", values, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("z_coordinate between", value1, value2, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andZCoordinateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("z_coordinate not between", value1, value2, "zCoordinate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeIsNull() {
+            addCriterion("point_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeIsNotNull() {
+            addCriterion("point_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeEqualTo(String value) {
+            addCriterion("point_code =", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeNotEqualTo(String value) {
+            addCriterion("point_code <>", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeGreaterThan(String value) {
+            addCriterion("point_code >", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("point_code >=", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeLessThan(String value) {
+            addCriterion("point_code <", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeLessThanOrEqualTo(String value) {
+            addCriterion("point_code <=", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeLike(String value) {
+            addCriterion("point_code like", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeNotLike(String value) {
+            addCriterion("point_code not like", value, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeIn(List<String> values) {
+            addCriterion("point_code in", values, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeNotIn(List<String> values) {
+            addCriterion("point_code not in", values, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeBetween(String value1, String value2) {
+            addCriterion("point_code between", value1, value2, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointCodeNotBetween(String value1, String value2) {
+            addCriterion("point_code not between", value1, value2, "pointCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameIsNull() {
+            addCriterion("point_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameIsNotNull() {
+            addCriterion("point_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameEqualTo(String value) {
+            addCriterion("point_name =", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameNotEqualTo(String value) {
+            addCriterion("point_name <>", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameGreaterThan(String value) {
+            addCriterion("point_name >", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameGreaterThanOrEqualTo(String value) {
+            addCriterion("point_name >=", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameLessThan(String value) {
+            addCriterion("point_name <", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameLessThanOrEqualTo(String value) {
+            addCriterion("point_name <=", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameLike(String value) {
+            addCriterion("point_name like", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameNotLike(String value) {
+            addCriterion("point_name not like", value, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameIn(List<String> values) {
+            addCriterion("point_name in", values, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameNotIn(List<String> values) {
+            addCriterion("point_name not in", values, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameBetween(String value1, String value2) {
+            addCriterion("point_name between", value1, value2, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointNameNotBetween(String value1, String value2) {
+            addCriterion("point_name not between", value1, value2, "pointName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Short value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Short value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Short value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Short value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Short value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Short value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Short> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Short> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Short value1, Short value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Short value1, Short value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeIsNull() {
+            addCriterion("type_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeIsNotNull() {
+            addCriterion("type_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeEqualTo(String value) {
+            addCriterion("type_code =", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotEqualTo(String value) {
+            addCriterion("type_code <>", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeGreaterThan(String value) {
+            addCriterion("type_code >", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("type_code >=", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeLessThan(String value) {
+            addCriterion("type_code <", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeLessThanOrEqualTo(String value) {
+            addCriterion("type_code <=", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeLike(String value) {
+            addCriterion("type_code like", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotLike(String value) {
+            addCriterion("type_code not like", value, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeIn(List<String> values) {
+            addCriterion("type_code in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotIn(List<String> values) {
+            addCriterion("type_code not in", values, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeBetween(String value1, String value2) {
+            addCriterion("type_code between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeCodeNotBetween(String value1, String value2) {
+            addCriterion("type_code not between", value1, value2, "typeCode");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Fri Dec 27 10:23:01 CST 2024.
+    This file was generated on Tue Jan 21 09:56:00 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/system/D10010Service.java

@@ -28,9 +28,9 @@ public class D10010Service extends D10010BaseModel implements ExecProcessFlow {
 		DSensorMapper sensorDao = UtilTools.getBean(DSensorMapper.class);
 		DSensorSQLBuilder sb =new DSensorSQLBuilder();
 		DSensorSQLBuilder.Criteria sc =sb.createCriteria();
-		if(StringUtil.isEmpty(type)){
-			sc.andTypeLike("%"+type+"%");
-		}
+//		if(StringUtil.isEmpty(type)){
+//			sc.andTypeLike("%"+type+"%");
+//		}
 		sb.setOrderByClause("id Desc");
 		List<DSensor> dSensorList = sensorDao.selectByExample(sb);
 		List<D_D10010_ROWS_RECODE> rows =new ArrayList<>();