From b76ba712b2e58109546cc6194b2ed1227d3e6791 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 21 Mar 2026 17:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dataType=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E9=9D=A2=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexAnalysisController.java | 14 ++++++++++++++ .../mapper/xml/SurvHisdataLivestockwaterMapper.xml | 7 +++++-- .../mapper/xml/SurvHisdataOrientwaterMapper.xml | 6 +++++- .../xml/SurvTransdataLivestockwaterMapper.xml | 4 +++- .../mapper/xml/SurvTransdataOrientwaterMapper.xml | 4 +++- .../mapper/xml/SurvHisdataLivestockwaterMapper.xml | 4 +++- .../mapper/xml/SurvHisdataOrientwaterMapper.xml | 4 +++- .../xml/SurvTransdataLivestockwaterMapper.xml | 4 +++- .../mapper/xml/SurvTransdataOrientwaterMapper.xml | 4 +++- .../common/entity/SurvHisdataLivestockwater.java | 6 +++++- .../common/entity/SurvHisdataOrientwater.java | 6 ++++++ .../common/entity/SurvTransdataLivestockwater.java | 6 +++++- .../common/entity/SurvTransdataOrientwater.java | 6 ++++++ .../common/vo/SurvTransdataLivestockwaterVo.java | 4 ++++ .../common/vo/SurvTransdataOrientwaterVo.java | 4 ++++ 15 files changed, 72 insertions(+), 11 deletions(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/IndexAnalysisController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/IndexAnalysisController.java index 0cb17e3..8d6fb06 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/IndexAnalysisController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/IndexAnalysisController.java @@ -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 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); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml index d2e4ec5..ba33a2e 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml @@ -47,7 +47,7 @@ - + @@ -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 @@ -88,6 +89,9 @@ and DEPLOY_CODE = #{query.deployCode} + + and DATA_TYPE = #{query.dataType} + and DEPLOY_CODE IN diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml index f12ee75..693bb9f 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml @@ -46,6 +46,7 @@ + @@ -71,13 +72,14 @@ + 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 select from surv_transdata_orientwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1 diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml index eb2e51d..d94e344 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml @@ -23,6 +23,7 @@ + diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml index 1c220d6..2b90902 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml @@ -23,6 +23,7 @@ + @@ -42,7 +43,8 @@ DATA_WATER_NO_SY, DATA_WATER_NO_LD, DATA_DATE_TIME, - DEPLOY_CODE + DEPLOY_CODE, + DATA_TYPE diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml index b13deb8..b83e9f3 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml @@ -22,6 +22,7 @@ + @@ -42,7 +43,8 @@ DATA_WATER_NO_SY, DATA_WATER_NO_LD, DATA_DATE_TIME, - DEPLOY_CODE + DEPLOY_CODE, + DATA_TYPE