From 75fd1662d090c70fd8a896310393517272b31204 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Wed, 27 Sep 2023 08:52:07 +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

---
 .../njcn/csdevice/service/CsEquipmentProcessPOService.java   | 5 ++---
 .../service/impl/CsEquipmentDeliveryServiceImpl.java         | 2 ++
 .../api/fallback/EventUserFeignClientFallbackFactory.java    | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java
index 9445381..d379d31 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java
@@ -9,17 +9,16 @@ import com.njcn.web.pojo.param.BaseParam;
 import java.util.List;
 
 /**
- * 
  * Description:
  * Date: 2023/9/12  16:10【需求编号】
  *
  * @author clam
  * @version V1.0.0
  */
-public interface CsEquipmentProcessPOService extends IService<CsEquipmentProcessPO>{
+public interface CsEquipmentProcessPOService extends IService<CsEquipmentProcessPO> {
 
 
-        List<CsEquipmentProcessDTO> queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO);
+    List<CsEquipmentProcessDTO> queryqueryList(CsEquipmentProcessDTO csEquipmentProcessDTO);
 
     Page<CsEquipmentProcessDTO> queryPage(BaseParam baseParam);
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 51796fe..d7aa249 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -352,6 +352,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
                     idlegalityDeviceException.setMsg("NDID重复");
                     falseCollect.add(idlegalityDeviceException);
+                    continue;
                 }
                 if(Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.GATEWAY_DEV.getName())){
                     DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.GATEWAY_DEV.getCode()).getData();
@@ -408,6 +409,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
                     csEquipmentProcess.setStartTime(LocalDateTime.now());
                     csEquipmentProcess.setProcess(1);
+                    csEquipmentProcess.setStatus(1);
                     collect1.add(csEquipmentProcess);
                     return csEquipmentDeliveryPO;
                 }).collect (Collectors.toList ( ));
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java
index 9cc80c5..c823604 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java
@@ -29,9 +29,6 @@ public class EventUserFeignClientFallbackFactory implements FallbackFactory<Even
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new EventUserFeignClient() {
-
-
-            @PostMapping("/queryEventList")
             @Override
             public HttpResult<List<EventDetailVO>> queryEventList(CsEventUserQueryParam csEventUserQueryParam) {
                 log.error("{}异常，降级处理，异常为：{}","获取当天事件未读消息未读消息",cause.toString());