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 172710e..a0e1321 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 @@ -240,8 +240,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl> makeUp(@RequestBody MakeUpParam param) { + public HttpResult makeUp(@RequestBody MakeUpParam param) { String methodDescribe = getMethodDescribe("makeUp"); offlineDataUploadService.startMakeUpData(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/RealDataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/RealDataController.java new file mode 100644 index 0000000..fc36619 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/RealDataController.java @@ -0,0 +1,29 @@ +package com.njcn.csharmonic.controller; + +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 类的介绍:治理实时数据 + * + * @author xy + * @version 1.0.0 + * @createTime 2024/9/30 + */ +@Slf4j +@RestController +@RequestMapping("/realData") +@Api(tags = "实时数据") +@AllArgsConstructor +public class RealDataController extends BaseController { + + + + + + +} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java index 2ab4f14..149a3b8 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java @@ -15,6 +15,7 @@ import com.njcn.access.utils.MqttUtil; import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.DeviceFtpFeignClient; +import com.njcn.csdevice.api.PortableOffLogFeignClient; import com.njcn.csharmonic.enums.CsHarmonicResponseEnum; import com.njcn.csharmonic.offline.constant.OfflineConstant; import com.njcn.csharmonic.offline.log.Log; @@ -72,6 +73,8 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { private final DeviceFtpFeignClient deviceFtpFeignClient; private final FileStorageUtil fileStorageUtil; private final GeneralInfo generalInfo; + private final PortableOffLogFeignClient portableOffLogFeignClient; + @Override public byte[] uploadAnalysis(List files,String type) throws Exception{ @@ -138,7 +141,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { try { //询问装置项目信息 askProjectInfo(lineId,null, Integer.parseInt(TypeEnum.TYPE_6.getCode()),null,"DevCmd"); - Thread.sleep(2000); + Thread.sleep(5000); String key = AppRedisKey.PROJECT_INFO + lineId; Object object = redisUtil.getObjectByKey(key); if (!Objects.isNull(object)) { @@ -270,7 +273,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { } askFileInfo(param.getNDid(),mid,item); try { - Thread.sleep(2000); + Thread.sleep(5000); FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class); String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData(); String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1]; @@ -281,18 +284,13 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { file.delete(); } //删除下载文件 - //fileStorageUtil.deleteFile(path); + fileStorageUtil.deleteFile(path); } catch (Exception e) { throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR); } }); - //推送消息,按照离线数据方式处理 - MakeUpDto.FileInfo dto = new MakeUpDto.FileInfo(); - dto.setProName(proName); - dto.setNDid(param.getNDid()); - dto.setLineId(param.getLineId()); - dto.setFileList(v); - publisher.send("/Web/makeUp/" + param.getLineId(), new Gson().toJson(dto), 1, false); + //下载完成,调用解析接口 + portableOffLogFeignClient.dataOnlineRecruitment(param.getNDid(),param.getLineId(),proName); }); } } @@ -331,8 +329,10 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService { LocalDate endDate = LocalDate.parse(endTime, formatter); LocalDate targetDate = LocalDate.parse(data, formatterNoDelimiter); if (!targetDate.isBefore(startDate) && !targetDate.isAfter(endDate)) { - log.info("日期在指定范围内"); + log.info("{},日期在指定范围内",data); result = true; + } else { + log.info("{},日期不在指定范围内",data); } return result; }