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-12-01 10:44:47 +08:00
parent d767f69d20
commit c58f242c7b
17 changed files with 1973 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/LineDataDto.java → pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/LineDataDto.java
View File

@@ -1,4 +1,4 @@
package com.njcn.prepare.harmonic.pojo.dto;
package com.njcn.harmonic.pojo.dto;
import lombok.Data;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalD.java
View File

@@ -57,8 +57,6 @@ public class RDimBusGlobalD {
private Float stationLimitAvgRate;
private Integer state;
}

5
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimBusGlobalM.java
View File

@@ -20,7 +20,7 @@ import lombok.Setter;
@Getter
@Setter
@TableName("r_dim_bus_global_m")
public class RDimBusGlobalM extends BaseEntity {
public class RDimBusGlobalM{
private static final long serialVersionUID = 1L;
@@ -37,9 +37,6 @@ public class RDimBusGlobalM extends BaseEntity {
private Float stationLimitAvgRate;
private Integer state;
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalD.java
View File

@@ -19,7 +19,7 @@ import java.time.LocalDate;
@Getter
@Setter
@TableName("r_dim_obj_global_d")
public class RDimObjGlobalD extends BaseEntity {
public class RDimObjGlobalD {
private static final long serialVersionUID = 1L;
@MppMultiId(value = "Org_Id")

7
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalM.java
View File

@@ -20,7 +20,7 @@ import java.time.LocalDate;
@Getter
@Setter
@TableName("r_dim_obj_global_m")
public class RDimObjGlobalM extends BaseEntity {
public class RDimObjGlobalM {
private static final long serialVersionUID = 1L;
@@ -35,11 +35,6 @@ public class RDimObjGlobalM extends BaseEntity {
@MppMultiId(value = "Object_Type")
private String objectType;
//
// /**
// * **源荷对象监测率（%）
// */
// private Double monitorRate;
/**
* **源荷对象超标占比（%）

8
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjGlobalY.java
View File

@@ -20,7 +20,7 @@ import java.time.LocalDate;
@Getter
@Setter
@TableName("r_dim_obj_global_y")
public class RDimObjGlobalY extends BaseEntity {
public class RDimObjGlobalY {
private static final long serialVersionUID = 1L;
@@ -35,12 +35,6 @@ public class RDimObjGlobalY extends BaseEntity {
@MppMultiId(value = "Object_Type")
private String objectType;
//
// /**
// * **源荷对象监测率（%）
// */
// private Double monitorRate;
/**
* **源荷对象超标占比（%）
*/

8
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/DimGlobalDataVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -13,11 +14,18 @@ import java.math.BigDecimal;
@Data
public class DimGlobalDataVO {
@ApiModelProperty(name = "orgId",value = "单位code")
private String orgId;
@ApiModelProperty(name = "orgName",value = "单位名称")
private String orgName;
@ApiModelProperty(name = "type",value = "一类大类型，电压等级/源荷")
private String type;
@ApiModelProperty(name = "secondType",value = "二类类型，稳态指标/暂态指标/")
private String secondType;
@ApiModelProperty(name = "value",value = "单位code")
private BigDecimal value;
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java
View File

@@ -47,9 +47,9 @@ public class DimGlobalDealController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("pms电能质量指标综合")
@ApiImplicitParam(name = "dimGlobalDataParam", value = "条件参数", required = true)
public HttpResult<Page<DimGlobalDataVO>> dealGlobalData(@RequestBody @Validated DimGlobalDataParam dimGlobalDataParam){
public HttpResult<List<DimGlobalDataVO>> dealGlobalData(@RequestBody @Validated DimGlobalDataParam dimGlobalDataParam){
String methodDescribe = getMethodDescribe("dealGlobalData");
Page<DimGlobalDataVO> result = dimGlobalDealService.dealGlobalData(dimGlobalDataParam);
List<DimGlobalDataVO> result = dimGlobalDealService.dealGlobalData(dimGlobalDataParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

23
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java Normal file
View File

@@ -0,0 +1,23 @@
package com.njcn.harmonic.mapper.dim;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.dto.LineDataDto;
import com.njcn.harmonic.pojo.po.dim.RDimVoltageD;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set;
/**
* <p>
* 母线不同电压等级指标数据-日表 Mapper 接口
* </p>
*
* @author xuyang
* @since 2023-11-27
*/
public interface RDimVoltageDMapper extends MppBaseMapper<RDimVoltageD> {
List<LineDataDto> getLineData(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("collection") Set<String> list);
}

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageMMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.harmonic.mapper.dim;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimVoltageM;
/**
* <p>
* 区域母线**电压等级**指标标准差、平均值-月表 Mapper 接口
* </p>
*
* @author xuyang
* @since 2023-11-29
*/
public interface RDimVoltageMMapper extends MppBaseMapper<RDimVoltageM> {
}

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageYMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.harmonic.mapper.dim;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimVoltageY;
/**
* <p>
* 区域母线**电压等级**指标标准差、平均值-年表 Mapper 接口
* </p>
*
* @author xuyang
* @since 2023-11-29
*/
public interface RDimVoltageYMapper extends MppBaseMapper<RDimVoltageY> {
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/DimGlobalDealService.java
View File

@@ -20,5 +20,5 @@ public interface DimGlobalDealService {
* @author cdf
* @date 2023/11/27
*/
public Page<DimGlobalDataVO> dealGlobalData(DimGlobalDataParam dimGlobalDataParam);
List<DimGlobalDataVO> dealGlobalData(DimGlobalDataParam dimGlobalDataParam);
}

2807
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/dim/impl/DimGlobalDealServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimVoltageDMapper.java
View File

@@ -2,7 +2,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.dim;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RDimVoltageD;
import com.njcn.prepare.harmonic.pojo.dto.LineDataDto;
import com.njcn.harmonic.pojo.dto.LineDataDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/mapping/RDimVoltageDMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.prepare.harmonic.mapper.mysql.dim.RDimVoltageDMapper">
<select id="getLineData" resultType="com.njcn.prepare.harmonic.pojo.dto.LineDataDto">
<select id="getLineData" resultType="com.njcn.harmonic.pojo.dto.LineDataDto">
select
A.`time`,
A.line_id lineId,

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimVoltageDServiceImpl.java
View File

@@ -14,7 +14,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.area.PmsMonitorPOMapper;
import com.njcn.prepare.harmonic.mapper.mysql.dim.GeneratrixWireMapper;
import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimVoltageDMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.dto.LineDataDto;
import com.njcn.harmonic.pojo.dto.LineDataDto;
import com.njcn.prepare.harmonic.service.mysql.dim.IRDimVoltageDService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

3
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -37,6 +37,7 @@ public enum DicDataEnum {
FREQUENCY_DEV("频率偏差", "Frequency_Dev"),
NEG_CURRENT("负序电流", "Neg_Current"),
THD_V("电压总谐波畸变率", "Thd_V"),
phase_Voltage("三相电压不平衡度","phase_Voltage"),
TOTAL_INDICATOR("总稳态指标", "Total_Indicator"),
/**
@@ -220,7 +221,7 @@ public enum DicDataEnum {
SMELT_LOAD("冶炼负荷", "Smelt_Load"),
DISTRIBUTED_PHOTOVOLTAICS("分布式光伏", "Distributed_Photovoltaics"),
WIND_FARM("风电场", "Wind_Farm"),
SENSITIVE_USERS("敏感用户", "Sensitive_Users"),
SENSITIVE_USERS("重要敏感用户", "Sensitive_Users"),
IMPORTANT_USERS("重要用户", "Important_Users"),
TRACTION_STATION("牵引站", "Traction_Station"),