指标字典调整

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/EleEpdPqdParam.java

@@ -112,7 +112,8 @@ public class EleEpdPqdParam {
     @Data
     @EqualsAndHashCode(callSuper = true)
     public static class EleEpdPqdQueryParam extends BaseParam {
-
+        @ApiModelProperty("dataType")
+        private String dataType;
     }
 
 }

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java

@@ -146,5 +146,14 @@ public class EleEpdPqd {
      */
     private String defaultValue;
 
+    /**
+     * 状态(0:删除 1:正常)
+     */
+    private Integer status;
+
+    /**
+     * 报表数据来源(mysql表名)
+     */
+    private String resourcesId;
 
 }

pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java

@@ -17,6 +17,9 @@ public class EleEpdPqdVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
+    private String id;
+
     @ApiModelProperty(value = "数据名称")
     private String name;
 
@@ -44,13 +47,55 @@ public class EleEpdPqdVO implements Serializable {
     @ApiModelProperty(value = "数据结束谐波次数")
     private Integer harmEnd;
 
+    @ApiModelProperty(value = "统计方式")
+    private String statMethod;
+
+    @ApiModelProperty(value = "系统类型")
+    private String systemType;
+
     @ApiModelProperty(value = "数据分类(influxDB表名)")
     private String classId;
 
     @ApiModelProperty(value = "数据模型")
     private String dataType;
 
+    @ApiModelProperty(value = "数据模型名称")
+    private String dataTypeName;
+
     @ApiModelProperty(value = "报表数据来源(mysql表名)")
     private String resourcesId;
 
+    @ApiModelProperty(value = "数据是否上送 0:不上送 1:上送")
+    private Integer tranFlag;
+
+    @ApiModelProperty(value = "上送规则 变化:change 周期:period")
+    private String tranRule;
+
+    @ApiModelProperty(value = "事件类别||参数类别||系统参数||定值数据类型")
+    private String eventType;
+
+    @ApiModelProperty(value = "是否存储 1:存储 0:不存储||是否加密 1:加密 0:不加密")
+    private Integer storeFlag;
+
+    @ApiModelProperty(value = "当前值||是否需遥控校验 1：需要 0：不需要")
+    private Integer curSts;
+
+    @ApiModelProperty(value = "是否可远程控制 1:是 0:否||是否可修改 1:是 0:否||是否支持自动控制 1:是 0:否")
+    private Integer ctlSts;
+
+    @ApiModelProperty(value = "设置最大值")
+    private Integer maxNum;
+
+    @ApiModelProperty(value = "设置最小值")
+    private Integer minNum;
+
+    @ApiModelProperty(value = "参数为enum可设置的所有值序列")
+    private String setValue;
+
+    @ApiModelProperty(value = "参数string可设置字符串的长度上限")
+    private Integer strlen;
+
+    @ApiModelProperty(value = "参数缺省值")
+    private String defaultValue;
+
 }