From da754cc51bc8b80b6f48db70e33123483e6970d4 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 16 Oct 2023 10:05:15 +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

---
 .../controller/equipment/CsDevCapacityController.java       | 2 +-
 .../com/njcn/csharmonic/controller/EventUserController.java | 6 +++---
 .../csharmonic/service/impl/CsEventUserPOServiceImpl.java   | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDevCapacityController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDevCapacityController.java
index 5aeb228..dd21a56 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDevCapacityController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDevCapacityController.java
@@ -48,7 +48,7 @@ public class CsDevCapacityController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addList")
     @ApiOperation("批量新增")
-    @ApiImplicitParam(name = "id", value = "设备id", required = true)
+    @ApiImplicitParam(name = "list", value = "设备id", required = true)
     public HttpResult<String> addList(@RequestBody List<CsDevCapacityPO> list){
         String methodDescribe = getMethodDescribe("addList");
         csDevCapacityPOService.addList(list);
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java
index dda17b7..40fca9c 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java
@@ -39,7 +39,7 @@ public class EventUserController extends BaseController {
     private final CsEventUserPOService csEventUserPOService;
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryEvent")
-    @ApiOperation("当天暂降事件未读消息")
+    @ApiOperation("暂降事件未读消息")
     @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true)
     public HttpResult<Integer> queryEvent(@RequestBody CsEventUserQueryParam csEventUserQueryParam) {
         String methodDescribe = getMethodDescribe("queryEvent");
@@ -49,7 +49,7 @@ public class EventUserController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryEventList")
-    @ApiOperation("当天事件消息")
+    @ApiOperation("事件消息")
     @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true)
     public HttpResult<List<EventDetailVO>> queryEventList(@RequestBody CsEventUserQueryParam csEventUserQueryParam) {
         String methodDescribe = getMethodDescribe("queryEventList");
@@ -59,7 +59,7 @@ public class EventUserController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryEventpage")
-    @ApiOperation("当天事件消息")
+    @ApiOperation("事件消息")
     @ApiImplicitParam(name = "csEventUserQueryPage", value = "暂降事件查询参数", required = true)
     public HttpResult<Page<EventDetailVO>> queryEventpage(@RequestBody CsEventUserQueryPage csEventUserQueryPage) {
         String methodDescribe = getMethodDescribe("queryEventpage");
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 f630173..4ae115c 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
@@ -263,6 +263,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             temp.setEngineeringName(devDetail.getEngineeringName());
             EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
             temp.setShowName(ele.getShowName());
+            temp.setCode(ele.getDefaultValue());
             if(Objects.equals(csEventUserQueryPage.getType(),"0")){
 
                 List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
@@ -285,6 +286,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
                 List<EventDataSetDTO> evtParamVVaDepth = eventDataSetDTOS.stream().
                         filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), "Evt_Param_VVaDepth")).
                         collect(Collectors.toList());
+
                 if(CollectionUtil.isEmpty(evtParamVVaDepth)){
                     temp.setEvtParamVVaDepth("-");