终端统计及appbug修改

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpMonitorEvaluateDPO.java

@@ -33,6 +33,9 @@ public class RMpMonitorEvaluateDPO {
     @MppMultiId(value = "measurement_point_id")
     private String measurementPointId;
 
+    @TableField(value = "device_id")
+    private String deviceId;
+
     /**
      * 总接入分钟数
      */
@@ -54,7 +57,6 @@ public class RMpMonitorEvaluateDPO {
     /**
      * 相电压有效值平均值指标数据个数
      */
-    @TableField(value = "phase_voltage_count")
     private Integer phaseVoltageCount;
 
     /**

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/DeviceParam.java

@@ -0,0 +1,31 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2023/5/4  15:18【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class DeviceParam {
+
+    @ApiModelProperty(name = "devId",value = "终端id")
+    private String devId;
+
+    private String updateTime;
+    @ApiModelProperty(name = "lineIds",value = "监测点索引集合")
+    private List<String> lineIds;
+
+    @ApiModelProperty(name = "dataDate",value = "时间")
+    @NotBlank(message = "报表时间不可为空")
+    private String dataDate;
+
+    private String deviceStatus;
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpDevSolveDetailPO.java

@@ -0,0 +1,86 @@
+package com.njcn.prepare.harmonic.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.util.Date;
+
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+/**
+ * 
+ * Description:
+ * Date: 2023/5/9  15:43【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "r_mp_dev_solve_detail")
+public class RMpDevSolveDetailPO {
+    /**
+     * 终端id
+     */
+    @MppMultiId(value = "device_id")
+    private String deviceId;
+
+    /**
+     * 生成数据的时间,每天统计一次
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 故障时间
+     */
+    @TableField(value = "break_down_date")
+    private Date breakDownDate;
+
+    /**
+     * 故障类型
+     */
+    @TableField(value = "break_down_type")
+    private String breakDownType;
+
+    /**
+     * 是否消缺(0：否 1：是)
+     */
+    @TableField(value = "is_solve")
+    private String isSolve;
+
+    /**
+     * 消缺时间
+     */
+    @TableField(value = "solve_date")
+    private Date solveDate;
+
+    /**
+     * 消缺措施
+     */
+    @TableField(value = "defect_treatment")
+    private String defectTreatment;
+
+    /**
+     * 缺陷严重度(轻缺陷、较重缺陷和严重缺陷 三类缺陷对应分值为0.02,0.12和0.42，消缺为对应缺陷分值的1/3)
+     */
+    @TableField(value = "defect_severity")
+    private String defectSeverity;
+
+    public static final String COL_DEVICE_ID = "device_id";
+
+    public static final String COL_DATA_DATE = "data_date";
+
+    public static final String COL_BREAK_DOWN_DATE = "break_down_date";
+
+    public static final String COL_BREAK_DOWN_TYPE = "break_down_type";
+
+    public static final String COL_IS_SOLVE = "is_solve";
+
+    public static final String COL_SOLVE_DATE = "solve_date";
+
+    public static final String COL_DEFECT_TREATMENT = "defect_treatment";
+
+    public static final String COL_DEFECT_SEVERITY = "defect_severity";
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RStatDevSignalDPO.java

@@ -0,0 +1,50 @@
+package com.njcn.prepare.harmonic.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.util.Date;
+
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+/**
+ * Description:
+ * Date: 2023/5/4  14:30【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@TableName(value = "r_stat_dev_signal_d")
+public class RStatDevSignalDPO {
+    /**
+     * 更新时间
+     */
+    @MppMultiId(value = "data_date")
+    private Date dataDate;
+
+    /**
+     * 终端Id
+     */
+    @MppMultiId(value = "dev_id")
+    private String devId;
+
+    /**
+     * 设备状态
+     */
+    @TableField(value = "device_status")
+    private String deviceStatus;
+
+    /**
+     * 运行状态
+     */
+    @TableField(value = "run_status")
+    private String runStatus;
+
+    @TableField(value = "update_time")
+    private String updateTime;
+
+
+}