1.技术监督代码调整

2.国网对象类型统计
3.国网新能源场站代码提交

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

@@ -59,6 +59,9 @@ public enum PmsDeviceResponseEnum {
 
     NO_ID_STATION("A00357","变电站编号为空"),
     NO_ID_ORG("A00357","部门编号为空"),
+    NE_ENERGY_ID("A003560","场站编号重复"),
+    MONITOR_NE_ENERGY_FIND("A00361","主网监测点存在绑定该场站信息关系,请先解除绑定关系"),
+
     ;
 
 

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

@@ -0,0 +1,80 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/2/20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NewEnergyQueryParam extends BaseParam {
+
+    @ApiModelProperty(value = "单位id")
+    private String orgId;
+
+    @Data
+    public static class Info {
+
+        private static final long serialVersionUID = 1L;
+        /**
+         * id
+         */
+        @TableId("Id")
+        private String id;
+
+        /**
+         * 名称
+         */
+        @NotBlank(message = "对象类型不能为空")
+        @TableField("Obj_Name")
+        private String objName;
+        /**
+         * 组织机构名称
+         */
+        @TableField("Org_Name")
+        private String orgName;
+
+        /**
+         * 组织机构ID(外键)
+         */
+        @TableField("Org_Id")
+        private String orgId;
+        /**
+         * 电压等级
+         */
+        @TableField("voltage_Level")
+        private String voltageLevel;
+
+        /**
+         * 电压等级
+         */
+        @TableField("Powerr_Name")
+        private String powerrName;
+
+        /**
+         * 检测点对象类型(字典)
+         */
+        @TableField("Obj_Type")
+        private String objType;
+
+        /**
+         * 电压等级
+         */
+        @TableField("station_status")
+        private String stationStatus;
+
+    }
+
+}

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

@@ -0,0 +1,82 @@
+package com.njcn.device.pms.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wr
+ * @since 2024-03-26
+ */
+@Getter
+@Setter
+@TableName("pms_new_energy")
+public class PmsNewEnergy extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("Id")
+    private String id;
+
+    /**
+     * 名称
+     */
+    @TableField("Obj_Name")
+    private String objName;
+    /**
+     * 组织机构名称
+     */
+    @TableField("Org_Name")
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    @TableField("Org_Id")
+    private String orgId;
+    /**
+     * 电压等级
+     */
+    @TableField("voltage_Level")
+    private String voltageLevel;
+
+    /**
+     * 电压等级
+     */
+    @TableField("Powerr_Name")
+    private String powerrName;
+
+    /**
+     * 检测点对象类型(字典)
+     */
+    @TableField("Obj_Type")
+    private String objType;
+
+    /**
+     * 电压等级
+     */
+    @TableField("station_status")
+    private String stationStatus;
+
+    /**
+     * 状态：0-删除 1-正常
+     */
+    @TableField("State")
+    private Integer state;
+
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.njcn.device.pms.pojo.vo.gw;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wr
+ * @description
+ * @date 2024/3/22 11:05
+ */
+@Data
+public class MonitorEnergy {
+
+    @ApiModelProperty(value = "部门名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "监测点信息")
+    List<Details> info;
+
+
+    @Data
+    public static class Details {
+
+        @ApiModelProperty(value = "对象类型")
+        private String objType;
+
+        @ApiModelProperty(value = "接入线路电压等级为110kV及以上变电站数量(座)")
+        private String num;
+
+        @ApiModelProperty(value = "接入线路电压等级为110kV及以上变电站数量(座)")
+        List<VoltageInfo> voltageInfo;
+    }
+
+    @Data
+    public static class VoltageInfo {
+
+        @ApiModelProperty(value = "已监测数量")
+        private Integer monitorNum;
+
+        @ApiModelProperty(value = "新能源场站总数")
+        private Integer totalNum;
+
+        @ApiModelProperty(value = "监测率")
+        private Float monitorRate;
+
+        @ApiModelProperty(value = "装置数量（台）")
+        private Integer deviceNum;
+
+        @ApiModelProperty(value = "覆盖变电站数量(座)")
+        private Integer substationsNum;
+
+        @ApiModelProperty(value = "电站覆盖率(%)")
+        private Float substationsRate;
+
+    }
+
+}