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

1.技术监督月报，供电次数重新统计

Browse Source 
2.终端通信管理_日表和终端数据评价_日表，pq和pms兼容修改
This commit is contained in:
wr
2023-09-28 14:33:24 +08:00
parent d327814ade
commit 76afa647bb
16 changed files with 196 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/RMpDevEvaluateDetailFeignClient.java
View File

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.prepare.harmonic.api.line.fallback.RMpDevEvaluateDetailFeignClientFallbackFactory;
import com.njcn.prepare.harmonic.api.line.fallback.RStatOrgFeignClientFallbackFactory;
import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
import com.njcn.prepare.harmonic.pojo.param.OrgParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
public interface RMpDevEvaluateDetailFeignClient {
@PostMapping("/handler")
HttpResult<Boolean> handler(@RequestBody OrgParam orgParam);
HttpResult<Boolean> handler(@RequestBody DeviceParam deviceParam);
}

3
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/RMpDevEvaluateDetailFeignClientFallbackFactory.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.prepare.harmonic.api.line.RMpDevEvaluateDetailFeignClient;
import com.njcn.prepare.harmonic.api.line.RStatOrgFeignClient;
import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
import com.njcn.prepare.harmonic.pojo.param.OrgParam;
import com.njcn.prepare.harmonic.utils.PrepareEnumUtil;
import feign.hystrix.FallbackFactory;
@@ -31,7 +32,7 @@ public class RMpDevEvaluateDetailFeignClientFallbackFactory implements FallbackF
return new RMpDevEvaluateDetailFeignClient() {
@Override
public HttpResult<Boolean> handler(OrgParam orgParam) {
public HttpResult<Boolean> handler(DeviceParam deviceParam) {
log.error("{}异常，降级处理，异常为：{}", "终端数据评价_日统计: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}

22
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/RStatDevSignalFeignClient.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.prepare.harmonic.api.newalgorithm;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.prepare.harmonic.api.newalgorithm.fallback.RStatAbnormalFeignClientFallbackFactory;
import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(
value = ServerInfo.PREPARE_BOOT,//对应模块名
path = "/rstatdevsignal",//对应controller请求类
fallbackFactory = RStatAbnormalFeignClientFallbackFactory.class//服务降级处理类
)
public interface RStatDevSignalFeignClient {
@PostMapping("/rstatdevsignalHandler")
HttpResult<String> rstatdevsignalHandler(@RequestBody @Validated DeviceParam deviceParam);
}

34
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/newalgorithm/fallback/RStatDevSignalClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,34 @@
package com.njcn.prepare.harmonic.api.newalgorithm.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.prepare.harmonic.api.newalgorithm.RStatDevSignalFeignClient;
import com.njcn.prepare.harmonic.pojo.param.DeviceParam;
import com.njcn.prepare.harmonic.utils.PrepareEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class RStatDevSignalClientFallbackFactory implements FallbackFactory<RStatDevSignalFeignClient> {
@Override
public RStatDevSignalFeignClient create(Throwable throwable) {
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (throwable.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) throwable.getCause();
exceptionEnum = PrepareEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new RStatDevSignalFeignClient() {
@Override
public HttpResult<String> rstatdevsignalHandler(DeviceParam deviceParam) {
log.error("{}异常，降级处理，异常为：{}", "终端通信管理_日统计: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

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

@@ -18,20 +18,39 @@ import java.util.List;
@Data
public class DeviceParam {
private List<DeviceDetail> detailList;
@ApiModelProperty(name = "dataDate",value = "时间")
@NotBlank(message = "报表时间不可为空")
private String dataDate;
/**
* 调度任务开始时间
*/
@NotBlank(message = "调度任务开始时间不可为空")
private String beginTime;
/**
* 调度任务结束时间
*/
@NotBlank(message = "调度任务结束时间不可为空")
private String endTime;
/**
* 是否补招标识,默认false不补招
*/
@ApiModelProperty(name = "repairFlag",value = "0.不补招 1.补招",example = "false")
private Boolean repairFlag = false;
@Data
public static class DeviceDetail{
@ApiModelProperty(name = "devId",value = "终端id")
private String devId;
@ApiModelProperty(name = "updateTime",value = "终端最后统计时间")
private String updateTime;
@ApiModelProperty(name = "lineIds",value = "监测点索引集合")
private List<String> lineIds;

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

@@ -28,8 +28,8 @@ public class RStatDevSignalDPO {
/**
* 终端Id
*/
@MppMultiId(value = "dev_id")
private String devId;
@MppMultiId(value = "device_id")
private String deviceId;
/**
* 设备状态