技术监督,监测点联调
This commit is contained in:
hzj
@@ -0,0 +1,22 @@
|
||||
package com.njcn.supervision.api;
|
||||
|
||||
import com.njcn.common.pojo.constant.ServerInfo;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.supervision.api.fallback.TempLineDebugFeignClientFallbackFactory;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
|
||||
/**
|
||||
* 流程实例 Api 接口
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
@FeignClient(value = ServerInfo.SUPERVISION, path = "/tempLinedebug", fallbackFactory = TempLineDebugFeignClientFallbackFactory.class)
|
||||
public interface TempLineDebugFeignClient {
|
||||
|
||||
@GetMapping("/updateStatus")
|
||||
HttpResult<Object> updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.njcn.supervision.api.fallback;
|
||||
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.supervision.api.TempLineDebugFeignClient;
|
||||
import com.njcn.supervision.utils.SupervisionEnumUtil;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author denghuajun
|
||||
* @version 1.0.0
|
||||
* @date 2022/3/16
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class TempLineDebugFeignClientFallbackFactory implements FallbackFactory<TempLineDebugFeignClient> {
|
||||
@Override
|
||||
public TempLineDebugFeignClient create(Throwable throwable) {
|
||||
//判断抛出异常是否为解码器抛出的业务异常
|
||||
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
|
||||
if (throwable.getCause() instanceof BusinessException) {
|
||||
BusinessException businessException = (BusinessException) throwable.getCause();
|
||||
exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult());
|
||||
}
|
||||
Enum<?> finalExceptionEnum = exceptionEnum;
|
||||
return new TempLineDebugFeignClient() {
|
||||
@Override
|
||||
public HttpResult<Object> updateStatus(String businessKey, Integer status) {
|
||||
log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.njcn.supervision.pojo.param.device;
|
||||
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/17 15:26【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class SupervisionTempLineDebugParam extends BaseEntity {
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 调试原因
|
||||
*/
|
||||
@ApiModelProperty(value="调试原因")
|
||||
private String reason;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@ApiModelProperty(value="流程实例的编号")
|
||||
private String processInstanceId;
|
||||
|
||||
/**
|
||||
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
@ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 状态：0-删除 1-正常
|
||||
*/
|
||||
@ApiModelProperty(value="状态：0-删除 1-正常")
|
||||
private Integer state;
|
||||
|
||||
@ApiModelProperty("发起人自选审批人 Map")
|
||||
private Map<String, List<String>> startUserSelectAssignees;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public static class SupervisionTempLineDebugQuery extends BaseParam {
|
||||
|
||||
@ApiModelProperty(value = "填报部门")
|
||||
private String orgId;
|
||||
|
||||
private List<Integer> statueList;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -239,5 +239,7 @@ public class SupervisionTempLineReportParam {
|
||||
@ApiModelProperty(value = "填报部门")
|
||||
private String orgId;
|
||||
|
||||
private List<Integer> statueList;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,168 @@
|
||||
package com.njcn.supervision.pojo.param.plan;
|
||||
|
||||
import com.njcn.web.pojo.annotation.DateTimeStrValid;
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author hongawen
|
||||
* @since 2023-06-21
|
||||
*/
|
||||
@Data
|
||||
public class SupervisionPlanParam extends BaseParam {
|
||||
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
@ApiModelProperty(value = "计划名称",required = true)
|
||||
@NotBlank(message = "计划名称不可为空")
|
||||
private String workPlanName;
|
||||
|
||||
/**
|
||||
* 监督单位
|
||||
*/
|
||||
@ApiModelProperty(value = "监督单位",required = true)
|
||||
@NotBlank(message = "监督单位不可为空")
|
||||
private String supvOrgId;
|
||||
|
||||
/**
|
||||
* 计划编制人id
|
||||
*/
|
||||
@NotBlank(message = "计划编制人不可为空")
|
||||
private String planUserId;
|
||||
|
||||
/**
|
||||
* 监督类型
|
||||
*/
|
||||
@ApiModelProperty(value = "监督类型",required = true)
|
||||
@NotBlank(message = "监督类型不可为空")
|
||||
private String supvType;
|
||||
|
||||
/**
|
||||
* 监督阶段
|
||||
*/
|
||||
@ApiModelProperty(value = "监督阶段",required = true)
|
||||
@NotBlank(message = "监督阶段不可为空")
|
||||
private String supvStage;
|
||||
|
||||
/**
|
||||
* 计划监督时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划监督时间",required = true)
|
||||
@NotNull(message = "计划监督时间不可为空")
|
||||
private String planSupvDate;
|
||||
|
||||
/**
|
||||
* 监督对象名称
|
||||
*/
|
||||
@ApiModelProperty(value = "监督对象名称")
|
||||
private String supvObjName;
|
||||
|
||||
/**
|
||||
* 监督对象类型
|
||||
*/
|
||||
@ApiModelProperty(value = "对象类型")
|
||||
private String supvObjType;
|
||||
|
||||
/**
|
||||
* 监督对象电压等级
|
||||
*/
|
||||
@ApiModelProperty(value = "对象电压等级")
|
||||
private String objVoltageLevel;
|
||||
|
||||
/**
|
||||
* 关联电站
|
||||
*/
|
||||
@ApiModelProperty(value = "关联电站")
|
||||
private String substationName;
|
||||
|
||||
@ApiModelProperty(value = "关联电站电压等级")
|
||||
private String substationVoltageLevel;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "监督对象属性")
|
||||
private String objType;
|
||||
|
||||
@ApiModelProperty(value = "监督对象属性名称")
|
||||
private String objTypeName;
|
||||
|
||||
@ApiModelProperty(value = "监督对象协议容量(MVA)")
|
||||
private Double objCapacity;
|
||||
|
||||
/**
|
||||
* 计划执行开始时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划执行开始时间",required = true)
|
||||
@DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss",message = "计划执行开始时间格式有误")
|
||||
private String effectStartTime;
|
||||
|
||||
/**
|
||||
* 计划执行结束时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划执行结束时间",required = true)
|
||||
@DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss",message = "计划执行结束时间格式有误")
|
||||
private String effectEndTime;
|
||||
|
||||
/**
|
||||
* 报告出具时间
|
||||
*/
|
||||
@ApiModelProperty(value = "报告出具时间",required = true)
|
||||
@DateTimeStrValid(message = "报告出具时间格式有误",format = "yyyy-MM-dd HH:mm:ss")
|
||||
private String reportIssueTime;
|
||||
|
||||
/**
|
||||
* 电能质量问题发生时间
|
||||
*/
|
||||
@ApiModelProperty(value = "电能质量问题发生时间",required = true)
|
||||
@DateTimeStrValid(message = "电能质量问题发生时间格式有误",format = "yyyy-MM-dd HH:mm:ss")
|
||||
private String problemOcTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty(value = "备注(其他要求)")
|
||||
private String otherRemark;
|
||||
|
||||
|
||||
/**
|
||||
* 计划编制单位id
|
||||
*/
|
||||
@ApiModelProperty(value = "计划编制单位id")
|
||||
@NotBlank(message = "计划编制单位id不可为空")
|
||||
private String planOrgId;
|
||||
|
||||
@ApiModelProperty(value = "实施状态")
|
||||
private String effectStatus;
|
||||
|
||||
@ApiModelProperty(value = "实施人")
|
||||
private String effectUserId;
|
||||
|
||||
@ApiModelProperty(value = "计划状态")
|
||||
private String planStatus;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public static class UpdateSupvPlanParam extends SupervisionPlanParam{
|
||||
|
||||
@ApiModelProperty(value = "索引",required = true)
|
||||
@NotBlank(message = "计划索引不可为空")
|
||||
private String planId;
|
||||
|
||||
@ApiModelProperty("其他要求")
|
||||
private String otherRemarkHis;
|
||||
|
||||
@ApiModelProperty("调整原因")
|
||||
private String applyCommentHis;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
package com.njcn.supervision.pojo.param.plan;
|
||||
|
||||
import com.njcn.web.pojo.annotation.DateTimeStrValid;
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @author hongawen
|
||||
* @since 2023-06-21
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class SupervisopnProblemParam extends BaseParam {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 关联计划表
|
||||
*/
|
||||
@ApiModelProperty(value = "关联计划表id",required = true)
|
||||
@NotBlank(message = "关联计划表不可为空")
|
||||
private String planId;
|
||||
|
||||
/**
|
||||
* 责任单位id，取ISC平台上的组织id
|
||||
*/
|
||||
@ApiModelProperty(value = "责任单位id，取ISC平台上的组织id",required = true)
|
||||
@NotBlank(message = "责任单位id不可为空")
|
||||
private String dutyOrgId;
|
||||
|
||||
/**
|
||||
* 监测点类型 ，仅供电电压监督计划必填
|
||||
*/
|
||||
@ApiModelProperty(value = "监测点类型 ，仅供电电压监督计划必填")
|
||||
private String monitorType;
|
||||
|
||||
/**
|
||||
* 整改时间
|
||||
*/
|
||||
@ApiModelProperty(value = "整改时间",required = true)
|
||||
@DateTimeStrValid(message = "整改时间格式有误")
|
||||
private String rectificationTime;
|
||||
|
||||
/**
|
||||
* 计划整改时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划整改时间",required = true)
|
||||
@NotNull(message = "计划整改时间不可为空")
|
||||
@DateTimeStrValid(message = "计划整改时间格式有误")
|
||||
private String planRectificationTime;
|
||||
|
||||
/**
|
||||
* 是否发布预告警
|
||||
*/
|
||||
@ApiModelProperty(value = "是否发布预告警",required = true)
|
||||
@NotNull(message = "是否发布预告警不可为空")
|
||||
private Integer ifReleaseWarning;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@ApiModelProperty(value = "问题简要描述")
|
||||
@NotBlank(message = "问题简要描述不可为空")
|
||||
private String simpleProblemDesc;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 监督标准序号
|
||||
*/
|
||||
@ApiModelProperty(value = "监督标准序号")
|
||||
@NotBlank(message = "监督标准序号不可为空")
|
||||
private String supvStandardSort;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@ApiModelProperty(value = "问题描述")
|
||||
@NotBlank(message = "问题描述不可为空")
|
||||
private String problemDesc;
|
||||
|
||||
/**
|
||||
* 监督标准
|
||||
*/
|
||||
@ApiModelProperty(value = "监督标准",required = true)
|
||||
@NotBlank(message = "监督标准不可为空")
|
||||
private String supvStandard;
|
||||
|
||||
/**
|
||||
* 标准出处
|
||||
*/
|
||||
@ApiModelProperty(value = "标准出处",required = true)
|
||||
@NotBlank(message = "标准出处不可为空")
|
||||
private String supvResouce;
|
||||
|
||||
/**
|
||||
* 问题等级 01 一般，02 较大
|
||||
*/
|
||||
@ApiModelProperty(value = "问题等级",required = true)
|
||||
@NotBlank(message = "问题等级不可为空")
|
||||
private String problemLevel;
|
||||
|
||||
/**
|
||||
* 定级依据
|
||||
*/
|
||||
@ApiModelProperty(value = "定级依据",required = true)
|
||||
@NotBlank(message = "定级依据不可为空")
|
||||
private String problemLevelReason;
|
||||
|
||||
/**
|
||||
* 问题类型
|
||||
*/
|
||||
@ApiModelProperty(value = "问题类型",required = true)
|
||||
@NotBlank(message = "问题类型不可为空")
|
||||
private String problemType;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 整改方案
|
||||
*/
|
||||
@ApiModelProperty(value = "整改方案",required = true)
|
||||
@NotBlank(message = "整改方案不可为空")
|
||||
private String rectificationProgramme;
|
||||
|
||||
@ApiModelProperty(value = "整改措施")
|
||||
private String rectificationMeasure;
|
||||
|
||||
/**
|
||||
* 整改情况01已整改，02未整改
|
||||
*/
|
||||
@ApiModelProperty(value = "整改情况",required = true)
|
||||
@NotBlank(message = "整改情况不可为空")
|
||||
private String rectificationStatus;
|
||||
|
||||
@NotBlank(message = "问题发现时间")
|
||||
@DateTimeStrValid(format="yyyy-MM-dd HH:mm:ss",message = "问题发现时间格式有误")
|
||||
private String discoveryTime;
|
||||
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public static class UpdateSupvProblemParam extends SupervisopnProblemParam{
|
||||
|
||||
@ApiModelProperty(value = "索引",required = true)
|
||||
@NotBlank(message = "问题索引不可为空")
|
||||
private String problemId;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.njcn.supervision.pojo.po.device;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
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;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/17 15:26【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "supervision_temp_line_debug")
|
||||
public class SupervisionTempLineDebugPO extends BaseEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 调试原因
|
||||
*/
|
||||
@TableField(value = "reason")
|
||||
@ApiModelProperty(value="调试原因")
|
||||
private String reason;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@TableField(value = "process_instance_id")
|
||||
@ApiModelProperty(value="流程实例的编号")
|
||||
private String processInstanceId;
|
||||
|
||||
/**
|
||||
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
@ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 状态：0-删除 1-正常
|
||||
*/
|
||||
@TableField(value = "`State`")
|
||||
@ApiModelProperty(value="状态：0-删除 1-正常")
|
||||
private Integer state;
|
||||
}
|
||||
@@ -0,0 +1,236 @@
|
||||
package com.njcn.supervision.pojo.po.plan;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
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 lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/20 17:49【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "supervision_plan")
|
||||
public class SupervisionPlanPO extends BaseEntity {
|
||||
|
||||
@TableId(value = "plan_Id", type = IdType.ASSIGN_UUID)
|
||||
private String planId;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String provinceId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String provinceName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cityId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cityName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String countyId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String countyName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String supvObjId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String objVoltageLevelName;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
@TableField(value = "work_plan_name")
|
||||
private String workPlanName;
|
||||
|
||||
/**
|
||||
* 监督类型
|
||||
*/
|
||||
@TableField(value = "supv_Type")
|
||||
private String supvType;
|
||||
|
||||
/**
|
||||
* 监督阶段
|
||||
*/
|
||||
@TableField(value = "supv_Stage")
|
||||
private String supvStage;
|
||||
|
||||
/**
|
||||
* 监督单位
|
||||
*/
|
||||
@TableField(value = "supv_Org_Id")
|
||||
private String supvOrgId;
|
||||
|
||||
/**
|
||||
* 计划编制人id
|
||||
*/
|
||||
@TableField(value = "plan_User_Id")
|
||||
private String planUserId;
|
||||
|
||||
/**
|
||||
* 计划编制单位id
|
||||
*/
|
||||
@TableField(value = "plan_Org_Id")
|
||||
private String planOrgId;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "other_Remark")
|
||||
private String otherRemark;
|
||||
|
||||
/**
|
||||
* 计划执行开始时间
|
||||
*/
|
||||
@TableField(value = "effect_Start_Time")
|
||||
private LocalDateTime effectStartTime;
|
||||
|
||||
/**
|
||||
* 计划执行结束时间
|
||||
*/
|
||||
@TableField(value = "effect_End_Time")
|
||||
private LocalDateTime effectEndTime;
|
||||
|
||||
/**
|
||||
* 实施状态
|
||||
*/
|
||||
@TableField(value = "effect_Status")
|
||||
private String effectStatus;
|
||||
|
||||
/**
|
||||
* 计划监督时间
|
||||
*/
|
||||
@TableField(value = "plan_Supv_Date")
|
||||
private LocalDateTime planSupvDate;
|
||||
|
||||
/**
|
||||
* 对象类型
|
||||
*/
|
||||
@TableField(value = "supv_Obj_Type")
|
||||
private String supvObjType;
|
||||
|
||||
/**
|
||||
* 监督对象名称
|
||||
*/
|
||||
@TableField(value = "supv_Obj_Name")
|
||||
private String supvObjName;
|
||||
|
||||
/**
|
||||
* 对象电压等级
|
||||
*/
|
||||
@TableField(value = "obj_Voltage_Level")
|
||||
private String objVoltageLevel;
|
||||
|
||||
/**
|
||||
* 关联电站
|
||||
*/
|
||||
@TableField(value = "substation_Name")
|
||||
private String substationName;
|
||||
|
||||
/**
|
||||
* 关联电站电压等级
|
||||
*/
|
||||
@TableField(value = "substation_Voltage_Level")
|
||||
private String substationVoltageLevel;
|
||||
|
||||
/**
|
||||
* 监督对象属性 01 在运站 02 新（改、扩）建站，仅新能源场站监督计划必填
|
||||
*/
|
||||
@TableField(value = "obj_Type")
|
||||
private String objType;
|
||||
|
||||
/**
|
||||
* 监督对象属性名称 仅新能源场站监督计划必填
|
||||
*/
|
||||
@TableField(value = "obj_Type_Name")
|
||||
private String objTypeName;
|
||||
|
||||
/**
|
||||
* 监督对象协议容量(MVA) 新能源场站、敏感用户监督计划必填
|
||||
*/
|
||||
@TableField(value = "obj_Capacity")
|
||||
private Double objCapacity;
|
||||
|
||||
/**
|
||||
* 报告出具时间
|
||||
*/
|
||||
@TableField(value = "report_Issue_Time")
|
||||
private LocalDateTime reportIssueTime;
|
||||
|
||||
/**
|
||||
* 电能质量问题发生时间
|
||||
*/
|
||||
@TableField(value = "problem_Oc_Time")
|
||||
private LocalDateTime problemOcTime;
|
||||
|
||||
/**
|
||||
* 删除标识 0否1是
|
||||
*/
|
||||
@TableField(value = "delete_Flag")
|
||||
private String deleteFlag;
|
||||
|
||||
/**
|
||||
* 计划状态 1新建2变更 3取消
|
||||
*/
|
||||
@TableField(value = "plan_Status")
|
||||
private String planStatus;
|
||||
|
||||
/**
|
||||
* 删除时间
|
||||
*/
|
||||
@TableField(value = "delete_Time")
|
||||
private LocalDateTime deleteTime;
|
||||
|
||||
/**
|
||||
* 实施人id
|
||||
*/
|
||||
@TableField(value = "effect_User_Id")
|
||||
private String effectUserId;
|
||||
|
||||
/**
|
||||
* 实施人姓名
|
||||
*/
|
||||
@TableField(value = "effect_User_Name")
|
||||
private String effectUserName;
|
||||
|
||||
/**
|
||||
* 0.未上送 1.上送 2.取消上送 3.待重新上送
|
||||
*/
|
||||
@TableField(value = "is_upload_head")
|
||||
private Integer isUploadHead;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
@TableField(value = "process_instance_id")
|
||||
private String processInstanceId;
|
||||
|
||||
/**
|
||||
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
private Integer status;
|
||||
|
||||
|
||||
/**
|
||||
* 状态：0-删除 1-正常
|
||||
*/
|
||||
@TableField(value = "`State`")
|
||||
private Integer state;
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
package com.njcn.supervision.pojo.po.plan;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
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.ApiModel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/5/20 19:50【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(description="")
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "supervision_problem")
|
||||
public class SupervisionProblemPO extends BaseEntity {
|
||||
@TableId(value = "problem_Id", type = IdType.ASSIGN_UUID)
|
||||
private String problemId;
|
||||
|
||||
/**
|
||||
* 关联计划表
|
||||
*/
|
||||
@TableField(value = "plan_id")
|
||||
private String planId;
|
||||
|
||||
/**
|
||||
* 所属网省id
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String provinceId;
|
||||
|
||||
/**
|
||||
* 责任单位id，取ISC平台上的组织id
|
||||
*/
|
||||
@TableField(value = "duty_Org_Id")
|
||||
private String dutyOrgId;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String dutyOrgName;
|
||||
|
||||
/**
|
||||
* 监测点类型 ，仅供电电压监督计划必填
|
||||
*/
|
||||
@TableField(value = "monitor_Type")
|
||||
private String monitorType;
|
||||
|
||||
/**
|
||||
* 整改时间
|
||||
*/
|
||||
@TableField(value = "rectification_Time")
|
||||
private LocalDateTime rectificationTime;
|
||||
|
||||
/**
|
||||
* 计划整改时间
|
||||
*/
|
||||
@TableField(value = "plan_Rectification_Time")
|
||||
private LocalDateTime planRectificationTime;
|
||||
|
||||
/**
|
||||
* 是否发布预告警
|
||||
*/
|
||||
@TableField(value = "if_Release_Warning")
|
||||
private Boolean ifReleaseWarning;
|
||||
|
||||
@TableField(value = "problem_Desc")
|
||||
private String problemDesc;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@TableField(value = "simple_Problem_Desc")
|
||||
private String simpleProblemDesc;
|
||||
|
||||
@TableField(value = "supv_Standard_Sort")
|
||||
private String supvStandardSort;
|
||||
|
||||
/**
|
||||
* 监督标准
|
||||
*/
|
||||
@TableField(value = "supv_Standard")
|
||||
private String supvStandard;
|
||||
|
||||
/**
|
||||
* 标准出处
|
||||
*/
|
||||
@TableField(value = "supv_Resouce")
|
||||
private String supvResouce;
|
||||
|
||||
/**
|
||||
* 问题等级 01 一般，02 较大
|
||||
*/
|
||||
@TableField(value = "problem_Level")
|
||||
private String problemLevel;
|
||||
|
||||
/**
|
||||
* 定级依据
|
||||
*/
|
||||
@TableField(value = "problem_Level_Reason")
|
||||
private String problemLevelReason;
|
||||
|
||||
/**
|
||||
* 问题类型
|
||||
*/
|
||||
@TableField(value = "problem_Type")
|
||||
private String problemType;
|
||||
|
||||
/**
|
||||
* 整改方案
|
||||
*/
|
||||
@TableField(value = "rectification_Programme")
|
||||
private String rectificationProgramme;
|
||||
|
||||
/**
|
||||
* 整改措施
|
||||
*/
|
||||
@TableField(value = "rectification_Measure")
|
||||
private String rectificationMeasure;
|
||||
|
||||
/**
|
||||
* 整改情况, 01已整改，02未整改
|
||||
*/
|
||||
@TableField(value = "rectification_Status")
|
||||
private String rectificationStatus;
|
||||
|
||||
/**
|
||||
* 是否上送国网 0.未上送 1.上送
|
||||
*/
|
||||
@TableField(value = "is_Upload_Head")
|
||||
private Boolean isUploadHead;
|
||||
|
||||
/**
|
||||
* 问题发现时间
|
||||
*/
|
||||
@TableField(value = "discovery_Time")
|
||||
private LocalDateTime discoveryTime;
|
||||
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String attachmentName;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String attachmentNameTwo;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.njcn.supervision.pojo.vo.device;
|
||||
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* Date: 2024/5/20 10:32【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
public class SupervisionTempLineDebugVO extends BaseEntity {
|
||||
|
||||
private String id;
|
||||
private String lineId;
|
||||
private String lineName;
|
||||
private String reason;
|
||||
private String processInstanceId;
|
||||
|
||||
private Integer status;
|
||||
}
|
||||
@@ -215,6 +215,14 @@ public class SupervisionTempLineReportVO {
|
||||
@ApiModelProperty(value="电压偏差下限")
|
||||
private Float voltageDeviationLowerLimit;
|
||||
|
||||
/**
|
||||
* 流程实例的编号
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value = "流程实例的编号")
|
||||
private String processInstanceId;
|
||||
|
||||
|
||||
/**
|
||||
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
package com.njcn.supervision.pojo.vo.plan;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* pqs
|
||||
*
|
||||
* @author cdf
|
||||
* @date 2023/6/25
|
||||
*/
|
||||
@Data
|
||||
public class SupervisionPlanVO {
|
||||
|
||||
@ApiModelProperty(value = "索引",required = true)
|
||||
private String planId;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
@ApiModelProperty(value = "计划名称",required = true)
|
||||
private String workPlanName;
|
||||
|
||||
/**
|
||||
* 监督单位
|
||||
*/
|
||||
@ApiModelProperty(value = "监督单位",required = true)
|
||||
private String supvOrgId;
|
||||
|
||||
@ApiModelProperty(value = "监督单位名称",required = true)
|
||||
private String supvOrgName;
|
||||
|
||||
/**
|
||||
* 计划编制单位id
|
||||
*/
|
||||
@ApiModelProperty(value = "计划编制单位id")
|
||||
private String planOrgId;
|
||||
|
||||
/**
|
||||
* 计划编制单位名字
|
||||
*/
|
||||
@ApiModelProperty(value = "计划编制单位名字")
|
||||
private String planOrgName;
|
||||
|
||||
|
||||
private String planUserId;
|
||||
|
||||
private String planUserName;
|
||||
|
||||
/**
|
||||
* 监督类型
|
||||
*/
|
||||
@ApiModelProperty(value = "监督类型",required = true)
|
||||
private String supvType;
|
||||
|
||||
/**
|
||||
* 监督阶段
|
||||
*/
|
||||
@ApiModelProperty(value = "监督阶段",required = true)
|
||||
private String supvStage;
|
||||
|
||||
/**
|
||||
* 计划监督时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划监督时间",required = true)
|
||||
@JsonFormat(pattern = "yyyy-MM")
|
||||
private String planSupvDate;
|
||||
|
||||
/**
|
||||
* 监督对象名称
|
||||
*/
|
||||
@ApiModelProperty(value = "监督对象名称")
|
||||
private String supvObjName;
|
||||
|
||||
/**
|
||||
* 对象类型
|
||||
*/
|
||||
@ApiModelProperty(value = "对象类型")
|
||||
private String supvObjType;
|
||||
|
||||
/**
|
||||
* 对象电压等级
|
||||
*/
|
||||
@ApiModelProperty(value = "对象电压等级")
|
||||
private String objVoltageLevel;
|
||||
|
||||
/**
|
||||
* 关联电站
|
||||
*/
|
||||
@ApiModelProperty(value = "关联电站")
|
||||
private String substationName;
|
||||
|
||||
@ApiModelProperty(value = "关联电站电压等级")
|
||||
private String substationVoltageLevel;
|
||||
|
||||
@ApiModelProperty(value = "监督对象属性")
|
||||
private String objType;
|
||||
|
||||
@ApiModelProperty(value = "监督对象属性名称")
|
||||
private String objTypeName;
|
||||
|
||||
@ApiModelProperty(value = "监督对象协议容量(MVA)")
|
||||
private Double objCapacity;
|
||||
|
||||
/**
|
||||
* 计划执行开始时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划执行开始时间",required = true)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime effectStartTime;
|
||||
|
||||
/**
|
||||
* 计划执行结束时间
|
||||
*/
|
||||
@ApiModelProperty(value = "计划执行结束时间",required = true)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime effectEndTime;
|
||||
|
||||
/**
|
||||
* 报告出具时间
|
||||
*/
|
||||
@ApiModelProperty(value = "报告出具时间",required = true)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime reportIssueTime;
|
||||
|
||||
/**
|
||||
* 电能质量问题发生时间
|
||||
*/
|
||||
@ApiModelProperty(value = "电能质量问题发生时间",required = true)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime problemOcTime;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String otherRemark;
|
||||
|
||||
@ApiModelProperty(value = "省部门")
|
||||
private String province;
|
||||
|
||||
@ApiModelProperty(value = "市部门")
|
||||
private String city;
|
||||
|
||||
@ApiModelProperty(value = "县部门")
|
||||
private String county;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "附件名称")
|
||||
private String attachmentName;
|
||||
|
||||
/**
|
||||
* 0.未上送 1.上送 2.取消上送
|
||||
*/
|
||||
@ApiModelProperty(value = "0.未上送 1.上送 2.取消上送")
|
||||
private Integer isUploadHead;
|
||||
|
||||
private String createBy;
|
||||
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 实施状态
|
||||
*/
|
||||
private String effectStatus;
|
||||
/**
|
||||
* 实施人id
|
||||
*/
|
||||
private String effectUserId;
|
||||
/**
|
||||
* 实施人姓名
|
||||
*/
|
||||
private String effectUserName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "计划状态")
|
||||
private String planStatus;
|
||||
}
|
||||
@@ -34,6 +34,9 @@ public class UserReportVO {
|
||||
@ApiModelProperty(value = "填报人")
|
||||
private String reporter;
|
||||
|
||||
@ApiModelProperty(value = "填报人名称")
|
||||
private String reporterName;
|
||||
|
||||
/**
|
||||
* 填报日期
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user