Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-09-27 08:52:07 +08:00
parent f2d9756e3f
commit 75fd1662d0
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,17 +9,16 @@ import com.njcn.web.pojo.param.BaseParam;
import java.util.List; import java.util.List;
/** /**
*
* Description: * Description:
* Date: 2023/9/12 16:10【需求编号】 * Date: 2023/9/12 16:10【需求编号】
* *
* @author clam * @author clam
* @version V1.0.0 * @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); Page<CsEquipmentProcessDTO> queryPage(BaseParam baseParam);
} }

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -352,6 +352,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException); BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
idlegalityDeviceException.setMsg("NDID重复"); idlegalityDeviceException.setMsg("NDID重复");
falseCollect.add(idlegalityDeviceException); falseCollect.add(idlegalityDeviceException);
continue;
} }
if(Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.GATEWAY_DEV.getName())){ if(Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.GATEWAY_DEV.getName())){
DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.GATEWAY_DEV.getCode()).getData(); DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.GATEWAY_DEV.getCode()).getData();
@@ -408,6 +409,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentProcess.setOperator(RequestUtil.getUserIndex()); csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
csEquipmentProcess.setStartTime(LocalDateTime.now()); csEquipmentProcess.setStartTime(LocalDateTime.now());
csEquipmentProcess.setProcess(1); csEquipmentProcess.setProcess(1);
csEquipmentProcess.setStatus(1);
collect1.add(csEquipmentProcess); collect1.add(csEquipmentProcess);
return csEquipmentDeliveryPO; return csEquipmentDeliveryPO;
}).collect (Collectors.toList ( )); }).collect (Collectors.toList ( ));

3
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java
View File

@@ -29,9 +29,6 @@ public class EventUserFeignClientFallbackFactory implements FallbackFactory<Even
} }
Enum<?> finalExceptionEnum = exceptionEnum; Enum<?> finalExceptionEnum = exceptionEnum;
return new EventUserFeignClient() { return new EventUserFeignClient() {
@PostMapping("/queryEventList")
@Override @Override
public HttpResult<List<EventDetailVO>> queryEventList(CsEventUserQueryParam csEventUserQueryParam) { public HttpResult<List<EventDetailVO>> queryEventList(CsEventUserQueryParam csEventUserQueryParam) {
log.error("{}异常，降级处理，异常为：{}","获取当天事件未读消息未读消息",cause.toString()); log.error("{}异常，降级处理，异常为：{}","获取当天事件未读消息未读消息",cause.toString());