From d3ddf00cad14d815a60308a7e8147300e4804945 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Fri, 22 Sep 2023 13:29:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/csdevice/pojo/vo/DevCountVO.java     |  2 +-
 .../service/impl/CsDeviceUserPOServiceImpl.java        |  6 +++---
 .../com/njcn/csharmonic/pojo/vo/EventDetailVO.java     | 10 ++++++++++
 .../csharmonic/mapper/mapping/CsEventUserPOMapper.xml  |  2 +-
 .../service/impl/CsEventUserPOServiceImpl.java         |  4 ++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
index 91e3741..c22b074 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DevCountVO.java
@@ -60,7 +60,7 @@ public class  DevCountVO {
     private Integer currentProjectCount;
 
     @ApiModelProperty(value = "项目数")
-    private Long feedBackCount;
+    private Integer feedBackCount;
 
 
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
index 7510bcd..765e530 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java
@@ -185,11 +185,11 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
         List<EventDetailVO> run = data.stream().filter(temp -> temp.getType() == 2).collect(Collectors.toList());
         CsFeedbackQueryParm csFeedbackQueryParm = new CsFeedbackQueryParm();
         csFeedbackQueryParm.setPageNum(1);
-        csFeedbackQueryParm.setPageSize(10);
+        csFeedbackQueryParm.setPageSize(100000);
         csFeedbackQueryParm.setStatus("1");
         Page<CsFeedbackVO> data1 = feedBackFeignClient.queryFeedBackPage(csFeedbackQueryParm).getData();
-        long total = data1.getTotal();
-        devCountVO.setFeedBackCount(total);
+        List<CsFeedbackVO> collect = data1.getRecords().stream().filter(temp -> !Objects.equals(temp.getUserId(), RequestUtil.getUserIndex())).collect(Collectors.toList());
+        devCountVO.setFeedBackCount(collect.size());
         //todo 后续添加警告数,事件数
         devCountVO.setEventCount(event.size());
         devCountVO.setAlarmCount(harmonic.size());
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
index ae1f6da..379da33 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
@@ -79,6 +79,16 @@ public class EventDetailVO {
 
     private String userId;
 
+    /**
+     * 瞬时波形图，存在多张的情况
+     */
+    private String instantPics;
+
+
+    /**
+     * RMS波形图，存在多张的情况
+     */
+    private String rmsPics;
 
 
     /**
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index adaab2f..e6e23e4 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -30,7 +30,7 @@
 
   <select id="queryUserEventList" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
     select a.event_id id,a.user_id userId,a.status status,b.device_id deviceId,b.line_id lineId,
-    b.start_time startTime,b.tag tag ,b.wave_path  wavePath, b.type type
+    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type
     from cs_event_user a inner join cs_event b on a.event_id=b.id where 1=1
 
     <if test="csEventUserQueryParam!=null and csEventUserQueryParam.endTime  != null and csEventUserQueryParam.endTime !=''">
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 4ebb360..9bdd396 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -3,6 +3,7 @@ package com.njcn.csharmonic.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.constant.LogInfo;
 import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO;
@@ -67,6 +68,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
     public List<EventDetailVO> queryUserEventList(CsEventUserQueryParam csEventUserQueryParam) {
         csEventUserQueryParam.setUserId(RequestUtil.getUserIndex());
         String role = RequestUtil.getUserRole();
+        if(Objects.equals(role, LogInfo.UNKNOWN_ROLE)){
+            return new ArrayList<>();
+        }
         List<String> strings = JSONArray.parseArray(role, String.class);
         if(CollectionUtils.isEmpty(strings)){
             return new ArrayList<>();