代码调整

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java

@@ -4,8 +4,10 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory;
 import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,4 +32,15 @@ public interface PmsGeneratrixClient {
      */
     @PostMapping("/getGeneratrixInfo")
     HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody PmsGeneratrixParam pmsGeneratrixParam);
+
+    /**
+     * 获取母线与电站关联信息
+     *
+     * @param param 条件参数
+     * @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>>
+     * @author yzh
+     * @date 2022/11/3
+     */
+    @PostMapping("/getGeneratrixAndPowerStationInfo")
+    HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(@RequestBody PmsGeneratrixParam param);
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.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.PmsGeneralDeviceInfoClient;
 import com.njcn.device.pms.api.PmsGeneratrixClient;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
@@ -38,6 +39,11 @@ public class PmsGeneratrixClientFallbackFactory implements FallbackFactory<PmsGe
                 log.error("{}异常，降级处理，异常为：{}", "获取母线信息", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+            @Override
+            public HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取母线与电站关联信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java

@@ -0,0 +1,58 @@
+package com.njcn.device.pms.pojo.dto;
+
+import com.njcn.device.pms.pojo.po.Generatrix;
+import com.njcn.device.pq.pojo.po.Voltage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.math3.analysis.function.Power;
+
+import java.io.Serializable;
+
+/**
+ * 母线与电站关联信息
+ *
+ * @author yzh
+ * @date 2022/11/3
+ */
+
+@Data
+public class GeneratrixAndPowerStationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 母线id
+     */
+    @ApiModelProperty(name = "generatrixId", value = "母线id")
+    private String generatrixId;
+
+    /**
+     * 母线名称
+     */
+    @ApiModelProperty(name = "generatrixName", value = "母线名称")
+    private String generatrixName;
+
+    /**
+     * 母线电压等级
+     */
+    @ApiModelProperty(name = "generatrixVoltageLevel", value = "母线电压等级")
+    private String generatrixVoltageLevel;
+
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(name = "powerId", value = "变电站id")
+    private String powerId;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerName", value = "变电站名称")
+    private String powerName;
+
+    /**
+     * 变电站电压等级
+     */
+    @ApiModelProperty(name = "powerVoltageLevel", value = "变电站电压等级")
+    private String powerVoltageLevel;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java

@@ -23,15 +23,32 @@ public class PmsGeneratrixParam implements Serializable {
      * 母线id集合
      */
     @ApiModelProperty(name = "generatrixIds", value = "母线id集合")
-    @NotNull(message = "母线id集合不可为空")
     private List<String> generatrixIds;
 
+    /**
+     * 变电站id
+     */
+    @ApiModelProperty(name = "powerStationIds", value = "变电站id")
+    private List<String> powerStationIds;
+
+    /**
+     * 变电站名称
+     */
+    @ApiModelProperty(name = "powerStationName", value = "变电站名称")
+    private String powerStationName;
+
     /**
      * 母线名称
      */
     @ApiModelProperty(name = "generatrixName", value = "母线名称")
     private String generatrixName;
 
+    /**
+     * 变电站电压等级
+     */
+    @ApiModelProperty(name = "powerStationVoltageLevel", value = "变电站电压等级")
+    private List<String> powerStationVoltageLevel;
+
     /**
      * 母线电压等级
      */

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java

@@ -9,11 +9,11 @@ import java.io.Serializable;
  * (RStatBusbarHarmonicY)实体类
  *
  * @author yzh
- * @since 2022-10-12 18:38:16
+ * @since 2022-11-03 14:16:47
  */
 @Data
-public class RStatBusbarHarmonicPO implements Serializable {
-    private static final long serialVersionUID = 398744755685851294L;
+public class RStatBusbarHarmonicYPO implements Serializable {
+    private static final long serialVersionUID = 1L;
     /**
      * 母线ID
      */
@@ -87,6 +87,5 @@ public class RStatBusbarHarmonicPO implements Serializable {
      */
     private Double flicker95;
 
-
 }
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 变电站母线电压指标年报返回前端实体类
@@ -15,8 +16,8 @@ import java.io.Serializable;
  */
 
 @Data
-@ApiModel(value = "变电站母线电压指标年报返回前端实体类")
-public class RStatBusbarHarmonicVO implements Serializable {
+@ApiModel("变电站母线电压指标年报返回前端实体类")
+public class RStatBusbarHarmonicYVO implements Serializable {
 
     private static final long serialVersionUID = 835979721790264805L;
     /**
@@ -28,8 +29,8 @@ public class RStatBusbarHarmonicVO implements Serializable {
     /**
      * 所属单位
      */
-    @ApiModelProperty(name = "company", value = "单位")
-    private String company;
+    @ApiModelProperty(name = "deptName", value = "单位")
+    private String deptName;
 
     /**
      * 变电站id
@@ -59,128 +60,108 @@ public class RStatBusbarHarmonicVO implements Serializable {
      * 母线id
      */
     @ApiModelProperty(name = "busbarId", value = "母线id")
-    @TableField(value = "busbar_id")
     private String busbarId;
 
-
     /**
      * 生成数据的时间,每年统计一次
      */
     @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
-    @TableField(value = "data_date")
-    private String dataDate;
+    private Date dataDate;
 
     /**
      * 电压有效最大值
      */
     @ApiModelProperty(name = "vEffectiveMax", value = "电压有效最大值")
-    @TableField(value = "v_effective_max")
     private Double vEffectiveMax;
 
     /**
      * 电压有效最小值
      */
     @ApiModelProperty(name = "vEffectiveMin", value = "电压有效最小值")
-    @TableField(value = "v_effective_min")
     private Double vEffectiveMin;
 
     /**
      * 电压有效平均值
      */
     @ApiModelProperty(name = "vEffectiveAvg", value = "电压有效平均值")
-    @TableField(value = "v_effective_avg")
     private Double vEffectiveAvg;
 
     /**
      * 电压有效值95概率大值
      */
     @ApiModelProperty(name = "vEffective95", value = "电压有效值95概率大值")
-    @TableField(value = "v_effective_95")
     private Double vEffective95;
 
     /**
      * 电压总谐波畸变率最大值
      */
     @ApiModelProperty(name = "vThdMax", value = "电压总谐波畸变率最大值")
-    @TableField(value = "v_thd_max")
     private Double vThdMax;
 
     /**
      * 电压总谐波畸变率最小值
      */
     @ApiModelProperty(name = "vThdMin", value = "电压总谐波畸变率最小值")
-    @TableField(value = "v_thd_min")
     private Double vThdMin;
 
     /**
      * 电压总谐波畸变率平均值
      */
     @ApiModelProperty(name = "vThdAvg", value = "电压总谐波畸变率平均值")
-    @TableField(value = "v_thd_avg")
     private Double vThdAvg;
 
     /**
      * 电压总谐波畸变率95概率大值
      */
     @ApiModelProperty(name = "vThd95", value = "电压总谐波畸变率95概率大值")
-    @TableField(value = "v_thd_95")
     private Double vThd95;
 
     /**
      * 三相电压不平衡最大值
      */
     @ApiModelProperty(name = "unbalanceMax", value = "三相电压不平衡最大值")
-    @TableField(value = "unbalance_max")
     private Double unbalanceMax;
 
     /**
      * 三相电压不平衡最小值
      */
     @ApiModelProperty(name = "unbalanceMin", value = "三相电压不平衡最小值")
-    @TableField(value = "unbalance_min")
     private Double unbalanceMin;
 
     /**
      * 三相电压不平衡平均值
      */
     @ApiModelProperty(name = "unbalanceAvg", value = "三相电压不平衡平均值")
-    @TableField(value = "unbalance_avg")
     private Double unbalanceAvg;
 
     /**
      * 三相电压不平衡95概率大值
      */
     @ApiModelProperty(name = "unbalance95", value = "三相电压不平衡95概率大值")
-    @TableField(value = "unbalance_95")
     private Double unbalance95;
 
     /**
      * 闪变最大值
      */
     @ApiModelProperty(name = "flickerMax", value = "闪变最大值")
-    @TableField(value = "flicker_max")
     private Double flickerMax;
 
     /**
      * 闪变最小值
      */
     @ApiModelProperty(name = "flickerMin", value = "闪变最小值")
-    @TableField(value = "flicker_min")
     private Double flickerMin;
 
     /**
      * 闪变平均值
      */
     @ApiModelProperty(name = "flickerAvg", value = "闪变平均值")
-    @TableField(value = "flicker_avg")
     private Double flickerAvg;
 
     /**
      * 闪变95概率大值
      */
     @ApiModelProperty(name = "flicker95", value = "闪变95概率大值")
-    @TableField(value = "flicker_95")
     private Double flicker95;
 
-
 }