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

代码调整

Browse Source
This commit is contained in:
hongawen
2022-11-08 09:48:02 +08:00
parent 7b0c2435fc
commit 3abd49707f
290 changed files with 13772 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/ReportTemplateParam.java
View File

@@ -5,8 +5,10 @@ import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.List;
@@ -23,8 +25,11 @@ public class ReportTemplateParam {
@NotBlank(message = "模板名称不可为空")
private String name;
@ApiModelProperty(name = "content",value = "json内容",required = true)
@NotBlank(message = "模板内容不可为空")
@ApiModelProperty(name = "fileContent",value = "json文件",required = true)
@NotNull(message = "模板文件不可为空")
private MultipartFile fileContent;
@ApiModelProperty(name = "content",value = "json文件内容")
private String content;
@ApiModelProperty(name = "deptId",value = "部门id")

62
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPollutionDPO.java Normal file
View File

@@ -0,0 +1,62 @@
package com.njcn.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/4 15:29【需求编号】
*
* @author clam
* @version V1.0.0
*/
/**
* 单位污区图统计日表
*/
@ApiModel(value = "com-njcn-harmonic-pojo-po-RMpPollutionDPO")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "r_mp_pollution_d")
public class RMpPollutionDPO implements Serializable {
/**
* 单位id
*/
@TableField(value = "line_id")
@ApiModelProperty(value = "单位id")
private String lineId;
/**
* 时间
*/
@TableField(value = "data_date")
@ApiModelProperty(value = "时间")
private Date dataDate;
/**
* 污区图统计类型
*/
@TableField(value = "pollution_type")
@ApiModelProperty(value = "污区图统计类型")
private String pollutionType;
/**
* 统计值
*/
@TableField(value = "value")
@ApiModelProperty(value = "统计值")
private Double value;
private static final long serialVersionUID = 1L;
}

61
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java Normal file
View File

@@ -0,0 +1,61 @@
package com.njcn.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/3 10:18【需求编号】
*
* @author clam
* @version V1.0.0
*/
/**
* 单位污区图统计月表
*/
@ApiModel(value="com-njcn-harmonic-pojo-po-RStatPollutionOrgMPO")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "r_stat_pollution_org_m")
public class RStatPollutionOrgMPO implements Serializable {
/**
* 单位id
*/
@TableField(value = "org_id")
@ApiModelProperty(value="单位id")
private String orgId;
/**
* 时间
*/
@TableField(value = "data_date")
@ApiModelProperty(value="时间")
private Date dataDate;
/**
* 污区图统计类型
*/
@TableField(value = "pollution_type")
@ApiModelProperty(value="污区图统计类型")
private String pollutionType;
/**
* 统计值
*/
@TableField(value = "value")
@ApiModelProperty(value="统计值")
private Double value;
private static final long serialVersionUID = 1L;
}

34
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java
View File

@@ -1,15 +1,9 @@
package com.njcn.harmonic.pojo.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDate;
/**
* <p>
@@ -30,23 +24,20 @@ public class RStatOrgBusbarVoltageVO implements Serializable {
@ApiModelProperty(value = "单位名称")
private String orgName;
@ApiModelProperty(value = "变电站ID")
private String PowerStationID;
@ApiModelProperty(value = "变电站名称")
private String PowerStationName;
private String powerStationName;
@ApiModelProperty(value = "母线ID")
private String busbarId;
@ApiModelProperty(value = "母线电压等级")
private String busbarName;
private String busbarVoltageLevel;
@ApiModelProperty(value = "日均谐波电压超标-占比")
private Float vAverage;
private Float average;
@ApiModelProperty(value = "累计谐波电压超标-占比")
private Float vAccrued;
private Float accrued;
@ApiModelProperty(value = "日均三相电压不平衡超标-占比")
private Float unbalanceAverage;
@@ -60,5 +51,22 @@ public class RStatOrgBusbarVoltageVO implements Serializable {
@ApiModelProperty(value = "累计闪变超标-占比")
private Float flickerAccrued;
@ApiModelProperty(value = "日均谐波电压超标同比-占比")
private Float averageSame;
@ApiModelProperty(value = "累计谐波电压超标同比-占比")
private Float accruedSame;
@ApiModelProperty(value = "日均三相电压不平衡超标同比-占比")
private Float unbalanceAverageSame;
@ApiModelProperty(value = "累计三相电压不平衡超标同比-占比")
private Float unbalanceAccruedSame;
@ApiModelProperty(value = "日均闪变超标同比-占比")
private Float flickerAverageSame;
@ApiModelProperty(value = "累计闪变超标同比-占比")
private Float flickerAccruedSame;
}

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIcon2VO.java
View File

@@ -8,7 +8,7 @@ import java.io.Serializable;
/**
* <p>
*
*
* </p>
*
* @author rui.wu
@@ -55,8 +55,6 @@ public class RSubstationIcon2VO implements Serializable {
@Data
@EqualsAndHashCode(callSuper = true)
public static class RSubstationInfoVO extends RSubstationIcon2VO {
// @ApiModelProperty(value = "省公司")
// private String provinceName;
@ApiModelProperty(value = "市公司")
private String cityName;