From 592a4dd81acf138a2421379eb27369a77b3b5529 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 11 Jul 2023 11:11:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#=E6=A3=80=E4=BF=AE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/main/vo/WindScoreVo.java | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java index 9ca6bea..71a6019 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java @@ -28,33 +28,29 @@ public class WindScoreVo { @JsonSerialize(nullsUsing = NullSerializer.class) private Double installedCapacity; - @ApiModelProperty(value = "年平均风速") + @ApiModelProperty(value = "今日发电量") @JsonSerialize(nullsUsing = NullSerializer.class) - private Double capacityRate; + private Double generateDay; - @ApiModelProperty(value = "总有功功率") + @ApiModelProperty(value = "月总发电量") @JsonSerialize(nullsUsing = NullSerializer.class) - private Double load; + private Double generateMon; @ApiModelProperty(value = "年总发电量") @JsonSerialize(nullsUsing = NullSerializer.class) private Double generateYear; - @ApiModelProperty(value = "月总发电量") - @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateMon; - - @ApiModelProperty(value = "日总发电量") + @ApiModelProperty(value = "月平均风速") @JsonSerialize(nullsUsing = NullSerializer.class) - private Double generateDay; + private Double speedRate; - @ApiModelProperty(value = "年计划发电量") + @ApiModelProperty(value = "短期准确率") @JsonSerialize(nullsUsing = NullSerializer.class) - private Double plan; + private Double accuracy; - @ApiModelProperty(value = "年计划完成率") + @ApiModelProperty(value = "超短期准确率") @JsonSerialize(nullsUsing = NullSerializer.class) - private Double planRate; + private Double ultraShortAccuracyRate; @ApiModelProperty(value = "近年发电量集合") private List powerYearVoList; From 56fbd00e02650004d107f0e35064eb180041d26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 11 Jul 2023 11:14:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ticket=E5=B7=A5=E4=BD=9C=E7=A5=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middle/process/fallback/ProcessDictFeignServiceFallback.java | 3 +-- .../hnac/hzims/middle/process/feign/ProcessDictFeignService.java | 4 +--- .../hzims/middle/processflow/controller/ProcessDictController.java | 6 ++---- .../standardTicket/service/impl/OperationTicketServiceImpl.java | 2 +- .../ticket/twoTicket/service/impl/TicketProcessServiceImpl.java | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/fallback/ProcessDictFeignServiceFallback.java b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/fallback/ProcessDictFeignServiceFallback.java index afe824b..e368bf7 100644 --- a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/fallback/ProcessDictFeignServiceFallback.java +++ b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/fallback/ProcessDictFeignServiceFallback.java @@ -21,11 +21,10 @@ public class ProcessDictFeignServiceFallback implements ProcessDictFeignService * * @param staff * @param typeInstrument - * @param createTime * @return */ @Override - public String getTicketByCode(String staff, String typeInstrument, LocalDateTime createTime) { + public String getTicketByCode(String staff, String typeInstrument) { log.error("获取工作票工作票唯一ID 熔断措施"); return null; } diff --git a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java index 27bc415..70413dc 100644 --- a/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java +++ b/hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/feign/ProcessDictFeignService.java @@ -21,13 +21,11 @@ public interface ProcessDictFeignService { * * @param staff * @param typeInstrument - * @param createTime * @return */ @GetMapping("/process-dict/getTicketByCode") public String getTicketByCode(@RequestParam("staff") String staff, - @RequestParam("typeInstrument") String typeInstrument, - @RequestParam("createTime") LocalDateTime createTime); + @RequestParam("typeInstrument") String typeInstrument); /** diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java index d34c813..fef5646 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/controller/ProcessDictController.java @@ -62,14 +62,12 @@ public class ProcessDictController { * * @param staff * @param typeInstrument - * @param createTime * @return */ @GetMapping("/getTicketByCode") public String getTicketByCode(@RequestParam("staff") String staff, - @RequestParam("typeInstrument") String typeInstrument, - @RequestParam("createTime") LocalDateTime createTime) { - return processIdWorker.getTicketByCode(staff, typeInstrument, createTime); + @RequestParam("typeInstrument") String typeInstrument) { + return processIdWorker.getTicketByCode(staff, typeInstrument, LocalDateTime.now()); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java index 2e253a9..acfc197 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java @@ -126,7 +126,7 @@ public class OperationTicketServiceImpl implements OperationTicketService { standardTicketInfoVo.setSignage(signage); standardTicketInfoVo.setSignageCode(station.getCode()); //2. 获取编码 - String code = processDictFeignService.getTicketByCode(standardTicketInfoVo.getSignage(), this.getTicketWichCode(standardTicketInfoVo.getTicketType()), LocalDateTime.now()); + String code = processDictFeignService.getTicketByCode(standardTicketInfoVo.getSignage(), this.getTicketWichCode(standardTicketInfoVo.getTicketType())); log.info("获取编码: {}", code); if (StringUtils.isBlank(code)) { throw new ServiceException("服务器异常，请联系管理员"); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index a7909aa..cb82cba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -191,8 +191,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { workTicketVo.getWorkTicket().setSignage(station.getSignage()); workTicketVo.getWorkTicket().setSignageCode(station.getCode()); //2. 获取编码 - String code = processDictFeignService.getTicketByCode(signage, this.getTicketWichCode(workTicketVo.getWorkTicket().getType()), - LocalDateTime.now()); + String code = processDictFeignService.getTicketByCode(signage, this.getTicketWichCode(workTicketVo.getWorkTicket().getType())); log.info("获取编码: {}", code); if (StringUtils.isBlank(code)) { throw new ServiceException("服务器异常，请联系管理员");