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-27 18:52:14 +08:00
parent 73a09d2556
commit ec496ba755
19 changed files with 585 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,13 @@
package com.njcn.prepare.harmonic.pojo.dto;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class SuperviseDto extends BaseParam {
@ApiModelProperty("删除的技术监督id集合")
private List<String> deleteIds;
}

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

@@ -0,0 +1,10 @@
package com.njcn.prepare.harmonic.pojo.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class UploadSuperviceTicketDto {
@ApiModelProperty("告警/预警监测点记录id")
private String id;
}

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

@@ -1,6 +1,7 @@
package com.njcn.prepare.harmonic.pojo.param;
import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
import com.njcn.prepare.harmonic.pojo.po.ThsSupervise;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,4 +18,12 @@ public class SuperviseParam {
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;
}

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

@@ -55,26 +55,31 @@ public class ThsOverRunLog {
/**
* 预/告警单
*/
@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）

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

@@ -1,6 +1,7 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -22,15 +23,18 @@ public class ThsSupervise {
/**
* 技术监督Guid
*/
@ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true)
private String supIndex;
/**
* 部门id
*/
@ApiModelProperty(name = "deptId", value = "部门id", required = true)
private String deptId;
/**
* 技术监督名称
*/
@ApiModelProperty(name = "name", value = "技术监督名称", required = true)
private String name;
/**
@@ -52,6 +56,7 @@ public class ThsSupervise {
/**
* 类型（0：预警；1：告警）
*/
@ApiModelProperty(name = "type", value = "类型（0：预警；1：告警）", required = true)
private Integer type;
/**
@@ -67,11 +72,13 @@ public class ThsSupervise {
/**
* 进度（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;
/**
* 创建时间
@@ -82,7 +89,4 @@ public class ThsSupervise {
*/
private Integer createType;
}

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

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

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

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