From c79fb47f9d72987f81a52822402c56c71e2cffa6 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Fri, 14 Nov 2025 15:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8F=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=BB=9F=E8=AE=A1=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BigScreenController.java | 5 ++ .../mapper/xml/SurvStationInfoMapper.xml | 11 ++-- .../mapper/xml/SurvStationInfoMapper.xml | 50 ++++++------------- .../jeecg/common/entity/SurvStationInfo.java | 6 +++ .../org/jeecg/common/vo/StationSummry.java | 5 +- 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java index bf51977..8f0b039 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java @@ -659,6 +659,8 @@ public class BigScreenController { stationSummry.setCODSummry(avgNH); stationSummry.setNHSummry(avgCOD); stationSummry.setDateStr(wholeTime); + stationSummry.setGroupId(survStationInfo.getGroupId()); + stationSummry.setGroupName(survStationInfo.getGroupName()); returnArrs.add(JSONObject.parseObject(JSONObject.toJSONString(stationSummry, SerializerFeature.WriteNullStringAsEmpty))); } if(liveList.size()>0){ @@ -720,6 +722,9 @@ public class BigScreenController { stationSummry.setNOSummry(avgNO); stationSummry.setDateStr(wholeTime); + + stationSummry.setGroupId(survStationInfo.getGroupId()); + stationSummry.setGroupName(survStationInfo.getGroupName()); returnArrs.add(JSONObject.parseObject(JSONObject.toJSONString(stationSummry, SerializerFeature.WriteNullStringAsEmpty))); } } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml index 5171496..4ba9eeb 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml @@ -30,13 +30,16 @@ + + + + + - - - ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO + ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO,GROUP_ID,GROUP_NAME - select ,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info where 1=1 AND STATION_CODE = #{stationCode} diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml index 9f2c6ad..9055000 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml @@ -29,43 +29,21 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -90,10 +68,10 @@ - ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO + ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO,GROUP_ID,GROUP_NAME - select from surv_station_info where 1=1 @@ -102,7 +80,7 @@ order by SORT_NO,CREATE_TIME desc - select from surv_station_info where 1=1 @@ -111,7 +89,7 @@ order by SORT_NO,CREATE_TIME desc - select from surv_station_info where 1=1 order by SORT_NO,CREATE_TIME desc diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java index 0a457ad..94ebf44 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java @@ -149,6 +149,12 @@ public class SurvStationInfo implements Serializable { @ApiModelProperty(value = "站点介绍") private String stationIntro; + @ApiModelProperty(value = "分组ID") + private String groupId; + + @ApiModelProperty(value = "分组名称") + private String groupName; + @TableField(exist = false) @ApiModelProperty(value = "设备数量") diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java index 1773edc..c5fb967 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java @@ -20,5 +20,8 @@ public class StationSummry { private List CODSummry; @JSONField(name = "dateStr") private List dateStr; - + @JSONField(name = "groupId") + private String groupId; + @JSONField(name = "groupName") + private String groupName; }