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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java
This commit is contained in:
Lee
2023-03-22 18:56:34 +08:00
parent 8c3567a765 776cf8c095
commit 0711f76f60
38 changed files with 1045 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java
View File

@@ -18,7 +18,9 @@ public enum ProcessResponseEnum {
PROCESS_COMMON_ERROR("A00550","监督管理模块异常"),
ARCHIVE_ERROR("A00552","不满足归档调节，操作失败！"),
PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"),
QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
THERE_IS_ONLY_ONE_STRATEGY("A00556","自动策略或手动策略，通用策略只能有一条!"),
;
private final String code;

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java
View File

@@ -28,6 +28,10 @@ public class ExcessiveParam extends IssuesParam {
@NotNull(message = "监测点ID不可为空")
private String measurementPointId;
@ApiModelProperty(name = "measurementPointId",value = "监测点ID")
@NotNull(message = "监测点ID不可为空")
private String measurementPointName;
@ApiModelProperty(name = "warnLastTime",value = "告警持续时间")
@NotNull(message = "告警持续时间不可为空")
private String warnLastTime;

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

@@ -0,0 +1,37 @@
package com.njcn.process.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
* <策略监测点绑定>
*
* @author wr
* @createTime: 2023-03-22
*/
@Data
public class MonitorParam {
@ApiModelProperty(value = "单位id")
@NotBlank(message = "单位id不能为空")
private String deptId;
@ApiModelProperty(value = "类型 0.预警策略 1.告警策略")
@NotEmpty(message = "类型不能为空")
private Integer type;
@ApiModelProperty(value = "预警策略/告警策略id")
@NotEmpty(message = "策略id集合不能为空")
private List<String> alarmId;
@ApiModelProperty(value = "监测点id")
@NotEmpty(message = "监测点id集合不能为空")
private List<String> monitorId;
}

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

@@ -37,7 +37,7 @@ public class StrategyParam {
private String name;
@ApiModelProperty("等级（0：一级；1：二级；2：三级）")
private String grade;
private Integer grade;
@ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）")
private Integer type;
@@ -57,6 +57,10 @@ public class StrategyParam {
@NotNull(message = "等级不能为空")
private Integer grade;
@ApiModelProperty(value = "0.通用策略 1.定值策略")
@NotNull(message = "策略选择不能为空")
private Integer bigType;
@ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
@NotNull(message = "区分类别不能为空")
private Integer type;
@@ -71,7 +75,7 @@ public class StrategyParam {
private String id;
@ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
@TableField("Operation")
@NotNull(message = "id不能为空")
private Integer operation;
@ApiModelProperty(value = "监测点标签")
@@ -84,7 +88,23 @@ public class StrategyParam {
}
@Data
public static class StrategyUpdateParam {
public static class StrategyUpdateParam extends StrategyUpParam{
@ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
private Integer operation;
@ApiModelProperty(value = "监测点标签")
@NotBlank(message = "监测点标签不能为空")
private List<String> monitorTag;
@ApiModelProperty(value = "指标类型")
@NotEmpty(message = "指标类型集合不能为空")
private List<String> indicatorTypes;
}
@Data
public static class StrategyUpParam {
@ApiModelProperty(value = "预警单id")
private String id;
@@ -92,22 +112,14 @@ public class StrategyParam {
@NotBlank(message = "名称不能为空")
private String name;
@ApiModelProperty(value = "0.通用策略 1.定值策略")
@NotNull(message = "策略选择不能为空")
private Integer bigType;
@ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）")
@NotNull(message = "等级不能为空")
private Integer grade;
@ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中")
@TableField("Operation")
private Integer operation;
@ApiModelProperty(value = "监测点标签")
@NotBlank(message = "监测点标签不能为空")
private String monitorTag;
@ApiModelProperty(value = "指标类型")
@NotEmpty(message = "指标类型集合不能为空")
private List<String> indicatorTypes;
}
@Data
@@ -116,7 +128,7 @@ public class StrategyParam {
@NotBlank(message = "id不能为空")
private String id;
@ApiModelProperty(value = "0.删除 1.正常")
@ApiModelProperty(value = "0.删除 1.启用 2.关闭")
private Integer state;
}
@@ -130,23 +142,22 @@ public class StrategyParam {
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("变电站信息")
private List<Power> childPower;
// @ApiModelProperty("变电站信息")
// private List<Power> childPower;
@ApiModelProperty("子节点详细信息")
private List<MonitorTree> children;
private List<?> children;
}
@Data
public static class Power {
public static class Monitor {
@ApiModelProperty("id")
private String id;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("监测点信息")
private List<Power> childMonitor;
@ApiModelProperty("标识")
private Integer leven=3;
}
}

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

@@ -128,4 +128,7 @@ public class RGeneralSurveyPlanPO {
@TableField(value = "upload_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date uploadTime;
@TableField(value = "create_person")
private String createPerson;
}

5
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java
View File

@@ -45,6 +45,11 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable {
*/
private String measurementPointId;
/**
* 监测点ID
*/
private String measurementPointName;
/**
* 操作时间
*/

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

@@ -1,6 +1,9 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -41,10 +44,14 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
@TableField("Operation")
private Integer operation;
@ApiModelProperty(value = "0.通用策略 1.定值策略")
@TableField("Big_Type")
private Integer bigType;
@ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
private Integer type;
@ApiModelProperty(value = "0.删除 1.正常")
@ApiModelProperty(value = "0.删除 1.启用 2.关闭")
@TableField("State")
@TableLogic(value = "1",delval = "0")
private Integer state;
@@ -54,11 +61,6 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
@TableField("Update_By")
private String updateBy;
/**
* 0.通用策略 1.定值策略
*/
@TableField("Big_Type")
private String bigType;
}