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

新增预警/告警事务首页以及技术监督管理接口

Browse Source
This commit is contained in:
Lee
2023-03-29 18:04:03 +08:00
parent 0a5573804c
commit 92f10b85f7
39 changed files with 2060 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/SuperviseDto.java
View File

@@ -8,6 +8,12 @@ import java.util.List;
@Data
public class SuperviseDto extends BaseParam {
@ApiModelProperty("删除的技术监督id集合")
@ApiModelProperty(value = "删除的技术监督id集合", required = true)
private List<String> deleteIds;
@ApiModelProperty(value = "事务类型（0：预警；1：告警）")
private Integer type;
@ApiModelProperty(value = "进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）")
private Integer progress;
}

92
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/dto/ThsOverRunLogDto.java Normal file
View File

@@ -0,0 +1,92 @@
package com.njcn.prepare.harmonic.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class ThsOverRunLogDto {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键", required = true)
private String id;
/**
* 监测点ID
*/
@ApiModelProperty(name = "lineIndex", value = "监测点ID")
private String lineIndex;
@ApiModelProperty(name = "lineIndexName", value = "监测点名称")
private String lineIndexName;
/**
* 名称（变电站_监测点_日期_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;
/**
* 反馈单
*/
@ApiModelProperty(name = "feedback", value = "反馈单")
private String feedback;
/**
* 测试报告
*/
@ApiModelProperty(name = "testReport", value = "测试报告")
private String testReport;
/**
* 整改通知单
*/
@ApiModelProperty(name = "reviseNotice", value = "整改通知单")
private String reviseNotice;
/**
* 整改通知反馈单
*/
@ApiModelProperty(name = "reviseFeedback", value = "整改通知反馈单")
private String reviseFeedback;
/**
* 越限时间（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 = "供电公司")
private String companyName;
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SuperviseParam.java
View File

@@ -26,4 +26,6 @@ public class SuperviseParam {
private String description;
@ApiModelProperty(name = "thsSupervise", value = "技术监督参数")
private ThsSupervise thsSupervise;
@ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）")
private Integer type;
}

10
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java
View File

@@ -1,5 +1,6 @@
package com.njcn.prepare.harmonic.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;
@@ -95,6 +96,15 @@ public class ThsOverRunLog {
@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;
}

1
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviceRunLogVo.java
View File

@@ -17,4 +17,5 @@ public class SuperviceRunLogVo {
private ThsSupervise thsSupervise;
@ApiModelProperty(name = "overRunLog", value = "监测点集合", required = true)
private List<ThsOverRunLog> overRunLog;
}

7
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/SuperviseVo.java
View File

@@ -111,4 +111,11 @@ public class SuperviseVo {
*/
@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;
}

26
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/vo/ThsSuperviseVo.java Normal file
View File

@@ -0,0 +1,26 @@
package com.njcn.prepare.harmonic.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;
}