Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加电磁阀支持

This commit is contained in:
zy 2025-12-01 19:18:04 +08:00
parent b31c07e7df
commit b92cc9a7e0
8 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml
View File

@ -27,11 +27,22 @@
<result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
<result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
<result property="updatedTime" column="UPDATED_TIME" />
<result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
<result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
<result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
<result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
</resultMap>
<sql id="baseSql">
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,
STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
</sql>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.LiveDataTrans">

3
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml
View File

@ -17,6 +17,7 @@
<result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
<result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
<result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
<result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
@ -63,7 +64,7 @@
<sql id="baseSql" >
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,THIRD_VALVE_STATUS
</sql>
<select id="pages" resultMap="baseResultMap">

13
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml
View File

@ -26,6 +26,15 @@
<result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
<result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
<result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
<result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
<result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
</resultMap>
@ -41,7 +50,9 @@
</resultMap>
<sql id="baseSql">
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,
TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
</sql>
<select id="getNewestData" resultMap="simpleResultMap">

7
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml
View File

@ -15,12 +15,15 @@
<result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
<result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
<result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
<result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
<result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
<result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
<result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
<result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="dataGatherType" column="DATA_GATHER_TYPE" jdbcType="VARCHAR"/>
<result property="stationId" column="STATION_ID" jdbcType="VARCHAR"/>
@ -51,7 +54,9 @@
</resultMap>
<sql id="baseSql" >
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,THIRD_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,
DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
</sql>
<select id="getNewestData" resultMap="simpleResultMap">
select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java
View File

@ -1,6 +1,7 @@
package org.jeecg.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -145,6 +146,9 @@ public class SurvHisdataLivestockwater implements Serializable {
@Excel(name = "2#球阀状态", width = 15)
@ApiModelProperty(value = "2#球阀状态")
private String secondValveStatus;
/**3#球阀状态 */
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
/**急停状态*/
@Excel(name = "急停状态", width = 15)
@ApiModelProperty(value = "急停状态")

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java
View File

@ -1,6 +1,7 @@
package org.jeecg.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -158,6 +159,9 @@ public class SurvHisdataOrientwater implements Serializable {
@Excel(name = "2#球阀状态", width = 15)
@ApiModelProperty(value = "2#球阀状态")
private String secondValveStatus;
/**3#球阀状态 */
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
/**急停状态*/
@Excel(name = "急停状态", width = 15)
@ApiModelProperty(value = "急停状态")

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java
View File

@ -1,6 +1,7 @@
package org.jeecg.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -140,6 +141,9 @@ public class SurvTransdataLivestockwater implements Serializable {
@Excel(name = "2#球阀状态", width = 15)
@ApiModelProperty(value = "2#球阀状态")
private String secondValveStatus;
/**3#球阀状态 */
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
/**急停状态*/
@Excel(name = "急停状态", width = 15)
@ApiModelProperty(value = "急停状态")

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java
View File

@ -1,6 +1,7 @@
package org.jeecg.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -151,6 +152,9 @@ public class SurvTransdataOrientwater implements Serializable {
@Excel(name = "2#球阀状态", width = 15)
@ApiModelProperty(value = "2#球阀状态")
private String secondValveStatus;
/**3#球阀状态 */
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
/**急停状态*/
@Excel(name = "急停状态", width = 15)
@ApiModelProperty(value = "急停状态")