diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java index 8ac0fb065..40dad4616 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java @@ -4,9 +4,11 @@ import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; +import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; 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; @@ -43,4 +45,8 @@ public interface StatationStatClient { HttpResult> getPowerInfo(@RequestBody PmsStatationStatInfoParam param); + @PostMapping("/getstatationStatList") + HttpResult> getstatationStatList(@RequestBody PmsBaseParam pmsBaseParam); + + } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java index 4f3ca0a79..896c7e22e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.StatationStatClient; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; +import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; @@ -44,6 +45,12 @@ public class StatationStatClientFallbackFactory implements FallbackFactory> getstatationStatList(PmsBaseParam pmsBaseParam) { + log.error("{}异常,降级处理,异常为:{}", "获取变电站信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java index 90ee90ed5..3da78a422 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java @@ -203,5 +203,7 @@ public class SupvReportM { */ private Integer powerTotalConductedNum; + private Integer isuploadhead; + } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java index 6c458c5a1..ab2ec5153 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java @@ -88,7 +88,7 @@ public class SupvPlanVO { * 关联电站 */ @ApiModelProperty(value = "关联电站") - private String objRelationStation; + private String substationName; @ApiModelProperty(value = "关联电站电压等级") private String substationVoltageLevel; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java index 5a51b1e9e..a1153fb01 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java @@ -100,4 +100,18 @@ public class SupvPushGwController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + /** + * 删除电能质量技术监督工作计划接口 + * @author cdf + * @date 2023/6/28 + */ + @PostMapping("delPushPlan") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("取消电能质量技术监督工作计划接口") + @ApiImplicitParam(name = "planIds",value = "请求体",required = true) + public HttpResult delPushPlan(@RequestBody List planIds){ + String methodDescribe = getMethodDescribe("delPushPlan"); + supvPushGwService.deletePlan(planIds); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java index d3ad476fc..88fcd614b 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java @@ -169,6 +169,9 @@ public class SupvPlanServiceImpl extends ServiceImpl i if(map.containsKey(item.getCreateBy())) { item.setCreateBy(map.get(item.getCreateBy()).getName()); } + + + }); Page pageVo = new Page<>(); pageVo.setTotal(page.getTotal()); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java index 5c4e9a1cf..900024304 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java @@ -48,6 +48,7 @@ public class SupvProblemServiceImpl extends ServiceImpl planIds) { - return false; + + List supvPlanList = new ArrayList<>(); + for(String id : planIds) { + SupvPlan supvPlan = new SupvPlan(); + supvPlan.setPlanId(id); + supvPlanList.add(supvPlan); + } + + //TODO + + + for(SupvPlan supvPlan : supvPlanList) { + supvPlan.setIsUploadHead(2); + supvPlanMapper.updateById(supvPlan); + } + return true; } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java index c554571ed..bf755e2ee 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java @@ -249,6 +249,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl