Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码合并终

Browse Source
This commit is contained in:
雨木c
2023-02-06 14:46:18 +08:00
parent abc9af79c4
commit 8930ad8e3c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml
View File

@@ -51,7 +51,7 @@
FROM FROM
pms_generatrix_wire AS pg 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 WHERE
pg.`Status` = 1 pg.`Status` = 1
AND pss.`Status` = 1 AND pss.`Status` = 1

14
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java
View File

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* <功能描述> * <功能描述>
@@ -35,11 +34,14 @@ public class OverviewVO implements Serializable {
public static class GroupVO { public static class GroupVO {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "monitorSort", value = "监测点类别") @ApiModelProperty(name = "city", value = "地级市")
private String monitorSort; private String city;
@ApiModelProperty(name = "oneLine", value = "Ⅰ类监测点")
@ApiModelProperty(name = "subset", value = "子集集合") private Integer oneLine;
private List<?> subset; @ApiModelProperty(name = "twoLine", value = "Ⅱ类监测点")
private Integer twoLine;
@ApiModelProperty(name = "threeLine", value = "Ⅲ类监测点")
private Integer threeLine;
} }