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

冀北重新发起，取消发起接口

Browse Source
This commit is contained in:
cdf
2024-06-03 20:41:51 +08:00
parent 188c0515d7
commit e22e5d7d86
43 changed files with 753 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
View File

@@ -143,6 +143,16 @@ public class SupervisionDevMainReportParam {
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
@ApiModelProperty(value = "历史流程实例的编号")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@ApiModelProperty(value = "审批状态")
private Integer status;
@ApiModelProperty("发起人自选审批人 Map")
private Map<String, List<String>> startUserSelectAssignees;
@@ -156,7 +166,7 @@ public class SupervisionDevMainReportParam {
public static class SupervisionDevMainReportParamUpdate extends SupervisionDevMainReportParam {
@ApiModelProperty("id")
private String Id;
private String id;
}
/**
@@ -170,4 +180,4 @@ public class SupervisionDevMainReportParam {
private String orgNo;
}
}
}

14
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map;
/**
*
*
* Description:
* Date: 2024/5/17 15:26【需求编号】
*
@@ -37,6 +37,9 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
@ApiModelProperty(value="流程实例的编号")
private String processInstanceId;
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@@ -52,6 +55,15 @@ public class SupervisionTempLineDebugParam extends BaseEntity {
@ApiModelProperty("发起人自选审批人 Map")
private Map<String, List<String>> startUserSelectAssignees;
@Data
@EqualsAndHashCode(callSuper = true)
public static class SupervisionTempLineDebugUpdateParam extends SupervisionTempLineDebugParam {
@ApiModelProperty(value = "主键")
private String id;
}
@Data
@EqualsAndHashCode(callSuper = true)
public static class SupervisionTempLineDebugQuery extends BaseParam {

31
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
/**
*
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
@@ -129,14 +129,20 @@ public class SupervisionTempLineReportParam {
/**
* CT变比
*/
@ApiModelProperty(value="CT变比")
private Float ctRatio;
@ApiModelProperty(value="CT1")
private Integer ct1;
@ApiModelProperty(value="CT2")
private Integer ct2;
/**
* PT变比
*/
@ApiModelProperty(value="PT变比")
private Float ptRatio;
@ApiModelProperty(value="PT1")
private Integer pt1;
@ApiModelProperty(value="PT2")
private Integer pt2;
/**
* 监测点编号
@@ -227,6 +233,17 @@ public class SupervisionTempLineReportParam {
private Integer ptType;
/**
* 流程实例的编号
*/
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
@ApiModelProperty("发起人自选审批人 Map")
private Map<String, List<String>> startUserSelectAssignees;
@@ -235,7 +252,7 @@ public class SupervisionTempLineReportParam {
public static class SupervisionTempLineReportUpdate extends SupervisionTempLineReportParam {
@ApiModelProperty("id")
private String Id;
private String id;
}
@@ -252,4 +269,4 @@ public class SupervisionTempLineReportParam {
private List<Integer> statueList;
}
}
}

23
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineRunTestParam.java
View File

@@ -1,7 +1,10 @@
package com.njcn.supervision.pojo.param.device;
import com.baomidou.mybatisplus.annotation.TableField;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
@@ -20,13 +23,17 @@ public class SupervisionTempLineRunTestParam {
private static final long serialVersionUID = 1L;
private String id;
/**
* 流程实例的编号
*/
private String processInstanceId;
@ApiModelProperty(value = "历史流程实例的编号")
private String historyInstanceId;
/**
* 在线率
*/
@@ -72,4 +79,16 @@ public class SupervisionTempLineRunTestParam {
private String endTime;
@Data
@EqualsAndHashCode(callSuper = true)
public static class SupervisionTempLineRunTestUpdateParam extends SupervisionTempLineRunTestParam {
@ApiModelProperty("id")
@NotBlank(message = "索引不能为空")
private String id;
}
}

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

@@ -58,4 +58,5 @@ public class UserReportNormalParam extends BaseParam {
}

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

@@ -121,12 +121,14 @@ public class UserReportParam extends BaseEntity {
private UserReportSubstationPO userReportSubstationPO;
@Data
@EqualsAndHashCode(callSuper = true)
public static class UserReportUpdate extends UserReportParam {
@ApiModelProperty("id")
private String Id;
private String id;
}

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

@@ -134,6 +134,12 @@ public class SupervisionDevMainReportPO extends BaseEntity {
@TableField(value = "process_instance_id")
private String processInstanceId;
/**
* 流程实例的编号
*/
@TableField(value = "history_instance_id")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@@ -146,4 +152,4 @@ public class SupervisionDevMainReportPO extends BaseEntity {
*/
@TableField(value = "`State`")
private Integer state;
}
}

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

@@ -11,7 +11,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*
* Description:
* Date: 2024/5/17 15:26【需求编号】
*
@@ -40,6 +40,10 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
@ApiModelProperty(value="流程实例的编号")
private String processInstanceId;
@ApiModelProperty(value = "历史流程实例的编号")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@@ -53,4 +57,4 @@ public class SupervisionTempLineDebugPO extends BaseEntity {
@TableField(value = "`State`")
@ApiModelProperty(value="状态：0-删除 1-正常")
private Integer state;
}
}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -11,7 +12,7 @@ import lombok.NoArgsConstructor;
import java.time.LocalDate;
/**
*
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
@@ -117,14 +118,21 @@ public class SupervisionTempLineReport extends BaseEntity {
/**
* CT变比
*/
@TableField(value = "ct_ratio")
private Float ctRatio;
@ApiModelProperty(value="CT1")
private Integer ct1;
@ApiModelProperty(value="CT2")
private Integer ct2;
/**
* PT变比
*/
@TableField(value = "pt_ratio")
private Float ptRatio;
@ApiModelProperty(value="PT1")
private Integer pt1;
@ApiModelProperty(value="PT2")
private Integer pt2;
/**
* 监测点编号
@@ -232,6 +240,10 @@ public class SupervisionTempLineReport extends BaseEntity {
@TableField(value = "process_instance_id")
private String processInstanceId;
@TableField(value = "history_instance_id")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@@ -243,4 +255,4 @@ public class SupervisionTempLineReport extends BaseEntity {
*/
@TableField(value = "`State`")
private Integer state;
}
}

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

