From 8930ad8e3c30b88ec31f0b2f6b527b118e00eea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 6 Feb 2023 14:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E7=BB=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapping/PmsGeneratrixWireMapper.xml | 2 +- .../java/com/njcn/harmonic/pojo/vo/OverviewVO.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml index 19b0679c9..ec78328cc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml @@ -51,7 +51,7 @@ FROM pms_generatrix_wire AS pg - LEFT JOIN pms_statation_stat AS pss ON pg.station = pss.Power_Id + LEFT JOIN pms_statation_stat AS pss ON pg.station_id = pss.Power_Id WHERE pg.`Status` = 1 AND pss.`Status` = 1 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java index 0bf655332..c96b3898c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * <功能描述> @@ -35,11 +34,14 @@ public class OverviewVO implements Serializable { public static class GroupVO { private static final long serialVersionUID = 1L; - @ApiModelProperty(name = "monitorSort", value = "监测点类别") - private String monitorSort; - - @ApiModelProperty(name = "subset", value = "子集集合") - private List subset; + @ApiModelProperty(name = "city", value = "地级市") + private String city; + @ApiModelProperty(name = "oneLine", value = "Ⅰ类监测点") + private Integer oneLine; + @ApiModelProperty(name = "twoLine", value = "Ⅱ类监测点") + private Integer twoLine; + @ApiModelProperty(name = "threeLine", value = "Ⅲ类监测点") + private Integer threeLine; }