1.灿能云接口移植,实时数据接口代码调整

2023-12-05 15:43:01 +08:00
parent e6a57d1436
commit d26cb9e1ce
18 changed files with 268 additions and 116 deletions
--- a/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/dto/AppEventMsg.java
+++ b/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/dto/AppEventMsg.java
@@ -3,6 +3,7 @@ package com.njcn.cloud.pojo.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -39,6 +40,11 @@ public class AppEventMsg  {
    @TableField("EventDetail_Index")
    private String eventdetailIndex;

+    @ApiModelProperty("触发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("Time_Id")
+    private LocalDateTime timeID;
+
    @ApiModelProperty("读取状态(0：未读，1：已读，2：删除)")
    @TableField("state")
    private Integer state;
--- a/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/dto/AppInfoSet.java
+++ b/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/dto/AppInfoSet.java
@@ -22,7 +22,7 @@ import lombok.Setter;
@Setter
@TableName("app_info_set")
@ApiModel(value = "AppInfoSet对象", description = "推送消息设置")
-public class AppInfoSet extends BaseEntity {
+public class AppInfoSet {

    private static final long serialVersionUID = 1L;

--- a/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/vo/DevMsgDetailInfo.java
+++ b/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/vo/DevMsgDetailInfo.java
@@ -1,6 +1,7 @@
 package com.njcn.cloud.pojo.vo;

 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +10,6 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

@@ -20,64 +20,75 @@ import java.util.stream.Collectors;
 */
@Data
 public class DevMsgDetailInfo implements Serializable {
+    @ApiModelProperty("未读条数")
+    Integer unstate;
+    @ApiModelProperty("终端信息")
+    Page<DevMsgDetailInfo.Unstate> page;

-    @ApiModelProperty("终端消息id")
-    private String topId;
+    @Data
+    public static class Unstate implements Serializable {
+        @ApiModelProperty("终端消息列表Guid")
+        private String devmsgIndex;

-    @ApiModelProperty("终端Id")
-    private String devIndex;
+        @ApiModelProperty("终端消息id")
+        private String topId;

-    @ApiModelProperty("供电公司")
-    private String gdName;
+        @ApiModelProperty("终端Id")
+        private String devIndex;

-    @ApiModelProperty("变电站名称")
-    private String bdzName;
+        @ApiModelProperty("供电公司")
+        private String gdName;

-    @ApiModelProperty("终端名称")
-    private String devName;
+        @ApiModelProperty("变电站名称")
+        private String bdzName;

-    @ApiModelProperty("ip")
-    private String ip;
+        @ApiModelProperty("终端名称")
+        private String devName;

-    @ApiModelProperty("统计时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime timeID;
+        @ApiModelProperty("ip")
+        private String ip;

-    @ApiModelProperty("总告警次数")
-    private Integer allNum;
+        @ApiModelProperty("统计时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime timeID;

-    @ApiModelProperty("终端告警")
-    private Integer alarmNum;
+        @ApiModelProperty("总告警次数")
+        private Integer allNum;

-    @ApiModelProperty("通讯中断")
-    private Integer comOutNum;
+        @ApiModelProperty("终端告警")
+        private Integer alarmNum;

-    @ApiModelProperty("终端流量百分比")
-    private Float flowNum;
+        @ApiModelProperty("通讯中断")
+        private Integer comOutNum;

-    @ApiModelProperty("中断描述")
-    private List<String> comoutDesc;
+        @ApiModelProperty("终端流量百分比")
+        private Float flowNum;

-    @ApiModelProperty("告警描述")
-    private List<String> alarmDesc;
+        @ApiModelProperty("中断描述")
+        private List<String> comoutDesc;

-    @ApiModelProperty("读取状态")
-    private Integer state;
-    public void setComoutDesc(String comoutDesc) {
-        List<String> collect =new ArrayList<>();
-        if(StrUtil.isNotBlank(comoutDesc)){
-            String[] split = comoutDesc.split(",");
-            collect = Arrays.stream(split).sorted().collect(Collectors.toList());
+        @ApiModelProperty("告警描述")
+        private List<String> alarmDesc;
+
+        @ApiModelProperty("读取状态")
+        private Integer state;
+
+        public void setComoutDesc(String comoutDesc) {
+            List<String> collect = new ArrayList<>();
+            if (StrUtil.isNotBlank(comoutDesc)) {
+                String[] split = comoutDesc.split(",");
+                collect = Arrays.stream(split).sorted().collect(Collectors.toList());
+            }
+            this.comoutDesc = collect;
        }
-        this.comoutDesc = collect;
-    }

-    public void setAlarmDesc(String alarmDesc) {
-        List<String> collect =new ArrayList<>();
-        if(StrUtil.isNotBlank(alarmDesc)){
-            String[] split = alarmDesc.split(",");
-            collect = Arrays.stream(split).sorted().collect(Collectors.toList());
+        public void setAlarmDesc(String alarmDesc) {
+            List<String> collect = new ArrayList<>();
+            if (StrUtil.isNotBlank(alarmDesc)) {
+                String[] split = alarmDesc.split(",");
+                collect = Arrays.stream(split).sorted().collect(Collectors.toList());
+            }
+            this.alarmDesc = collect;
        }
-        this.alarmDesc = collect;
    }
 }
--- a/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/vo/EventMsgDetailVO.java
+++ b/app-cloud/app-cloud-api/src/main/java/com/njcn/cloud/pojo/vo/EventMsgDetailVO.java
@@ -1,5 +1,6 @@
 package com.njcn.cloud.pojo.vo;

+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,37 +17,44 @@ import java.util.Date;
 */
@Data
 public class EventMsgDetailVO implements Serializable {
+    @ApiModelProperty("未读条数")
+    private Integer udState;

-    @ApiModelProperty("监测点Id")
-    private String lineIndex;
+    @ApiModelProperty("消息返回体")
+    private Page<udState> page;

-    @ApiModelProperty("监测点名称")
-    private String lineName;
+    @Data
+    public static class udState implements Serializable {
+        @ApiModelProperty("监测点Id")
+        private String lineIndex;

-    @ApiModelProperty("暂降事件id")
-    private String eventDetailIndex;
+        @ApiModelProperty("监测点名称")
+        private String lineName;

-    @ApiModelProperty("触发时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime timeID;
+        @ApiModelProperty("暂降事件id")
+        private String eventDetailIndex;

-    @ApiModelProperty("持续时间")
-    private Double persistTime;
+        @ApiModelProperty("触发时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime timeID;

-    @ApiModelProperty("毫秒数")
-    private Double ms;
+        @ApiModelProperty("持续时间")
+        private Double persistTime;

-    @ApiModelProperty("特征幅值")
-    private Double eventValue;
+        @ApiModelProperty("毫秒数")
+        private Double ms;

-    @ApiModelProperty("终端信息")
-    private String lineInfo;
+        @ApiModelProperty("特征幅值")
+        private Double eventValue;

-    @ApiModelProperty("暂态消息")
-    private String eventMsgIndex;
+        @ApiModelProperty("监测点信息")
+        private String lineInfo;

-    @ApiModelProperty("读取状态")
-    private Integer state;
+        @ApiModelProperty("暂态消息Guid")
+        private String eventMsgIndex;

+        @ApiModelProperty("读取状态")
+        private Integer state;

+    }
 }