pms台账bug提交,台账日志操作

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

@@ -0,0 +1,25 @@
+package com.njcn.device.pms.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/2/27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PmsTerminalLogParam extends BaseParam {
+
+    @ApiModelProperty(name = "type",value = "0.电站 1.装置 2.线路 3.台区 4.发电用户 5.用电用户 6.主网监测点 7.配网监测点")
+    private Integer type;
+
+    @ApiModelProperty(name = "createBy",value = "操作用户")
+    private String createBy;
+
+
+}

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

@@ -60,15 +60,6 @@ public class Monitor extends BaseEntity {
      */
     private String powerrId;
 
-    /**
-     * 母线名称
-     */
-    private String generatrixWireName;
-
-    /**
-     * 母线ID(外键)
-     */
-    private String generatrixId;
 
     /**
      * 监测线路名称

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

@@ -6,6 +6,7 @@ import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -30,6 +31,7 @@ public class TerminalLog extends BaseEntity implements Serializable,Cloneable {
     /**
      * 0.电站 1.装置 2.台区 3.线路 4.监测点
      */
+    @ApiModelProperty(name = "type",value = "0.电站 1.装置 2.线路 3.台区 4.发电用户 5.用电用户 6.主网监测点 7.配网监测点")
     private Integer type;
 
     /**
@@ -45,11 +47,13 @@ public class TerminalLog extends BaseEntity implements Serializable,Cloneable {
     /**
      * 操作描述
      */
+    @ApiModelProperty(name = "operatorDescribe",value = "操作描述")
     private String operatorDescribe;
 
     /**
      * 操作结果 0.失败 1.成功
      */
+    @ApiModelProperty(name = "results",value = "0.失败 1.成功")
     private Integer results;
 
     /**

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

@@ -0,0 +1,126 @@
+package com.njcn.device.pms.pojo.vo;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/2/27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PowerGenerationUserVO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户编号
+     */
+    private String id;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 组织机构ID(外键)
+     */
+    private String orgId;
+
+    /**
+     * 运维单位名称
+     */
+    private String operationName;
+
+    /**
+     * 运维单位ID(外键)
+     */
+    private String operationId;
+
+    /**
+     * 电源类别(字典)
+     */
+    private String powerCategory;
+
+    /**
+     * 电站类型(字典)
+     */
+    private String powerStationType;
+
+    /**
+     * 发电方式(字典)
+     */
+    private String powerGenerationMode;
+
+    /**
+     * 并网电压等级(字典)
+     */
+    private String voltageLevel;
+
+    /**
+     * 总装机容量
+     */
+    private Float sourceCapacity;
+
+    /**
+     * 并网日期
+     */
+    private LocalDate connectionDate;
+
+    /**
+     * 能源消纳方式(字典)
+     */
+    private String connectionMode;
+
+    /**
+     * 客户状态(字典)
+     */
+    private String gcStat;
+
+    /**
+     * 供电变电站(外键)
+     */
+    private String powerStationId;
+
+    /**
+     * 供电线路(外键)
+     */
+    private String lineId;
+
+    /**
+     * 供电台区(外键)
+     */
+    private String platformId;
+
+    /**
+     * 供电台区名称
+     */
+    private String platformName;
+
+    /**
+     * 用户标签
+     */
+    private String userTag;
+
+    /**
+     * 是否是上送国网监测点,0-否 1-是
+     */
+    private Integer isUpToGrid;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    private Integer status;
+
+}