From babb1b81981367a1b2e8e454bebea8c294fcd539 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 30 May 2023 10:01:32 +0800 Subject: [PATCH] =?UTF-8?q?#bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/operational/pom.xml | 4 ++-- .../operational/main/service/impl/AppHomeServiceImpl.java | 3 +++ .../main/service/impl/HydropowerServiceImpl.java | 15 ++++++++++++--- .../main/service/impl/SideHustleServiceImpl.java | 15 +++++++++------ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 08f941d..e9dd242 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -100,8 +100,8 @@ org.apache.poi - ooxml-schemas - 1.4 + poi-ooxml-schemas + 3.15 org.jfree diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java index fd93f5f..b7882fc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java @@ -567,9 +567,12 @@ public class AppHomeServiceImpl implements IAppHomeService { item.setClassMember(classMember); } + + /** * 获取下一班组数据 * @param item + * * @param id */ private void getNextDuty(AppAreaDutyVo item, Long id) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index 2717ab6..a6bed57 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -118,6 +118,8 @@ public class HydropowerServiceImpl implements HydropowerService { private final static String load_hydropower_unit_target_key = "hzims:operation:loadhydropowerunit:target:key"; private final static String loadwater_level_key = "hzims:operation:loadwater:level:key"; + private final static String loadwater_group_key = "hzims:operation:group:key"; + private final static int POOL_QUANTITY = 4; private final static int DUTY_POOL_QUANTITY = 5; @@ -1146,11 +1148,11 @@ public class HydropowerServiceImpl implements HydropowerService { if(Math.abs(generate_sum) > 0){ return scales.stream().peek(scale-> scale.setAreaMakeUp(BigDecimal.valueOf(scale.getPowerYear() / generate_sum * 100).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue())). filter(scale-> Math.abs(scale.getCapacityUse()) > 0 || Math.abs(scale.getAreaMakeUp()) > 0 - && Math.abs(scale.getDeviceUse()) > 0 || Math.abs(scale.getGenerationRate()) > 0) + || Math.abs(scale.getDeviceUse()) > 0 || Math.abs(scale.getGenerationRate()) > 0) .sorted(Comparator.comparing(AreaScaleVo::getPowerYear).reversed()).collect(Collectors.toList()); } return scales.stream().peek(scale-> scale.setAreaMakeUp(0.0)).filter(scale-> Math.abs(scale.getCapacityUse()) > 0 || Math.abs(scale.getAreaMakeUp()) > 0 - && Math.abs(scale.getDeviceUse()) > 0 || Math.abs(scale.getGenerationRate()) > 0) + || Math.abs(scale.getDeviceUse()) > 0 || Math.abs(scale.getGenerationRate()) > 0) .sorted(Comparator.comparing(AreaScaleVo::getPowerYear).reversed()).collect(Collectors.toList()); } @@ -1234,6 +1236,10 @@ public class HydropowerServiceImpl implements HydropowerService { */ @Override public List group(Long deptId) { + List gourps = (List) redisTemplate.opsForValue().get(loadwater_group_key + deptId); + if(CollectionUtil.isNotEmpty(gourps)){ + return gourps; + } Map> areas = areaService.areaOrStaion(deptId,Collections.singletonList(HomePageConstant.HYDROPOWER)); if(MapUtils.isEmpty(areas)) { return new ArrayList<>(); @@ -1252,7 +1258,7 @@ public class HydropowerServiceImpl implements HydropowerService { areas.forEach((key,value)-> codes.addAll(value.stream().map(StationEntity::getCode).collect(Collectors.toList()))); // 计划发电量 List plans = planGenertionClient.getPlanGenerationByParam(codes,null,String.valueOf(Calendar.getInstance().get(Calendar.YEAR))); - return areas.entrySet().stream().map(entry->{ + List hydropowerAreas = areas.entrySet().stream().map(entry->{ HydropowerAreaVo area = new HydropowerAreaVo(); area.setDeptId(entry.getKey().getId()); area.setDeptName(entry.getKey().getDeptName()); @@ -1275,6 +1281,9 @@ public class HydropowerServiceImpl implements HydropowerService { area.setStationTargets(this.stationTarget(entry.getValue(),reals,targets,plans)); return area; }).sorted(Comparator.comparing(HydropowerAreaVo::getReality)).collect(Collectors.toList()); + redisTemplate.opsForValue().set(loadwater_group_key,hydropowerAreas); + redisTemplate.expire(loadwater_group_key,5, TimeUnit.MINUTES); + return hydropowerAreas; } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java index 0f13bc3..7d58740 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java @@ -344,20 +344,23 @@ public class SideHustleServiceImpl implements ISideHustleService { return runDeviceList.stream().map(o ->{ Map points = o.getPoint(); if(CollectionUtil.isEmpty(points)){ - return ""; + return "0"; } String realId = points.get(HomePageConstant.JOINT_RELAY); - if(StringUtil.isBlank(realId)){ - return ""; + if(StringUtil.isEmpty(realId)){ + return "0"; + } + if(MapUtils.isEmpty(realMap)){ + return "0"; } String value = realMap.get(realId); - if(StringUtil.isBlank(value)){ - return ""; + if(StringUtil.isEmpty(value)){ + return "0"; } if (value.contains("1") || "1.0".equals(value)) { return o.getEmCode(); } - return ""; + return "0"; }).distinct().collect(Collectors.toList()); }