From c08e745286d605dc30035ea0e8314bfbe1309a56 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 15 Dec 2023 09:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/pojo/po/send/ConverterDetailStatisticsPO.java | 5 +++++ .../harmonic/pojo/po/send/ConverterIndexStatisticsPO.java | 5 +++++ .../njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java | 6 ++++++ ...roller.java => ConverterDetailStatisticsController.java} | 4 ++-- .../controller/send/ConverterIndexStatisticsController.java | 2 +- .../send/impl/ConverterDetailStatisticsPOServiceImpl.java | 1 + .../send/impl/ConverterIndexStatisticsPOServiceImpl.java | 1 + .../send/impl/PqTypicalSourceCreatePOServiceImpl.java | 1 + 8 files changed, 22 insertions(+), 3 deletions(-) rename pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/{SubstationQualityStatisticsController.java => ConverterDetailStatisticsController.java} (95%) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java index ca74bb289..4f1ad2be4 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java @@ -112,4 +112,9 @@ public class ConverterDetailStatisticsPO { @TableField(value = "vthdLimit") private BigDecimal vthdLimit; + /** + * 0.以上送 1.未上送 2.取消上送 3.待重新上送 + */ + @TableField(value = "is_upload_head") + private Integer isUploadHead; } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java index d0fc2eccf..bf6058980 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java @@ -90,4 +90,9 @@ public class ConverterIndexStatisticsPO { @TableField(value = "monitorAlternatingBusCount") private Integer monitorAlternatingBusCount; + /** + * 0.以上送 1.未上送 2.取消上送 3.待重新上送 + */ + @TableField(value = "is_upload_head") + private Integer isUploadHead; } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java index 6916afd6d..904579493 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java @@ -120,4 +120,10 @@ public class PqTypicalSourceCreatePO { @TableField(value = "ovDayCount") private Integer ovDayCount; + + /** + * 0.以上送 1.未上送 2.取消上送 3.待重新上送 + */ + @TableField(value = "is_upload_head") + private Integer isUploadHead; } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java similarity index 95% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java index ee741859a..973bf5337 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java @@ -36,10 +36,10 @@ import java.util.List; @Slf4j @RestController -@RequestMapping("/substationQuality") +@RequestMapping("/ConverterDetail") @Api(tags = "换流站指标统计明细数据") @RequiredArgsConstructor -public class SubstationQualityStatisticsController extends BaseController { +public class ConverterDetailStatisticsController extends BaseController { private final ConverterDetailStatisticsPOService converterDetailStatisticsPOService; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java index 5dbab4104..03ea91fd9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java @@ -34,7 +34,7 @@ import java.util.List; */ @Slf4j @RestController -@RequestMapping("/Converterdetail") +@RequestMapping("/ConverterIndex") @Api(tags = "换流站指标统计明细汇总数据") @RequiredArgsConstructor public class ConverterIndexStatisticsController extends BaseController { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java index 847611377..a53f5ff9e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java @@ -92,6 +92,7 @@ public class ConverterDetailStatisticsPOServiceImpl extends ServiceImpl