From 1a3757163b15b5efb11936e6dfd8111a6f397d01 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 27 Nov 2023 13:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonic/pojo/po/dim/RBusbarVoltageD.java | 313 ++++++++++++++++++
 .../harmonic/pojo/po/dim}/RDimObjEventD.java  |   7 +-
 .../harmonic/pojo/po/dim}/RDimObjEventM.java  |   7 +-
 .../harmonic/pojo/po/dim}/RDimObjEventY.java  |   7 +-
 .../com/njcn/prepare/ExecutionCenter.java     |  45 +++
 .../prepare/executor/GeneraTrixExecutor.java  |  52 +++
 .../prepare/executor/MeasurementExecutor.java |   2 +-
 .../mysql/dim/RBusbarVoltageDMapper.java      |  17 +
 .../mapper/mysql/dim/RDimObjEventDMapper.java |   3 +-
 .../mapper/mysql/dim/RDimObjEventMMapper.java |   3 +-
 .../mapper/mysql/dim/RDimObjEventYMapper.java |   3 +-
 .../mysql/dim/IRBusbarVoltageDService.java    |  22 ++
 .../mysql/dim/IRDimObjEventDService.java      |   5 +-
 .../mysql/dim/IRDimObjEventMService.java      |   2 +-
 .../mysql/dim/IRDimObjEventYService.java      |   2 +-
 .../dim/impl/RBusbarVoltageDServiceImpl.java  |  38 +++
 .../dim/impl/RDimObjEventDServiceImpl.java    |   2 +-
 .../dim/impl/RDimObjEventMServiceImpl.java    |   3 +-
 .../dim/impl/RDimObjEventYServiceImpl.java    |   4 +-
 19 files changed, 509 insertions(+), 28 deletions(-)
 create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RBusbarVoltageD.java
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim}/RDimObjEventD.java (92%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim}/RDimObjEventM.java (92%)
 rename {pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po => pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim}/RDimObjEventY.java (92%)
 create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/GeneraTrixExecutor.java
 create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RBusbarVoltageDMapper.java
 create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRBusbarVoltageDService.java
 create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RBusbarVoltageDServiceImpl.java

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RBusbarVoltageD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RBusbarVoltageD.java
new file mode 100644
index 000000000..fb31b7f03
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RBusbarVoltageD.java
@@ -0,0 +1,313 @@
+package com.njcn.harmonic.pojo.po.dim;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 母线不同电压等级指标数据-日表
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-27
+ */
+@Data
+@TableName("r_busbar_voltage_d")
+public class RBusbarVoltageD {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 统计时间yyyy-mm-dd
+     */
+    private LocalDate statisDate;
+
+    /**
+     * 母线id
+     */
+    private String busbarId;
+
+    /**
+     * 电压等级
+     */
+    private String voltageType;
+
+    /**
+     * 电压（日平均值）
+     */
+    private BigDecimal v;
+
+    /**
+     * 三相电压不平衡（日95%概率大值）
+     */
+    private BigDecimal vUnbalance;
+
+    /**
+     * 长时间闪变（日最大值）
+     */
+    private BigDecimal pst;
+
+    /**
+     * 电压总谐波畸变率（日95%概率大值）
+     */
+    private BigDecimal vThd;
+
+    /**
+     * 基波电压（日95%概率大值）
+     */
+    private BigDecimal v1;
+
+    /**
+     * 2次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v2;
+
+    /**
+     * 3次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v3;
+
+    /**
+     * 4次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v4;
+
+    /**
+     * 5次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v5;
+
+    /**
+     * 6次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v6;
+
+    /**
+     * 7次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v7;
+
+    /**
+     * 8次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v8;
+
+    /**
+     * 9次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v9;
+
+    /**
+     * 10次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v10;
+
+    /**
+     * 11次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v11;
+
+    /**
+     * 12次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v12;
+
+    /**
+     * 13次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v13;
+
+    /**
+     * 14次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v14;
+
+    /**
+     * 15次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v15;
+
+    /**
+     * 16次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v16;
+
+    /**
+     * 17次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v17;
+
+    /**
+     * 18次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v18;
+
+    /**
+     * 19次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v19;
+
+    /**
+     * 20次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v20;
+
+    /**
+     * 21次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v21;
+
+    /**
+     * 22次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v22;
+
+    /**
+     * 23次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v23;
+
+    /**
+     * 24次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v24;
+
+    /**
+     * 25次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v25;
+
+    /**
+     * 26次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v26;
+
+    /**
+     * 27次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v27;
+
+    /**
+     * 28次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v28;
+
+    /**
+     * 29次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v29;
+
+    /**
+     * 30次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v30;
+
+    /**
+     * 31次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v31;
+
+    /**
+     * 32次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v32;
+
+    /**
+     * 33次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v33;
+
+    /**
+     * 34次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v34;
+
+    /**
+     * 35次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v35;
+
+    /**
+     * 36次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v36;
+
+    /**
+     * 37次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v37;
+
+    /**
+     * 38次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v38;
+
+    /**
+     * 39次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v39;
+
+    /**
+     * 40次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v40;
+
+    /**
+     * 41次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v41;
+
+    /**
+     * 42次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v42;
+
+    /**
+     * 43次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v43;
+
+    /**
+     * 44次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v44;
+
+    /**
+     * 45次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v45;
+
+    /**
+     * 46次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v46;
+
+    /**
+     * 47次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v47;
+
+    /**
+     * 48次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v48;
+
+    /**
+     * 49次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v49;
+
+    /**
+     * 50次谐波电压（日95%概率大值）
+     */
+    private BigDecimal v50;
+
+
+}
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java
similarity index 92%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventD.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java
index ba155b530..749bd1b04 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventD.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventD.java
@@ -1,10 +1,12 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.dim;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDate;
+
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +18,7 @@ import lombok.Setter;
  * @author xuyang
  * @since 2023-11-23
  */