@@ -34,6 +34,11 @@ public class SupervisionTempLineRunTestPO extends BaseEntity {
*/
private String processInstanceId;
/**
* 历史流程实例的编号
*/
private String historyInstanceId;
/**
* 在线率
*/

7
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/plan/SupervisionPlanPO.java
View File

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
/**
*
*
* Description:
* Date: 2024/5/20 17:49【需求编号】
*
@@ -221,6 +221,9 @@ public class SupervisionPlanPO extends BaseEntity {
@TableField(value = "process_instance_id")
private String processInstanceId;
@TableField(value = "history_instance_id")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@@ -233,4 +236,4 @@ public class SupervisionPlanPO extends BaseEntity {
*/
@TableField(value = "`State`")
private Integer state;
}
}

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportNormalPO.java
View File

@@ -39,6 +39,8 @@ public class UserReportNormalPO extends BaseEntity {
private String processInstanceId;
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/

4
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
View File

@@ -114,6 +114,10 @@ public class UserReportPO extends BaseEntity {
@TableField(value = "process_instance_id")
private String processInstanceId;
@TableField(value = "history_instance_id")
private String historyInstanceId;
/**
* 数据来源类型 0.正常流程审核入库 1.批量导入
*/

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

@@ -146,6 +146,13 @@ public class SupervisionDevMainReportVO {
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
/**
* 历史流程实例的编号
*/
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/

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

@@ -32,6 +32,10 @@ public class SupervisionTempLineDebugVO extends BaseEntity {
private String reason;
private String processInstanceId;
@ApiModelProperty(value = "流程实例的编号")
private String historyInstanceId;
private Integer status;
/**
* 0:未试运行 1：试运行中 2.试运行成功 3.试运行异常

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

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
import java.time.LocalDate;
/**
*
*
* Description:
* Date: 2024/5/11 14:07【需求编号】
*
@@ -128,14 +128,20 @@ public class SupervisionTempLineReportVO {
/**
* CT变比
*/
@ApiModelProperty(value="CT变比")
private Float ctRatio;
@ApiModelProperty(value="CT1")
private Integer ct1;
@ApiModelProperty(value="CT2")
private Integer ct2;
/**
* PT变比
*/
@ApiModelProperty(value="PT变比")
private Float ptRatio;
@ApiModelProperty(value="PT1")
private Integer pt1;
@ApiModelProperty(value="PT2")
private Integer pt2;
/**
* 监测点编号
@@ -242,4 +248,4 @@ public class SupervisionTempLineReportVO {
private Integer status;
}
}

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

@@ -3,6 +3,7 @@ package com.njcn.supervision.pojo.vo.device;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@@ -34,6 +35,9 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{
*/
private String processInstanceId;
@ApiModelProperty(value = "历史流程实例的编号")
private String historyInstanceId;
/**
* 在线率
*/

3
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -124,6 +124,9 @@ public class UserReportVO {
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
@ApiModelProperty(value = "历史流程实例的编号")
private String historyInstanceId;
/**
* 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消