更改redis token

zoniot-water/zoniot-water-api/src/main/java/com/zcxk/water/api/vo/AlarmDetailsOnlineVo.java

@@ -0,0 +1,30 @@
+package com.zcxk.water.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName AlarmDetailsVo
+ * @Description: 报警信息
+ * @Author lihui
+ * @Date 2021/5/6
+ * @Version V1.0
+ **/
+@Data
+public class AlarmDetailsOnlineVo implements Serializable {
+
+    @ApiModelProperty("设备名字")
+    private String sceneName;
+
+    @ApiModelProperty("报警次数")
+    private String alarmContent;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @ApiModelProperty("报警开始时间")
+    private Date alarmStartTime;
+
+}

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/dao/OnlineMonitorMapper.java

@@ -31,7 +31,7 @@ public interface OnlineMonitorMapper {
     * @param alarmDetailsDto:
     * @return java.util.List<AlarmDetailsVo>
     **/
-    List<AlarmDetailsVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto);
+    List<AlarmDetailsOnlineVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto);
 
     /**
     * 查询实时报警数量

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/mapper/OnlineMonitorMapper.xml

@@ -149,7 +149,7 @@
     </sql>
 
     <!--查询实时报警信息-->
-    <select id="selectAlarmDetails" resultType="com.zcxk.water.api.vo.AlarmDetailsVo">
+    <select id="selectAlarmDetails" resultType="com.zcxk.water.api.vo.AlarmDetailsOnlineVo">
         select
         t1.scene_name as "sceneName",
         t6.alarm_content as "alarmContent",

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/OnlineMonitorService.java

@@ -21,7 +21,7 @@ public interface OnlineMonitorService {
     * @param alarmDetailsDto:
     * @return java.util.List<AlarmDetailsVo>
     **/
-    List<AlarmDetailsVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto);
+    List<AlarmDetailsOnlineVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto);
 
     /**
     * 查询实时报警数量

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/impl/OnlineMonitorImpl.java

@@ -54,7 +54,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
     private MonitorDataReportServiceImpl monitorDataReportServiceImpl;
 
     @Override
-    public List<AlarmDetailsVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto) {
+    public List<AlarmDetailsOnlineVo> selectAlarmDetails(AlarmDetailsDto alarmDetailsDto) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         alarmDetailsDto.setTenantId(loginUser.getTenantId());
         alarmDetailsDto.setProgramItems(loginUser.getProgramItemList());