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

1.调整河北pms国网上送主配网逻辑

Browse Source 
2.技术监督调整
This commit is contained in:
雨木c
2024-03-12 10:38:55 +08:00
parent af4600f0e9
commit 4b09070081
50 changed files with 1058 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pqs-process/process-api/src/main/java/com/njcn/process/constant/Test.java
View File

@@ -1,27 +0,0 @@
//package com.njcn.process.constant;
//
//import com.google.common.collect.Maps;
//import com.njcn.device.pq.pojo.po.DataV;
//import org.springframework.cglib.beans.BeanMap;
//
//import java.util.Map;
//
///**
// * Description:
// * 接口文档访问地址：http://serverIP:port/swagger-ui.html
// * Date: 2022/12/7 15:18【需求编号】
// *
// * @author clam
// * @version V1.0.0
// */
//public class Test {
// public static void main(String[] args) {
//
// Map<String, Object> map = Maps.newHashMap ( );
// DataV d = new DataV ( );
// BeanMap beanMap = BeanMap.create (d);
// for (Object key : beanMap.keySet ( )) {
// }
// }
//
//}

17
pqs-process/process-api/src/main/java/com/njcn/process/enums/SteadyIndicatorEnum.java
View File

@@ -9,14 +9,19 @@ import org.apache.commons.lang3.StringUtils;
@Getter
public enum SteadyIndicatorEnum {
Negative_Voltage("Negative_Voltage", "负序电压不平衡度超标"),
Interhar_Voltage("Interhar_Voltage", "间谐波电压超标"),
Negative_Voltage("phase_Voltage", "负序电压不平衡度超标"),
Interhar_Voltage("Interharmonic_Voltage", "间谐波电压超标"),
Neg_Current("Neg_Current", "负序电流超标"),
Fre_Deviation("Fre_Deviation", "频率偏差超标"),
Fre_Deviation("Frequency_Dev", "频率偏差超标"),
Voltage_Dev("Voltage_Dev", "电压偏差超标"),
Har_Current("Har_Current", "谐波电流超标"),
Voltage_Fluc("Voltage_Fluc", "电压波动与闪变超标"),
Har_Voltage("Har_Voltage", "谐波电压超标");
Har_Current("Harmonic_Current", "谐波电流超标"),
Voltage_Fluc("Flicker", "电压波动与闪变超标"),
Har_Voltage("Harmonic_Voltage", "谐波电压超标"),
Thd_V("Thd_V","电压总谐波畸变率")
;
private final String code;

37
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java
View File

@@ -20,6 +20,8 @@ public class StrategyParam {
@Data
public static class StrategyPageParam extends StrategyParam {
private String deptId;
@ApiModelProperty(value = "页码")
private Integer PageNum;
@@ -62,22 +64,42 @@ public class StrategyParam {
@Data
public static class BindParam {
@ApiModelProperty(value = "部门id")
@NotNull(message = "部门id不可为空")
private String deptId;
@ApiModelProperty(value = "预警单id")
@NotBlank(message = "id不能为空")
@ApiModelProperty(value = "策略id")
private String id;
@ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
@NotNull(message = "id不能为空")
@ApiModelProperty(value = "0.预警单 1.告警单")
@NotNull(message = "策略类型不能为空")
private Integer strategyType;
@ApiModelProperty(value = "0：自动策略；1：手动策略；2：排他策略")
@NotNull(message = "等级")
private Integer grade;
@ApiModelProperty(value = "策略名称")
@NotNull(message = "策略名称不能为空")
private String strategyName;
@ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中,三级策略不分与或")
//@NotNull(message = "id不能为空")
private Integer operation;
@ApiModelProperty(value = "监测点标签")
@NotEmpty(message = "监测点标签集合不能为空")
//@NotEmpty(message = "监测点标签集合不能为空")
private List<String> monitorTag;
@ApiModelProperty(value = "指标类型")
@NotEmpty(message = "指标类型集合不能为空")
private List<String> indicatorTypes;
@ApiModelProperty(value = "监测点id集合")
private List<String> monitorIds;
}
@Data
@@ -94,6 +116,8 @@ public class StrategyParam {
@NotEmpty(message = "指标类型集合不能为空")
private List<String> indicatorTypes;
private List<String> monitorIds;
}
@Data
@@ -105,6 +129,9 @@ public class StrategyParam {
@NotBlank(message = "名称不能为空")
private String name;
@ApiModelProperty(value = "部门id")
private String deptId;
@ApiModelProperty(value = "0.通用策略 1.定值策略")
@NotNull(message = "策略选择不能为空")
private Integer bigType;

34
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SuperviseParam.java Normal file
View File

@@ -0,0 +1,34 @@
package com.njcn.process.pojo.param;
import com.njcn.process.pojo.po.ThsOverRunLog;
import com.njcn.process.pojo.po.ThsSupervise;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class SuperviseParam {
@ApiModelProperty(name = "initType", value = "创建类型： 0自动；1手动", required = true)
@NotNull(message = "创建类型不可为空")
private Integer initType;
@ApiModelProperty(name = "deptId", value = "部门id")
private String deptId;
@ApiModelProperty(name = "overRunLog", value = "监测点集合")
private List<ThsOverRunLog> overRunLog;
@ApiModelProperty(name = "supIndex", value = "技术监督Guid")
private String supIndex;
@ApiModelProperty(name = "name", value = "技术监督名称")
private String name;
@ApiModelProperty(name = "description", value = "描述")
private String description;
@ApiModelProperty(name = "thsSupervise", value = "技术监督参数")
private ThsSupervise thsSupervise;
@ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）")
@NotNull(message = "类型不可为空")
private Integer type;
}

31
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ThsSuperviseParam.java Normal file
View File

@@ -0,0 +1,31 @@
package com.njcn.process.pojo.param;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* pqs
*
* @author cdf
* @date 2024/3/5
*/
@Data
public class ThsSuperviseParam {
@NotBlank(message = "部门id不可为空")
private String deptId;
@NotBlank(message = "开始时间不可为空")
private String startTime;
@NotBlank(message = "结束时间不可为空")
private String endTime;
@NotNull(message = "分页")
private Integer pageNum;
@NotNull(message = "每页数量")
private Integer pageSize;
}

21
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsDeptMonitor.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.process.pojo.po;
import lombok.Data;
/**
* pqs
*
* @author cdf
* @date 2024/1/30
*/
@Data
public class ThsDeptMonitor {
private String id;
private String deptId;
private String monitor;
}

124
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsOverRunLog.java Normal file
View File

@@ -0,0 +1,124 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* <p>
* 告警/预警监测点列表
* </p>
*
* @author lxp
* @since 2023-03-16
*/
@Data
@TableName("ths_over_run_log")
public class ThsOverRunLog {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键", required = true)
private String id;
/**
* 监测点ID
*/
@ApiModelProperty(name = "lineIndex", value = "监测点ID", required = true)
private String lineIndex;
/**
* 名称（变电站_监测点_日期_id）
*/
@ApiModelProperty(name = "name", value = "名称", required = true)
private String name;
/**
* 技术监督Guid
*/
@ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true)
private String supIndex;
/**
* 描述
*/
@ApiModelProperty(name = "description", value = "描述")
private String description;
/**
* 预/告警单
*/
@ApiModelProperty(name = "alarmTicket", value = "预/告警单")
private String alarmTicket;
@TableField(exist = false)
private String alarmTicketName;
/**
* 反馈单
*/
@ApiModelProperty(name = "feedback", value = "反馈单")
private String feedback;
@TableField(exist = false)
private String feedbackName;
/**
* 测试报告
*/
@ApiModelProperty(name = "testReport", value = "测试报告")
private String testReport;
@TableField(exist = false)
private String ftestReportName;
/**
* 整改通知单
*/
@ApiModelProperty(name = "reviseNotice", value = "整改通知单")
private String reviseNotice;
@TableField(exist = false)
private String reviseNoticeName;
/**
* 整改通知反馈单
*/
@ApiModelProperty(name = "reviseFeedback", value = "整改通知反馈单")
private String reviseFeedback;
@TableField(exist = false)
private String reviseFeedbackName;
/**
* 越限时间（yyyy-MM-dd）
*/
@ApiModelProperty(name = "updateTime", value = "越限时间", required = true)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(name = "companyName", value = "供电公司")
@TableField(exist = false)
private String companyName;
@ApiModelProperty(name = "lineIndexName", value = "监测点名称")
@TableField(exist = false)
private String lineIndexName;
@ApiModelProperty(name = "fileName", value = "文件名")
@TableField(exist = false)
private String fileName;
@ApiModelProperty(name = "overTime", value = "越限次数")
private Integer overTime;
}

94
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsSupervise.java Normal file
View File

@@ -0,0 +1,94 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author lxp
* @since 2023-03-16
*/
@Data
@TableName("ths_supervise")
public class ThsSupervise {
private static final long serialVersionUID = 1L;
/**
* 技术监督Guid
*/
@ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true)
@TableId
private String supIndex;
/**
* 部门id
*/
@ApiModelProperty(name = "deptId", value = "部门id", required = true)
private String deptId;
/**
* 技术监督名称
*/
@ApiModelProperty(name = "name", value = "技术监督名称", required = true)
private String name;
/**
* 创建用户(pqs_user外键)
*/
private String createUser;
/**
* 处理用户
*/
private String modifyUser;
/**
* 处理时间
*/
private Date modifyTime;
/**
* 类型（0：预警；1：告警）
*/
@ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）", required = true)
private Integer type;
/**
* 上一级处理处理人员
*/
private String upUser;
/**
* 下一级处理人员
*/
private String nextUser;
/**
* 进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始
*/
@ApiModelProperty(name = "progress", value = "进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始", required = true)
private Integer progress;
/**
* 描述
*/
@ApiModelProperty(name = "description", value = "描述")
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建类型(0：自动；1 手动)
*/
private Integer createType;
}

3
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java
View File

@@ -32,6 +32,9 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
@TableId(value = "Id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "部门id")
private String deptId;
@ApiModelProperty(value = "预警单名称")
@TableField("Name")
private String name;

25
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SuperviceRunLogVo.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.process.pojo.vo;
import com.njcn.process.pojo.po.ThsOverRunLog;
import com.njcn.process.pojo.po.ThsSupervise;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import java.util.ArrayList;
import java.util.List;
@Data
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class SuperviceRunLogVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "thsSupervise", value = "技术监督参数", required = true)
private ThsSupervise thsSupervise;
@ApiModelProperty(name = "overRunLog", value = "监测点集合", required = true)
private List<ThsOverRunLog> overRunLog = new ArrayList<>();
}

126
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SuperviseVo.java Normal file
View File

@@ -0,0 +1,126 @@
package com.njcn.process.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class SuperviseVo {
private static final long serialVersionUID = 1L;
/**
* 技术监督Guid
*/
@ApiModelProperty(name = "supIndex", value = "技术监督Guid")
private String supIndex;
/**
* 部门id
*/
@ApiModelProperty(name = "deptId", value = "部门id")
private String deptId;
/**
* 技术监督名称
*/
@ApiModelProperty(name = "name", value = "技术监督名称")
private String name;
/**
* 创建用户(pqs_user外键)
*/
@ApiModelProperty(name = "createUser", value = "创建用户")
private String createUser;
/**
* 处理用户
*/
@ApiModelProperty(name = "modifyUser", value = "处理用户")
private String modifyUser;
/**
* 处理时间
*/
@ApiModelProperty(name = "modifyTime", value = "处理时间")
private Date modifyTime;
/**
* 类型（0：预警；1：告警）
*/
@ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）")
private Integer type;
/**
* 上一级处理处理人员
*/
@ApiModelProperty(name = "upUser", value = "上一级处理处理人员")
private String upUser;
/**
* 下一级处理人员
*/
@ApiModelProperty(name = "nextUser", value = "下一级处理人员")
private String nextUser;
/**
* 进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始
*/
@ApiModelProperty(name = "progress", value = "进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始")
private Integer progress;
/**
* 描述
*/
@ApiModelProperty(name = "description", value = "描述")
private String description;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 创建类型(0：自动；1 手动)
*/
private Integer createType;
/**
* 是否已经上传 预/告警单
*/
@ApiModelProperty(name = "haveAlarmticket", value = "是否已经上传 预/告警单")
private boolean haveAlarmticket;
/**
* 反馈单
*/
@ApiModelProperty(name = "haveFeedback", value = "是否已经上传 反馈单")
private boolean haveFeedback;
/**
* 测试报告
*/
@ApiModelProperty(name = "haveTestReport", value = "是否已经上传 测试报告")
private boolean haveTestReport;
/**
* 整改通知单
*/
@ApiModelProperty(name = "haveReviseNotice", value = "是否已经上传 整改通知单")
private boolean haveReviseNotice;
/**
* 整改通知反馈单
*/
@ApiModelProperty(name = "haveReviseFeedback", value = "是否已经上传 整改通知反馈单")
private boolean haveReviseFeedback;
@ApiModelProperty(name = "companyName", value = "部门名称")
private String companyName;
@ApiModelProperty(name = "alertType", value = "预警类型：0 无预警，1 一级预警 2 二级预警 3 超时")
private Integer alertType;
@ApiModelProperty(name = "progressTime", value = "进行时间（天）")
private Integer progressTime;
private String deploymentId;
private String execId;
}

30
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/ThsSuperviseVo.java Normal file
View File

@@ -0,0 +1,30 @@
package com.njcn.process.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class ThsSuperviseVo {
@ApiModelProperty(name = "superviseVoList", value = "技术监督列表")
private List<SuperviseVo> superviseVoList;
@ApiModelProperty(name = "progressTime", value = "开始数量")
private Integer startNum;
@ApiModelProperty(name = "alarmTicketIssueNum", value = "预/告警单下发数量")
private Integer alarmTicketIssueNum;
@ApiModelProperty(name = "feedbackUploadNum", value = "预/告警单反馈数量")
private Integer feedbackUploadNum;
@ApiModelProperty(name = "testReportNum", value = "现场测试数量")
private Integer testReportNum;
@ApiModelProperty(name = "reviseNoticeIssueNum", value = "整改通知单下发数量")
private Integer reviseNoticeIssueNum;
@ApiModelProperty(name = "reviseFeedbackNum", value = "整改通知单反馈数量")
private Integer reviseFeedbackNum;
@ApiModelProperty(name = "endNum", value = "完结数量")
private Integer endNum;
@ApiModelProperty(name = "earlyWarnNum", value = "预警单数量")
private Integer earlyWarnNum;
@ApiModelProperty(name = "reportWarnNum", value = "告警单数量")
private Integer reportWarnNum;
}