代码提交

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentProcessPOService.java

@@ -9,7 +9,6 @@ import com.njcn.web.pojo.param.BaseParam;
 import java.util.List;
 
 /**
- * 
  * Description:
  * Date: 2023/9/12  16:10【需求编号】
  *

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 ( ));

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());