From 3a19cfd80c214dc99097026b986d00b53fae52d5 Mon Sep 17 00:00:00 2001 From: yang_shj Date: Wed, 22 Mar 2023 16:48:33 +0800 Subject: [PATCH] =?UTF-8?q?#SDK=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service-api/assets-api/pom.xml | 4 ++-- hzims-service-api/equipment-api/pom.xml | 8 ++++++-- .../operational/alert/entity/AlarmHandleDetailEntity.java | 2 +- .../hnac/hzims/operational/alert/vo/AlarmHandleVo.java | 2 +- .../monitor/controller/EquipmentLedgerController.java | 3 --- .../com/hnac/hzims/monitor/server/RealTimeDataServer.java | 3 --- .../monitor/server/impl/HistoricalDataServerImpl.java | 5 +++-- .../hzims/monitor/server/impl/RealTimeDataServerImpl.java | 2 -- .../alert/service/impl/AbnormalAlarmServiceImpl.java | 3 ++- .../alert/service/impl/AlarmHandleServiceImpl.java | 14 ++++++++++++-- .../service/impl/HistoryAbnormalAlarmServiceImpl.java | 15 ++++----------- .../config/service/impl/StAlamRecordServiceImpl.java | 4 ++-- .../main/service/impl/HomePageServiceImpl.java | 3 ++- .../main/service/impl/PlatformServiceImpl.java | 8 +++++--- .../main/service/impl/RunMonthReportServiceImpl.java | 9 +++++---- .../main/service/impl/UnitRunningTimeServiceImpl.java | 7 ++++--- .../operational/main/service/impl/WaterServiceImpl.java | 8 +++----- 17 files changed, 52 insertions(+), 48 deletions(-) diff --git a/hzims-service-api/assets-api/pom.xml b/hzims-service-api/assets-api/pom.xml index 27a4487..95df005 100644 --- a/hzims-service-api/assets-api/pom.xml +++ b/hzims-service-api/assets-api/pom.xml @@ -16,10 +16,10 @@ com.hnac.hzims ticket-api - + com.alibaba easyexcel diff --git a/hzims-service-api/equipment-api/pom.xml b/hzims-service-api/equipment-api/pom.xml index 4147b5a..ecdd9c5 100644 --- a/hzims-service-api/equipment-api/pom.xml +++ b/hzims-service-api/equipment-api/pom.xml @@ -17,13 +17,17 @@ - + org.springblade blade-system-api + + com.hnac.hzinfo.data + hzinfo-data-sdk + diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/entity/AlarmHandleDetailEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/entity/AlarmHandleDetailEntity.java index c435e08..0307998 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/entity/AlarmHandleDetailEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/entity/AlarmHandleDetailEntity.java @@ -34,5 +34,5 @@ public class AlarmHandleDetailEntity extends BaseEntity { private String falseAlarmDesc; @ApiModelProperty("附件路径") - private Long filePath; + private String filePath; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java index 68b7539..59c148f 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java @@ -32,7 +32,7 @@ public class AlarmHandleVo extends AlarmHandleEntity { private String filePath; @ApiModelProperty("通知处理人") - private String handleUser; + private Long handleUser; @ApiModelProperty("现象Id") @JsonSerialize(nullsUsing = NullSerializer.class) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/controller/EquipmentLedgerController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/controller/EquipmentLedgerController.java index 1c44778..b9394b8 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/controller/EquipmentLedgerController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/controller/EquipmentLedgerController.java @@ -2,8 +2,6 @@ package com.hnac.hzims.monitor.controller; import com.hnac.hzims.monitor.server.HistoricalDataServer; import com.hnac.hzims.monitor.server.RealTimeDataServer; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstance; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstanceAttr; import com.hnac.hzinfo.dataconfig.entity.*; import com.hnac.hzinfo.datasearch.analyse.domain.AnalyzeDataCondition; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; @@ -11,7 +9,6 @@ import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import oracle.jdbc.proxy.annotation.Post; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/RealTimeDataServer.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/RealTimeDataServer.java index 5e369c1..7134214 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/RealTimeDataServer.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/RealTimeDataServer.java @@ -1,9 +1,6 @@ package com.hnac.hzims.monitor.server; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstance; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstanceAttr; import com.hnac.hzinfo.dataconfig.entity.*; - import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import org.springblade.core.tool.api.R; diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/HistoricalDataServerImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/HistoricalDataServerImpl.java index 079d0ff..61a6889 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/HistoricalDataServerImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/HistoricalDataServerImpl.java @@ -6,6 +6,7 @@ import com.hnac.hzims.monitor.server.HistoricalDataServer; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.domain.AnalyzeDataCondition; import com.hnac.hzinfo.datasearch.analyse.domain.AnalyzeDataList; +import com.hnac.hzinfo.sdk.core.response.HzPage; import org.springblade.core.mp.support.BladePage; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; @@ -20,12 +21,12 @@ public class HistoricalDataServerImpl implements HistoricalDataServer { @Override - public R> gethisData(AnalyzeDataCondition analyzeDataCondition, IPage page) { + public R> gethisData(AnalyzeDataCondition analyzeDataCondition, IPage page) { analyzeDataCondition.setPage(Integer.valueOf(page.getCurrent()+"")); analyzeDataCondition.setLimit(Integer.valueOf(page.getSize()+"")); analyzeDataCondition.setNeedPage(true); analyzeDataCondition.setFull(0); - R> analyzeDataByAnalyzeCode = analyseDataSearchClient.getAnalyzeDataByAnalyzeCode(analyzeDataCondition); + R> analyzeDataByAnalyzeCode = analyseDataSearchClient.getAnalyzeDataByAnalyzeCode(analyzeDataCondition); return analyzeDataByAnalyzeCode; } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/RealTimeDataServerImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/RealTimeDataServerImpl.java index 32a17d3..0e80d73 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/RealTimeDataServerImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/RealTimeDataServerImpl.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.mapper.EmInfoMapper; import com.hnac.hzims.monitor.server.RealTimeDataServer; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstance; -import com.hnac.hzinfo.dataconfig.deviceInstace.DeviceInstanceAttr; import com.hnac.hzinfo.dataconfig.entity.*; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java index f32c89f..108bd1f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java @@ -9,11 +9,12 @@ import com.hnac.hzims.operational.alert.service.HistoryAbnormalAlarmService; import com.hnac.hzims.operational.maintenance.constants.HomePageConstant; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.service.IStationService; +import com.hnac.hzinfo.datasearch.soe.ISoeClient; import com.hnac.hzinfo.datasearch.soe.domian.SoeData; import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryConditionByStation; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; -import com.hnac.hzinfo.sdk.soe.ISoeClient; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java index 886ec80..c85924a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java @@ -59,11 +59,21 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl> result = alarmClient.getByStationsAndTime(condition); + Result> result = alarmClient.getByStationsAndTime(condition); // 步骤3. TODO 过滤已处理告警 @@ -272,7 +265,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl> result = alarmClient.getByStationsAndTime(condition); + Result> result = alarmClient.getByStationsAndTime(condition); IPage page = Condition.getPage(query); if(result.isSuccess() && ObjectUtil.isNotEmpty(result)){ // 步骤3.TODO 过滤完成告警处理数据 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 0e7cc0f..9afdbc0 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -27,12 +27,12 @@ import com.hnac.hzims.operational.station.service.IStationService; import com.hnac.hzims.operational.util.ExcelUtil; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; +import com.hnac.hzinfo.datasearch.soe.ISoeClient; import com.hnac.hzinfo.datasearch.soe.domian.SoeData; import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryConditionByStation; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; -import com.hnac.hzinfo.sdk.soe.ISoeClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -466,7 +466,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl collect = new ArrayList<>(); - Result> byStationsAndTime = soeClient.getByStationsAndTime(soeQueryConditionByStation); + Result> byStationsAndTime = soeClient.getByStationsAndTime(soeQueryConditionByStation); if (!byStationsAndTime.isSuccess() || ObjectUtil.isEmpty(byStationsAndTime.getData()) || CollectionUtil.isEmpty(byStationsAndTime.getData().getRecords())) { return R.data(vo); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomePageServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomePageServiceImpl.java index 7f38d0f..4604bb8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomePageServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomePageServiceImpl.java @@ -29,6 +29,7 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; import com.hnac.hzinfo.datasearch.soe.ISoeClient; import com.hnac.hzinfo.datasearch.soe.domian.SoeData; +import com.hnac.hzinfo.sdk.core.response.Result; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -371,7 +372,7 @@ public class HomePageServiceImpl implements IHomePageService { float currentDayPowerGeneration = getPowerGeneration(effEmInfoList, getCurrentTime() + " 00:00:00", getAddDayTime(1) + " 00:00:00",EquipmentConstants.CycleTypeEnum.DAY_CYCLE.getType()); powerStationTotalVo.setCurrentDayPowerGeneration(currentDayPowerGeneration); // 告警列表 - R> S = soeClient.getByLastLimitTime(null, station.getCode(), 1); + Result> S = soeClient.getByLastLimitTime(null, station.getCode(), 1); if(!S.isSuccess() || CollectionUtil.isEmpty(S.getData())){ return powerStationTotalVo; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PlatformServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PlatformServiceImpl.java index e694103..51f7169 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PlatformServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PlatformServiceImpl.java @@ -44,6 +44,8 @@ import com.hnac.hzinfo.inspect.report.feign.IInspectReportClient; import com.hnac.hzinfo.inspect.report.vo.AlarmRoutReportVO; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; @@ -197,7 +199,7 @@ public class PlatformServiceImpl implements IPlatformService { soe.setBeginTime(LocalDateTime.parse(DateUtil.format(new Date(), "yyyy-MM-dd 00:00:00"), df)); soe.setEndTime(LocalDateTime.now()); List collect = new ArrayList<>(); - R> soeDataListPage = soeClient.getByStationsAndTime(soe); + Result> soeDataListPage = soeClient.getByStationsAndTime(soe); if (soeDataListPage.isSuccess() && ObjectUtil.isNotEmpty(soeDataListPage.getData())) { List records = soeDataListPage.getData().getRecords(); collect = records.stream().map(iter -> { @@ -223,7 +225,7 @@ public class PlatformServiceImpl implements IPlatformService { public R> doCloudAlarmRanking(Integer serveType) { Map stationIdKey = stationService.getKyeStationNameValueStationId(true); List stationIdByServeType = stationService.getStationIdByServeType(null, serveType); - R> soeCountByStation = soeClient.getSoeCountByStation(StringUtil.join(stationIdByServeType, ","), DateUtil.parse(DateUtil.format(new Date(), "yyyy-MM-01 00:00:00"), DateUtil.PATTERN_DATETIME), new Date()); + Result> soeCountByStation = soeClient.getSoeCountByStation(StringUtil.join(stationIdByServeType, ","), DateUtil.parse(DateUtil.format(new Date(), "yyyy-MM-01 00:00:00"), DateUtil.PATTERN_DATETIME), new Date()); if (soeCountByStation.isSuccess() && CollectionUtil.isNotEmpty(soeCountByStation.getData())) { List data = soeCountByStation.getData(); List collect = data.stream().sorted(Comparator.comparing(SoeCountVO::getCount).reversed()).limit(5).collect(Collectors.toList()); @@ -741,7 +743,7 @@ public class PlatformServiceImpl implements IPlatformService { originalDataQuery.setEndTime(new Date()); originalDataQuery.setLimit(100000000); originalDataQuery.setPage(1); - R> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + Result> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); if (originalDataByRealIds.isSuccess() && ObjectUtil.isNotEmpty(originalDataByRealIds.getData())) { List records = originalDataByRealIds.getData().getRecords(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java index 4eac172..ecdc127 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java @@ -32,11 +32,12 @@ import com.hnac.hzinfo.datasearch.soe.domian.SoeData; import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryCondition; import com.hnac.hzinfo.datasearch.soe.po.SoeLastValueMonthByRealIdsPO; import com.hnac.hzinfo.datasearch.soe.vo.SoeLastValueMonthByRealIdsVO; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.support.BladePage; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.system.cache.DictCache; @@ -354,7 +355,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl> byTypeAndTimeRange = soeClient.getByTypeAndTimeRange(soeQueryCondition); + Result> byTypeAndTimeRange = soeClient.getByTypeAndTimeRange(soeQueryCondition); List soeDataList = new ArrayList<>(); List collect = new ArrayList<>(); if (byTypeAndTimeRange.isSuccess()) { @@ -484,13 +485,13 @@ public class RunMonthReportServiceImpl extends ServiceImpl> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + Result> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); HistorPointPO historPointPO = new HistorPointPO(); historPointPO.setRealId(realId); historPointPO.setQueryTime(DateUtil.parse(dateMap.get("startTime"), DateUtil.PATTERN_DATETIME)); boolean bool = false; PointData pointData = null; - R lastRowDataByTime = historyDataSearchClient.getLastRowDataByTime(historPointPO); + Result lastRowDataByTime = historyDataSearchClient.getLastRowDataByTime(historPointPO); if (lastRowDataByTime.isSuccess() && ObjectUtil.isNotEmpty(lastRowDataByTime.getData())) { pointData = new PointData(); pointData = lastRowDataByTime.getData(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java index 82c5ec0..2a755e2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java @@ -14,9 +14,10 @@ import com.hnac.hzinfo.datasearch.history.IHistoryDataSearchClient; import com.hnac.hzinfo.datasearch.history.OriginalDataQuery; import com.hnac.hzinfo.datasearch.history.po.HistorPointPO; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; import lombok.RequiredArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.BladePage; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springframework.beans.factory.annotation.Value; @@ -153,7 +154,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + Result> originalDataByRealIds = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); HistorPointPO historPointPO = new HistorPointPO(); historPointPO.setRealId(realId); //historPointPO.setQueryTime(DateUtil.parse(dateMap.get("startTime"), DateUtil.PATTERN_DATETIME)); @@ -163,7 +164,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl lastRowDataByTime = historyDataSearchClient.getLastRowDataByTime(historPointPO); + Result lastRowDataByTime = historyDataSearchClient.getLastRowDataByTime(historPointPO); if (lastRowDataByTime.isSuccess() && ObjectUtil.isNotEmpty(lastRowDataByTime.getData())) { pointData = lastRowDataByTime.getData(); bool = true; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java index c00f40a..0f3891b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java @@ -28,9 +28,10 @@ import com.hnac.hzinfo.datasearch.history.IHistoryDataSearchClient; import com.hnac.hzinfo.datasearch.history.OriginalDataQuery; import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import com.hnac.hzinfo.sdk.core.response.HzPage; +import com.hnac.hzinfo.sdk.core.response.Result; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.MapUtils; -import org.springblade.core.mp.support.BladePage; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; @@ -38,7 +39,6 @@ import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -51,8 +51,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; /** @@ -455,7 +453,7 @@ public class WaterServiceImpl implements IWaterService { originalDataQuery.setLimit(100000); originalDataQuery.setPage(1); // 查询时间范围开关机监测点历史数据 - R> R = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); + Result> R = historyDataSearchClient.getOriginalDataByRealIds(originalDataQuery); if(!R.isSuccess() || ObjectUtil.isEmpty(R.getData())){ return waterRunVo; }