xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +53982 -1121
364 changed files with 53982 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb6f44dd93 - Show all commits

10
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
View File

@ -345,16 +345,16 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
public List<AmmeterRevenueStatisListVo> getAmmeterRevenueDataResult(StatisAmmeterDateRequest requestVo) {
String siteId = requestVo.getSiteId();
List<AmmeterRevenueStatisListVo> resultList = new ArrayList<>();
//查询电价配置
List<EnergyPriceConfigVo> priceConfigList = emsEnergyPriceConfigMapper.getConfigListByTimeFrame(siteId, requestVo.getStartTime(), requestVo.getEndTime());
if (CollectionUtils.isEmpty(priceConfigList)){
return Collections.emptyList();
}
//查询电表数据
List<AmmeterStatisListVo> dataList = this.getAmmeterDataResult(requestVo);
if (CollectionUtils.isEmpty(dataList)) {
return Collections.emptyList();
}
//查询电价配置
List<EnergyPriceConfigVo> priceConfigList = emsEnergyPriceConfigMapper.getConfigListByTimeFrame(siteId, requestVo.getStartTime(), requestVo.getEndTime());
if (CollectionUtils.isEmpty(priceConfigList)){
return Collections.emptyList();
}
Map<String, List<EnergyPriceConfigVo>> priceConfigMap = priceConfigList.stream().collect(Collectors.groupingBy(EnergyPriceConfigVo::getYearMonth));
dataList.forEach(ammeter -> {
List<EnergyPriceConfigVo> priceConfigs = priceConfigMap.get(ammeter.getDataTime().substring(0, 7));

31
ems-system/src/main/java/com/xzzn/ems/utils/DevicePointMatchDataProcessor.java
View File

@ -1,14 +1,10 @@
package com.xzzn.ems.utils;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.xzzn.common.annotation.Excel;
import com.xzzn.common.constant.RedisKeyConstants;
import com.xzzn.common.core.redis.RedisCache;
import com.xzzn.common.enums.PointType;
import com.xzzn.common.utils.DataUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.ems.domain.EmsPointEnumMatch;
import com.xzzn.ems.domain.EmsPointMatch;
@ -27,13 +23,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
@Service
@ -56,18 +49,18 @@ public class DevicePointMatchDataProcessor {
/**
* 初始化加载设备匹配点位配置数据
*/
@PostConstruct
public void init()
{
try {
ClassPathResource classPathResource = new ClassPathResource("biz/configData/DevicePointMatch.json");
String configJson = DataUtils.getJSONFromFile(classPathResource.getInputStream());
devicePointMatchInfo = JSONObject.parseObject(configJson, DevicePointMatchInfo.class);
log.info("初始化设备匹配点位配置数据成功。"+ JSON.toJSONString(devicePointMatchInfo));
} catch (Exception ex) {
log.error("OcrMedicalStdHandler 设置mapping数据异常。", ex);
}
}
// @PostConstruct
// public void init()
// {
// try {
// ClassPathResource classPathResource = new ClassPathResource("biz/configData/DevicePointMatch.json");
// String configJson = DataUtils.getJSONFromFile(classPathResource.getInputStream());
// devicePointMatchInfo = JSONObject.parseObject(configJson, DevicePointMatchInfo.class);
// log.info("初始化设备匹配点位配置数据成功。"+ JSON.toJSONString(devicePointMatchInfo));
// } catch (Exception ex) {
// log.error("OcrMedicalStdHandler 设置mapping数据异常。", ex);
// }
// }
/**
* 获取字段注解信息