zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/ComprehensiveStatisticsController.java
@@ -9,6 +9,7 @@ import com.zhitan.keyequipment.service.IDailyKeyEquipmentService; import com.zhitan.model.domain.EnergyIndex; import com.zhitan.model.service.IModelNodeService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; zhitan-admin/src/main/java/com/zhitan/web/controller/consumptionanalysis/ConsumptionAnalysisController.java
@@ -10,6 +10,7 @@ import com.zhitan.consumptionanalysis.domain.vo.RankingDataVO; import com.zhitan.consumptionanalysis.domain.vo.RankingEnergyData; import com.zhitan.consumptionanalysis.service.IConsumptionAnalysisService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -35,6 +36,7 @@ * @Author: Zhujw * @Date: 2023/3/1 */ @Api(tags = "综合能耗分析") @RestController @RequestMapping("/consumptionanalysis") public class ConsumptionAnalysisController extends BaseController { zhitan-admin/src/main/java/com/zhitan/web/controller/energyMonitor/ElectricThreePhaseController.java
@@ -56,6 +56,7 @@ if (ObjectUtils.isEmpty(meterId)){ return AjaxResult.error("电表id不能为空"); } List<EnergyIndex> energyIndexList = energyIndexService.listDeviceIndex(nodeId, meterId); return AjaxResult.success(electricThreePhaseService.list(timeType, timeCode, energyIndexList, requestType, meterId)); zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
@@ -26,9 +26,8 @@ * @Version: 1.0 * @Since: JDK1.8 */ @Slf4j @Api("采集计量表数据管理") @Slf4j @RestController @RequestMapping("/meters") public class MeterController extends BaseController { zhitan-admin/src/main/java/com/zhitan/web/controller/statisticalAnalysis/StatisticalAnalysisController.java
@@ -9,6 +9,7 @@ import com.zhitan.statisticalAnalysis.domain.vo.DataAnalysisYoYExcel; import com.zhitan.statisticalAnalysis.domain.vo.DataAnalysisYoYVO; import com.zhitan.statisticalAnalysis.service.IStatisticalAnalysisService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -26,6 +27,7 @@ /** * 统计分析 控制层 */ @Api(tags = "统计分析") @RestController @RequestMapping("/statisticalAnalysis") public class StatisticalAnalysisController extends BaseController { zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
@@ -891,15 +891,15 @@ /** * 电流 */ public static final String TAG_CODE_CURRENT = "Current_"; public static final String TAG_CODE_CURRENT = "Current"; /** * 电压 */ public static final String TAG_CODE_VOLTAGE = "Voltage_"; public static final String TAG_CODE_VOLTAGE = "Voltage"; /** * 功率因数 */ public static final String TAG_CODE_FACTOR = "PowerFactor_"; public static final String TAG_CODE_FACTOR = "PowerFactor"; /** * 功率因数 */ zhitan-system/src/main/java/com/zhitan/energyMonitor/service/impl/ElectricThreePhaseServiceImpl.java
@@ -54,9 +54,7 @@ @Override public ElectricThreePhaseVO list(String timeType, String timeCode, List<EnergyIndex> energyIndexList, String requestType, String meterId) { ElectricThreePhaseVO vo = new ElectricThreePhaseVO(); if (ObjectUtil.isEmpty(energyIndexList)) { return vo; } // 获取电压不平衡数据 if (CommonConst.STR_NUMBER_0.equals(requestType)) { energyIndexList = energyIndexList.stream() @@ -70,9 +68,13 @@ || StringUtil.ifEmptyOrNullReturnValue(x.getCode()).trim().endsWith(CommonConst.TAG_CODE_CURRENT_C)) .collect(Collectors.toList()); } if (ObjectUtil.isEmpty(energyIndexList)) { return vo; } List<String> tagCodeList = energyIndexList.stream().map(EnergyIndex::getCode).collect(Collectors.toList()); if(ObjectUtil.isEmpty(tagCodeList)){ tagCodeList.add(CommonConst.STR_NUMBER_MINUS_ONE); String tagCodes = String.join(StrUtil.COMMA, tagCodeList); } Date start = ChartUtils.getDateTime(timeType, timeCode); Date end = getEndTime(timeType, start); @@ -82,7 +84,7 @@ long millis = new Duration(begin, finish).getMillis(); int pointCount = IntegerUtil.toInt(millis / CommonConst.DIGIT_3600 / CommonConst.DIGIT_1000); List<TagValue> tagValueList = realtimeDatabaseService.retrieve(tagCodes, start, end, pointCount); List<TagValue> tagValueList = realtimeDatabaseService.retrieve(tagCodeList, start, end, pointCount); List<ElectricThreePhaseItem> itemList = new ArrayList<>(); List<Date> dateList = new ArrayList<>(); ChartUtils.generateDateList(timeType, timeCode, dateList); @@ -281,10 +283,14 @@ */ private void listDayData(Date date, List<TagValue> tagValueList, ElectricThreePhaseItem temp, ElectricThreePhaseTempModel tempModel) { Date endTime = DateTimeUtil.addHours(date, CommonConst.DIGIT_1); List<TagValue> currentTagValueList = tagValueList.stream().filter(x -> DateTimeUtil.compareDateDiff(date, x.getDataTime()) <= 0 && DateTimeUtil.compareDateDiff(endTime, x.getDataTime()) > 0).collect(Collectors.toList()); List<TagValue> currentATagValueList = currentTagValueList.stream().filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith("_A")).collect(Collectors.toList()); List<TagValue> currentBTagValueList = currentTagValueList.stream().filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith("_B")).collect(Collectors.toList()); List<TagValue> currentCTagValueList = currentTagValueList.stream().filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith("_C")).collect(Collectors.toList()); List<TagValue> currentTagValueList = tagValueList.stream() .filter(x -> DateTimeUtil.compareDateDiff(date, x.getDataTime()) <= 0 && DateTimeUtil.compareDateDiff(endTime, x.getDataTime()) > 0).collect(Collectors.toList()); List<TagValue> currentATagValueList = currentTagValueList.stream() .filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith(CommonConst.A_PHASE)).collect(Collectors.toList()); List<TagValue> currentBTagValueList = currentTagValueList.stream() .filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith(CommonConst.B_PHASE)).collect(Collectors.toList()); List<TagValue> currentCTagValueList = currentTagValueList.stream() .filter(x -> StringUtil.ifEmptyOrNullReturnValue(x.getTagCode()).trim().endsWith(CommonConst.C_PHASE)).collect(Collectors.toList()); TagValue tagValueA = currentATagValueList.stream().filter(x -> DateTimeUtil.compareDateDiff(date, x.getDataTime()) == 0).findAny().orElse(null); TagValue tagValueB = currentBTagValueList.stream().filter(x -> DateTimeUtil.compareDateDiff(date, x.getDataTime()) == 0).findAny().orElse(null); TagValue tagValueC = currentCTagValueList.stream().filter(x -> DateTimeUtil.compareDateDiff(date, x.getDataTime()) == 0).findAny().orElse(null); zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
@@ -358,8 +358,7 @@ */ @Override public List<EnergyIndex> listDeviceIndex(String nodeId, String meterId) { return energyIndexMapper.selectList(Wrappers.<EnergyIndex>lambdaQuery() .eq(EnergyIndex::getNodeId, nodeId) .eq(EnergyIndex::getMeterId, meterId)); List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByMeterIdIndexCode(meterId,null,nodeId); return energyIndexList; } }