-@Getter
-@Setter
+@Data
 @TableName("r_dim_obj_event_d")
 public class RDimObjEventD {
 
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java
similarity index 92%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventM.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java
index aacd90ca4..b6e93796e 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventM.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventM.java
@@ -1,10 +1,12 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.dim;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDate;
+
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +18,7 @@ import lombok.Setter;
  * @author xuyang
  * @since 2023-11-23
  */
-@Getter
-@Setter
+@Data
 @TableName("r_dim_obj_event_m")
 public class RDimObjEventM {
 
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java
similarity index 92%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventY.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java
index 6e5becc84..daa5ef822 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimObjEventY.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/dim/RDimObjEventY.java
@@ -1,10 +1,12 @@
-package com.njcn.prepare.harmonic.pojo.po;
+package com.njcn.harmonic.pojo.po.dim;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDate;
+
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +18,7 @@ import lombok.Setter;
  * @author xuyang
  * @since 2023-11-23
  */
-@Getter
-@Setter
+@Data
 @TableName("r_dim_obj_event_y")
 public class RDimObjEventY {
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
index 5d89cac8a..54132e815 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
@@ -11,6 +11,7 @@ import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
+import com.njcn.device.biz.pojo.dto.DeptGetBusBarDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
@@ -276,4 +277,48 @@ public class ExecutionCenter extends BaseController {
 
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("母线算法执行链(主网测点)")
+    @PostMapping("/generaTrixExecutor")
+    @Async("asyncExecutor")
+    public void generaTrixExecutor(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("generaTrixExecutor");
+        //手动判断参数是否合法,
+        CalculatedParam calculatedParam = judgeExecuteParam(baseParam);
+        //母线索引
+        if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
+            Dept dept = deptFeignClient.getRootDept().getData();
+            DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
+            deptGetLineParam.setDeptId(dept.getId());
+            deptGetLineParam.setSystemType(0);
+            List<DeptGetBusBarDTO> busBarList = commTerminalGeneralClient.deptBusBar(deptGetLineParam).getData();
+            DeptGetBusBarDTO dto = busBarList.stream().filter(u -> Objects.equals(u.getUnitId(),dept.getCode())).findAny().orElse(null);
+            if (Objects.nonNull(dto)){
+                calculatedParam.setIdList(dto.getBusBarIds());
+            }
+        }
+        LiteflowResponse liteflowResponse;
+        if (baseParam.isRepair()) {
+            //补招时，起始日期、截止日期必填
+            DateTime startDate = DateUtil.parse(baseParam.getBeginTime(), DatePattern.NORM_DATE_FORMAT);
+            DateTime endDate = DateUtil.parse(baseParam.getEndTime(), DatePattern.NORM_DATE_FORMAT);
+            long betweenDay = DateUtil.betweenDay(startDate, endDate, true);
+            //递增日期执行算法链
+            for (int i = 0; i < betweenDay; i++) {
+                if (i != 0) {
+                    startDate = DateUtil.offsetDay(startDate, 1);
+                }
+                calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
+                liteflowResponse = flowExecutor.execute2Resp("genera_trix", calculatedParam);
+                dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+            }
+        } else {
+            //非补招
+            liteflowResponse = flowExecutor.execute2Resp("genera_trix", calculatedParam);
+            dealResponse(calculatedParam, liteflowResponse, methodDescribe);
+        }
+    }
+
+
+
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/GeneraTrixExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/GeneraTrixExecutor.java
new file mode 100644
index 000000000..8dd098bcc
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/GeneraTrixExecutor.java
@@ -0,0 +1,52 @@
+package com.njcn.prepare.executor;
+
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.service.mysql.dim.IRBusbarVoltageDService;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
+import com.yomahub.liteflow.annotation.LiteflowMethod;
+import com.yomahub.liteflow.core.NodeComponent;
+import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
+import com.yomahub.liteflow.enums.NodeTypeEnum;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/11/27 10:28
+ */
+@LiteflowComponent
+@RequiredArgsConstructor
+public class GeneraTrixExecutor extends BaseExecutor{
+
+    private final IRBusbarVoltageDService irBusbarVoltageDService;
+
+    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rBusbarVoltage", nodeType = NodeTypeEnum.COMMON)
+    public boolean rBusbarVoltageAccess(NodeComponent bindCmp) {
+        return isAccess(bindCmp);
+    }
+    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rBusbarVoltage", nodeType = NodeTypeEnum.COMMON)
+    public void rBusbarVoltageProcess(NodeComponent bindCmp) {
+        String tag = bindCmp.getTag();
+        CalculatedParam calculatedParam = bindCmp.getRequestData();
+        if (tag.equalsIgnoreCase("r_busbar_voltage_d")) {
+            //日表
+            irBusbarVoltageDService.busbarVoltageD(calculatedParam);
+        } else if (tag.equalsIgnoreCase("r_busbar_voltage_m")) {
+            //数据补招不执行非日表算法
+            if (!calculatedParam.isRepair()) {
+                //月表
+
+            }
+        }else if (tag.equalsIgnoreCase("r_busbar_voltage_y")) {
+            //数据补招不执行非日表算法
+            if (!calculatedParam.isRepair()) {
+                //年表
+
+            }
+        }
+    }
+
+
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
index 3a6970385..d145bd452 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
@@ -412,7 +412,7 @@ public class MeasurementExecutor extends BaseExecutor {
     public void rMpBenchmarkLevelProcess(NodeComponent bindCmp) {
         String tag = bindCmp.getTag();
         CalculatedParam calculatedParam = bindCmp.getRequestData();
-        if (Objects.equals(tag,"r_mp_benchmark_level_d")){
+            if (Objects.equals(tag,"r_mp_benchmark_level_d")){
             //日表
             irMpBenchmarkLevelDService.benchmarkLevelD(calculatedParam);
         } else if (Objects.equals(tag,"r_mp_benchmark_level_m")){
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RBusbarVoltageDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RBusbarVoltageDMapper.java
new file mode 100644
index 000000000..e54c5f399
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RBusbarVoltageDMapper.java
@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.mapper.mysql.dim;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
+
+/**
+ * <p>
+ * 母线不同电压等级指标数据-日表 Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-27
+ */
+public interface RBusbarVoltageDMapper extends MppBaseMapper<RBusbarVoltageD> {
+
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventDMapper.java
index 6309fb36a..0bba466f0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventDMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.dim;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventMMapper.java
index 77ba1aacf..509869d1c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventMMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventMMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.dim;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventYMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventYMapper.java
index aec29e0d7..84d4522cf 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventYMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventYMapper.java
@@ -1,8 +1,7 @@
 package com.njcn.prepare.harmonic.mapper.mysql.dim;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRBusbarVoltageDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRBusbarVoltageDService.java
new file mode 100644
index 000000000..05f97bd6b
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRBusbarVoltageDService.java
@@ -0,0 +1,22 @@
+package com.njcn.prepare.harmonic.service.mysql.dim;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
+
+/**
+ * <p>
+ * 母线不同电压等级指标数据-日表 服务类
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-27
+ */
+public interface IRBusbarVoltageDService extends IService<RBusbarVoltageD> {
+
+    /**
+     * 插入母线不同电压等级指标数据-日表
+     */
+    void busbarVoltageD(CalculatedParam calculatedParam);
+
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventDService.java
index e70568e35..c41e58bc7 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventDService.java
@@ -2,11 +2,8 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
-import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
-
-import java.util.List;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventMService.java
index a24fb8883..400c1e9b5 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventMService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventMService.java
@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventYService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventYService.java
index 34b7cbd9b..59caf136a 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventYService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventYService.java
@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
 
 /**
  * <p>
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RBusbarVoltageDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RBusbarVoltageDServiceImpl.java
new file mode 100644
index 000000000..f88255313
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RBusbarVoltageDServiceImpl.java
@@ -0,0 +1,38 @@
+package com.njcn.prepare.harmonic.service.mysql.dim.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
+import com.njcn.prepare.harmonic.mapper.mysql.dim.RBusbarVoltageDMapper;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
+import com.njcn.prepare.harmonic.service.mysql.dim.IRBusbarVoltageDService;
+import org.apache.commons.collections4.ListUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 母线不同电压等级指标数据-日表 服务实现类
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-11-27
+ */
+@Service
+public class RBusbarVoltageDServiceImpl extends MppServiceImpl<RBusbarVoltageDMapper, RBusbarVoltageD> implements IRBusbarVoltageDService {
+
+    @Override
+    public void busbarVoltageD(CalculatedParam calculatedParam) {
+        List<String> busbarList = calculatedParam.getIdList();
+        System.out.println("母线集合:" + busbarList);
+        System.out.println("个数:" + busbarList.size());
+        //以尺寸1000分片
+        List<List<String>> pendingIds =  ListUtils.partition(busbarList,1000);
+        LocalDateTime beginDay = LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
+        LocalDateTime endDay = LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
+
+    }
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventDServiceImpl.java
index e8978d557..283251160 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventDServiceImpl.java
@@ -15,7 +15,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimObjEventDMapper;
 import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailDMapper;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.param.EventParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
 import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventDService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventMServiceImpl.java
index f90f6689e..27cfa6173 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventMServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventMServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
@@ -17,7 +16,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
 import com.njcn.prepare.harmonic.pojo.param.EventParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
 import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventMService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventYServiceImpl.java
index 731598618..c1398ef51 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventYServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventYServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
@@ -17,8 +16,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
 import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
 import com.njcn.prepare.harmonic.pojo.param.EventParam;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
-import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
+import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
 import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventYService;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;