冀北拓扑图代码提交

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

@@ -0,0 +1,33 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * <p>
+ * 冀北分布式概览
+ * </p>
+ *
+ * @author wr
+ * @since 2023-06-12
+ */
+@Data
+public class SubstationExpendParam extends BaseParam {
+
+    /**
+     * 获取部门id
+     */
+    @ApiModelProperty("部门id")
+    private String orgId;
+
+    @Data
+    public static class Relation{
+        @ApiModelProperty("起点变电站id")
+        private String startStationId;
+
+        @ApiModelProperty("终点变电站id")
+        private String endStationId;
+    }
+}

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

@@ -160,6 +160,9 @@ public class PowerDistributionarea extends BaseEntity {
      */
     private Integer status;
 
-
+    /**
+     * 数据状态：0-手动录入；1-gw台账录入
+     */
+    private Integer inputStatus;
 
 }

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

@@ -1,11 +1,13 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
-import com.njcn.device.pms.pojo.dto.PmsSimpleDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 /**
@@ -17,8 +19,6 @@ import lombok.*;
  * @since 2023-05-08
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 @TableName("pms_substation_expend")
 public class SubstationExpend implements Serializable  {
 
@@ -27,63 +27,53 @@ public class SubstationExpend implements Serializable  {
     /**
      * 主键
      */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 变电站名称
      */
+    @ApiModelProperty(name = "name",value = "变电站名称")
     private String name;
 
     /**
      * 变电站类型:Sys_dict_data表主键
      */
+    @ApiModelProperty(name = "type",value = "变电站类型")
     private String type;
 
-    private String typeName;
-
     /**
      * 电压等级
      */
+    @ApiModelProperty(name = "voltageLevel",value = "电压等级")
     private String voltageLevel;
 
     /**
      * 经度
      */
+    @ApiModelProperty(name = "lng",value = "经度")
     private BigDecimal lng;
 
     /**
      * 纬度
      */
+    @ApiModelProperty(name = "lat",value = "纬度")
     private BigDecimal lat;
 
     /**
      * 所属单位
      */
+    @ApiModelProperty(name = "deptId",value = "所属单位")
     private String deptId;
 
+    /**
+     * 所属单位
+     */
+    @TableField(value = "dept_Name", exist = false)
     private String deptName;
 
-    private String area;
-
     /**
      * 关联台账变电站：pq_substation表主键
      */
     private String substationId;
-
-    private String breakSite;
-
-    /**
-     * 连接回路：Sys_dict_data表主键（双回路、单回路）
-     */
-    private String connectType;
-
-    private List<PmsSimpleDTO> sites;
-
-    public SubstationExpend(String name, String type, BigDecimal lng, BigDecimal lat, String deptId) {
-        this.name = name;
-        this.type = type;
-        this.lng = lng;
-        this.lat = lat;
-        this.deptId = deptId;
-    }
 }

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

@@ -1,9 +1,12 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -18,30 +21,39 @@ import lombok.Setter;
  * @since 2023-05-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("pms_substation_relation")
-public class SubstationRelation extends BaseEntity {
+public class SubstationRelation  {
 
     private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @ApiModelProperty(name = "id", value = "主键")
+    private String id;
 
     /**
      * 起点变电站id：pms_substation_jb主键
      */
+    @ApiModelProperty(name = "startStationId", value = "起点变电站id")
     private String startStationId;
 
     /**
      * 终点变电站id：pms_substation_jb主键
      */
+    @ApiModelProperty(name = "endStationId", value = "终点变电站id")
     private String endStationId;
 
     /**
      * 连接回路：Sys_dict_data表主键（双回路、单回路）
      */
+    @ApiModelProperty(name = "connectType", value = "连接回路类型")
     private String connectType;
 
     /**
      * 折点经纬度:[[0,0],[x,y]]
      */
+    @ApiModelProperty(name = "breakSite", value = "折点经纬度")
     private String breakSite;
 
 

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

@@ -0,0 +1,85 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.njcn.device.pms.pojo.dto.PmsSimpleDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wr
+ * @since 2023-06-12
+ */
+@Data
+public class SubstationExpendVO implements Serializable  {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 变电站名称
+     */
+    private String name;
+
+    /**
+     * 变电站类型:Sys_dict_data表主键
+     */
+    private String type;
+
+    private String typeName;
+
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 经度
+     */
+    private BigDecimal lng;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal lat;
+
+    /**
+     * 所属单位
+     */
+    private String deptId;
+
+    private String deptName;
+
+    private String area;
+
+    /**
+     * 关联台账变电站：pq_substation表主键
+     */
+    private String substationId;
+
+    private String breakSite;
+
+    /**
+     * 连接回路：Sys_dict_data表主键（双回路、单回路）
+     */
+    private String connectType;
+
+    private List<PmsSimpleDTO> sites;
+
+//    public SubstationExpendParam(String name, String type, BigDecimal lng, BigDecimal lat, String deptId) {
+//        this.name = name;
+//        this.type = type;
+//        this.lng = lng;
+//        this.lat = lat;
+//        this.deptId = deptId;
+//    }
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.njcn.device.pms.pojo.dto.PmsSimpleDTO;
+import com.njcn.device.pms.pojo.po.SubstationExpend;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wr
+ * @since 2023-06-12
+ */
+@Data
+public class SubstationRelationVO implements Serializable  {
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 起点变电站id：pms_substation_jb主键
+     */
+    private SubstationExpend startStation;
+
+    /**
+     * 终点变电站id：pms_substation_jb主键
+     */
+    private SubstationExpend endStation;
+
+    /**
+     * 连接回路：Sys_dict_data表主键（双回路、单回路）
+     */
+    private String connectType;
+
+    /**
+     * 折点经纬度:[[0,0],[x,y]]
+     */
+    private String breakSite;
+
+
+}