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

增加dataType区分面源

This commit is contained in:
zy 2026-03-21 17:31:52 +08:00
parent 376371723c
commit b76ba712b2
15 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/IndexAnalysisController.java
View File

@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.PollutionConstants;
import org.jeecg.common.constant.enums.DeviceDeployEnum;
import org.jeecg.common.entity.SurvDeviceDeploy;
import org.jeecg.common.entity.SurvStationInfo;
import org.jeecg.common.vo.*;
@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@Api(tags="后台首页统计接口")
@ -117,6 +119,18 @@ public class IndexAnalysisController {
pestTrans.setAction("/appmana/survHisdataOrientwaterList");
jsonArray.add(pestTrans);
//监控数量
List<SurvDeviceDeploy> deploys = deployService.getDeviceListByStation(null, Arrays.asList(DeviceDeployEnum.CAMERA.getType()));
AnalysisTransVo camDevice = new AnalysisTransVo();
camDevice.setTitle("监控数量(台)");
camDevice.setIcon("");
Double d = (double) deploys.size();
camDevice.setValue(d);
camDevice.setTotal(d);
camDevice.setColor("blue");
// deviceTrans.setAction("台");
camDevice.setAction("/appmana/survDeviceDeployList");
jsonArray.add(deviceTrans);
return Result.ok(jsonArray);
}

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

@ -47,7 +47,7 @@
<result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
<result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
<result property="updatedTime" column="UPDATED_TIME" />
<result property="dataType" column="DATA_TYPE"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
@ -57,7 +57,7 @@
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,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,
DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS,DATA_TYPE
</sql>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.LiveDataTrans">
@ -92,6 +92,9 @@
<if test="query.deployCode != null">
and DEPLOY_CODE = #{query.deployCode}
</if>
<if test="query.dataType != null and query.dataType!=''">
and DATA_TYPE = #{query.dataType}
</if>
<if test="deviceList!=null and deviceList.size()>0">
and DEPLOY_CODE IN
<foreach collection="deviceList" index="index" item="id" open="(" separator="," close=")">

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

@ -46,6 +46,7 @@
<result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
<result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
<result property="updatedTime" column="UPDATED_TIME" />
<result property="dataType" column="DATA_TYPE"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
</resultMap>
@ -76,7 +77,7 @@
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,
DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD
DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,DATA_TYPE
</sql>
<select id="pages" resultMap="baseResultMap">
@ -88,6 +89,9 @@
<if test="query.deployCode != null">
and DEPLOY_CODE = #{query.deployCode}
</if>
<if test="query.dataType != null and query.dataType!=''">
and DATA_TYPE = #{query.dataType}
</if>
<if test="deviceList!=null and deviceList.size()>0">
and DEPLOY_CODE IN
<foreach collection="deviceList" index="index" item="id" open="(" separator="," close=")">

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

@ -46,6 +46,7 @@
<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="dataType" column="DATA_TYPE"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
</resultMap>
@ -71,13 +72,14 @@
<result property="dataDateTime" column="DATA_DATE_TIME" />
<result property="deployCode" column="DEPLOY_CODE" />
<result property="dataType" column="DATA_TYPE"/>
</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,
DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS,DATA_TYPE
</sql>
<select id="getNewestData" resultMap="simpleResultMap">

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

@ -46,6 +46,7 @@
<result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
<result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="dataType" column="DATA_TYPE"/>
<association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
</resultMap>
@ -70,13 +71,14 @@
<result property="dataDateTime" column="DATA_DATE_TIME" />
<result property="deployCode" column="DEPLOY_CODE" />
<result property="dataType" column="DATA_TYPE"/>
</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,THIRD_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,
DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
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
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,DATA_TYPE
</sql>
<select id="getNewestData" resultMap="simpleResultMap">
select <include refid="baseSql"/> from surv_transdata_orientwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml
View File

@ -23,6 +23,7 @@
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
<result property="dataType" column="DATA_TYPE"/>
</resultMap>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.LiveDataTrans">
@ -65,7 +66,8 @@
DATA_WATER_NO_SY,
DATA_WATER_NO_LD,
DATA_DATE_TIME,
DEPLOY_CODE
DEPLOY_CODE,
DATA_TYPE
</sql>
<select id="getResentData" resultMap="baseResultVoMap">

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml
View File

@ -23,6 +23,7 @@
<result property="dataDateTime" column="DATA_DATE_TIME"/>
<result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
<result property="dataType" column="DATA_TYPE"/>
</resultMap>
<sql id="baseSql">
@ -42,7 +43,8 @@
DATA_WATER_NO_SY,
DATA_WATER_NO_LD,
DATA_DATE_TIME,
DEPLOY_CODE
DEPLOY_CODE,
DATA_TYPE
</sql>
<select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans">

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataLivestockwaterMapper.xml
View File

@ -23,6 +23,7 @@
<result property="dataDateTime" column="DATA_DATE_TIME" />
<result property="deployCode" column="DEPLOY_CODE" />
<result property="dataType" column="DATA_TYPE"/>
</resultMap>
@ -43,7 +44,8 @@
DATA_WATER_NO_SY,
DATA_WATER_NO_LD,
DATA_DATE_TIME,
DEPLOY_CODE
DEPLOY_CODE,
DATA_TYPE
</sql>
<select id="getNewestData" resultMap="simpleResultMap">

4
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml
View File

@ -22,6 +22,7 @@
<result property="dataDateTime" column="DATA_DATE_TIME" />
<result property="deployCode" column="DEPLOY_CODE" />
<result property="dataType" column="DATA_TYPE"/>
</resultMap>
@ -42,7 +43,8 @@
DATA_WATER_NO_SY,
DATA_WATER_NO_LD,
DATA_DATE_TIME,
DEPLOY_CODE
DEPLOY_CODE,
DATA_TYPE
</sql>
<select id="getNewestData" resultMap="simpleResultMap">

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

@ -210,7 +210,11 @@ public class SurvHisdataLivestockwater implements Serializable {
private Date transDate;
/**
* 数据类型
*/
@TableField("DATA_TYPE")
private String dataType;
}

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

@ -210,4 +210,10 @@ public class SurvHisdataOrientwater implements Serializable {
@Excel(name = "站点名称", width = 15)
@ApiModelProperty(value = "站点名称")
private String stationName;
/**
* 数据类型
*/
@TableField("DATA_TYPE")
private String dataType;
}

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

@ -202,6 +202,10 @@ public class SurvTransdataLivestockwater implements Serializable {
@ApiModelProperty(value = "设备名称")
private String deviceName;
/**
* 数据类型
*/
@TableField("DATA_TYPE")
private String dataType;
}

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

@ -203,4 +203,10 @@ public class SurvTransdataOrientwater implements Serializable {
@Excel(name = "站点名称", width = 15)
@ApiModelProperty(value = "站点名称")
private String stationName;
/**
* 数据类型
*/
@TableField("DATA_TYPE")
private String dataType;
}

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataLivestockwaterVo.java
View File

@ -108,6 +108,10 @@ public class SurvTransdataLivestockwaterVo implements Serializable {
@ApiModelProperty(value = "数据更新时间")
private LocalDateTime dataDateTime;
/**数据类型*/
@ApiModelProperty(value = "数据类型")
private String dataType;
@TableField(exist = false)
private String stationName;

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java
View File

@ -104,6 +104,10 @@ public class SurvTransdataOrientwaterVo implements Serializable {
@ApiModelProperty(value = "数据更新时间")
private LocalDateTime dataDateTime;
/**数据类型*/
@ApiModelProperty(value = "数据类型")
private String dataType;
@TableField(exist = false)
private String stationName;