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

1.技术监督试运行评估-试运行结束后生成试运行报告

Browse Source 
2.技术监督计划管理，权限调整为负责地市进行信息修改
3.调整常态化干扰源用户信息更新逻辑
4.调整谐波报告数据请求格式
This commit is contained in:
wr
2024-07-02 16:55:08 +08:00
parent 5ca027513f
commit 50cd5d3895
27 changed files with 510 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java
View File

@@ -22,6 +22,7 @@ public enum SupervisionResponseEnum {
DATA_NOT_EXISTS("A00550","数据不存在"),
NO_POWER("A00550","不能操作非自己创建的任务！"),
NO_USER_REPORT_UPDATE("A00550","常态化干扰源用户管理信息更新失败，不存在该条信息"),
NO_DEPT_POWER("A00550","不能操作非自己部门创建的任务"),
;
private final String code;

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
View File

@@ -48,6 +48,12 @@ public class UserReportParam {
@ApiModelProperty(value = "填报部门")
private String orgId;
/**
* 填报部门
*/
@ApiModelProperty(value = "填报部门名称")
private String orgName;
/**
* 工程预期投产日期
*/

5
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineRunTestPO.java
View File

@@ -74,5 +74,8 @@ public class SupervisionTempLineRunTestPO extends BaseEntity {
*/
private String testRunTime;
/**
* 试运行成功报告地址
*/
private String testRunReport;
}

77
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.supervision.pojo.vo.device;
import cn.hutool.core.util.StrUtil;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,39 +15,61 @@ import lombok.Data;
@Data
public class SupervisionTempLineDebugVO extends BaseEntity {
private String id;
@ApiModelProperty(value="监测点编号")
private String lineId;
@ApiModelProperty(value="监测点名称")
private String lineName;
@ApiModelProperty(value="关联干扰源用户id名称")
private String userName;
@ApiModelProperty(value="接入母线")
private String connectedBus;
@ApiModelProperty(value="监测终端编码")
private String monitoringTerminalCode;
@ApiModelProperty(value="监测终端名称")
private String monitoringTerminalName;
@ApiModelProperty(value="电网侧变电站")
private String powerSubstationName;
private String reason;
private String processInstanceId;
private String id;
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
@ApiModelProperty(value = "监测点编号")
private String lineId;
private Integer status;
/**
* 0:未试运行 1：试运行中 2.试运行成功 3.试运行异常
*/
private Integer testRunState;
@ApiModelProperty(value = "监测点名称")
private String lineName;
@ApiModelProperty(value = "关联干扰源用户id名称")
private String userName;
@ApiModelProperty(value = "接入母线")
private String connectedBus;
@ApiModelProperty(value = "监测终端编码")
private String monitoringTerminalCode;
@ApiModelProperty(value = "监测终端名称")
private String monitoringTerminalName;
@ApiModelProperty(value = "电网侧变电站")
private String powerSubstationName;
private String reason;
private String processInstanceId;
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
private Integer status;
/**
* 0:未试运行 1：试运行中 2.试运行成功 3.试运行异常
*/
private Integer testRunState;
/**
* 试运行时间范围
*/
private String testRunTime;
/**
* 试运行时间范围
* 试运行成功报告地址
*/
private String testRunTime;
@ApiModelProperty(value = "试运行成功报告地址")
private String testRunReport;
public void setTestRunReport(String testRunReport) {
if(StrUtil.isNotBlank(testRunReport)){
this.testRunReport = "/"+testRunReport;
}else {
this.testRunReport = testRunReport;
private String createBy;
}
}
}