diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java index a53f2ff31..ba8dfb21c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsRunStatistic.java @@ -1,12 +1,20 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.time.LocalDate; +import java.time.LocalDateTime; /** * pqs @@ -14,15 +22,13 @@ import java.time.LocalDate; * @author cdf * @date 2024/4/17 */ -@TableName(value = "pms_run_statistic") +@TableName(value = "pms_run_statistic_d") @Data -@EqualsAndHashCode(callSuper = true) -public class PmsRunStatistic extends BaseEntity { +public class PmsRunStatistic{ /** * */ - @MppMultiId private LocalDate statisticDate; @@ -31,6 +37,39 @@ public class PmsRunStatistic extends BaseEntity { private String runMonitorIds; + private String onlineMonitorIds; + + private String runBusIds; + + private Integer runBusNum; + + private String onlineBusIds; + private String runDevIds; + private String runStationIds; + + private Integer runStationNum; + + private String onlineStationIds; + + private String typicalTractionIds; + + private String typicalWindIds; + + private String typicalSunIds; + + private String typicalOtherIds; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + private LocalDateTime createTime; + + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 06f5ee9a0..9ca95d358 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -451,4 +451,7 @@ public class CommTerminalController extends BaseController { + + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsCountLedgerMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsCountLedgerMapper.java new file mode 100644 index 000000000..b92d4b6c3 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsCountLedgerMapper.java @@ -0,0 +1,21 @@ +package com.njcn.device.pms.mapper.majornetwork; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.PmsCountLedger; + +import java.util.List; + +/** + *
+ * 每日变电站-母线数据总条目表 Mapper 接口 + *
+ * + * @author hongawen + * @since 2023-11-15 + */ +public interface PmsCountLedgerMapper extends BaseMapper
@@ -39,24 +54,130 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl