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

技术监督管理调整

Browse Source
This commit is contained in:
雨木c
2023-06-29 11:21:10 +08:00
parent 371a946721
commit 809056a257
12 changed files with 326 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pqs-process/process-api/src/main/java/com/njcn/process/api/SupvStatisticReportMFeignClient.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.process.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.process.api.fallback.SupvStatisticReportMFallbackFactory;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate;
/**
* 过程监督月报统计
* @author cdf
* @date 2023/4/13
*/
@FeignClient(value = ServerInfo.PROCESS,path = "/supv/report",fallbackFactory = SupvStatisticReportMFallbackFactory.class)
public interface SupvStatisticReportMFeignClient {
@PostMapping("/statisticReport")
HttpResult<Boolean> statisticReport(@RequestParam("timeId") String timeId);
}

42
pqs-process/process-api/src/main/java/com/njcn/process/api/fallback/SupvStatisticReportMFallbackFactory.java Normal file
View File

@@ -0,0 +1,42 @@
package com.njcn.process.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.process.api.SupvStatisticReportMFeignClient;
import com.njcn.process.utils.ProcessEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate;
/**
*
* @author cdf
* @date 2023/4/13
*/
@Slf4j
@Component
public class SupvStatisticReportMFallbackFactory implements FallbackFactory<SupvStatisticReportMFeignClient> {
@Override
public SupvStatisticReportMFeignClient create(Throwable throwable) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (throwable.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) throwable.getCause();
exceptionEnum = ProcessEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new SupvStatisticReportMFeignClient() {
@Override
public HttpResult<Boolean> statisticReport(String timeId) {
log.error("{}异常，降级处理，异常为：{}", "技术监督月报统计", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

7
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java
View File

@@ -71,21 +71,18 @@ public class SupvPlanParam extends BaseParam {
* 监督对象名称
*/
@ApiModelProperty(value = "监督对象名称")
@NotBlank(message = "监督对象名称不可为空")
private String supvObjName;
/**
* 对象类型
* 监督对象类型
*/
@ApiModelProperty(value = "对象类型")
@NotBlank(message = "对象类型不可为空")
private String supvObjType;
/**
* 对象电压等级
* 监督对象电压等级
*/
@ApiModelProperty(value = "对象电压等级")
@NotBlank(message = "对象电压等级不可为空")
private String objVoltageLevel;
/**

116
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java
View File

@@ -1,5 +1,6 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -30,16 +31,29 @@ public class SupvPlan extends BaseEntity {
@TableId
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;
/**
* 计划名称
*/
private String workPlanName;
/**
* 监督单位
*/
private String supvOrgId;
/**
* 监督类型
*/
@@ -50,17 +64,71 @@ public class SupvPlan extends BaseEntity {
*/
private String supvStage;
/**
* 监督单位
*/
private String supvOrgId;
/**
* 监督单位
*/
@TableField(exist = false)
private String supvOrgName;
/**
* 计划监督时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate planSupvDate;
/**
* 计划编制人id
*/
private String planUserId;
@TableField(exist = false)
private String planUserName;
/**
* 计划编制单位id
*/
private String planOrgId;
@TableField(exist = false)
private String planOrgName;
/**
* 备注
*/
private String otherRemark;
/**
* 计划执行开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate effectStartTime;
/**
* 计划执行结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate effectEndTime;
/**
* 实施状态
*/
private String effectStatus;
/**
* 监督对象名称
*/
private String supvObjName;
@TableField(exist = false)
private String supvObjId;
/**
* 对象类型
*/
@@ -71,6 +139,9 @@ public class SupvPlan extends BaseEntity {
*/
private String objVoltageLevel;
@TableField(exist = false)
private String objVoltageLevelName;
/**
* 关联电站
*/
@@ -82,6 +153,12 @@ public class SupvPlan extends BaseEntity {
*/
private String substationVoltageLevel;
/**
* 关联电站电压等级名称
*/
@TableField(exist = false)
private String substationVoltageLevelName;
/**
* 监督对象属性
@@ -98,17 +175,7 @@ public class SupvPlan extends BaseEntity {
*/
private Double objCapacity;
/**
* 计划执行开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate effectStartTime;
/**
* 计划执行结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate effectEndTime;
/**
* 报告出具时间
@@ -122,26 +189,9 @@ public class SupvPlan extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime problemOcTime;
/**
* 备注
*/
private String otherRemark;
/**
* 计划编制人id
*/
private String planUserId;
/**
* 计划编制单位id
*/
private String planOrgId;
/**
* 实施状态
*/
private String effectStatus;
/**
* 0.未上送 1.上送 2.取消上送