#bug修复

hzims-service/operational/pom.xml

@@ -100,8 +100,8 @@
 <!--        月报统计图表导出-->
         <dependency>
             <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
+            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>1.4</version>
+            <version>3.15</version>
         </dependency>
         <dependency>
             <groupId>org.jfree</groupId>

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) {

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<HydropowerAreaVo> group(Long deptId) {
+		List<HydropowerAreaVo> gourps = (List<HydropowerAreaVo>) redisTemplate.opsForValue().get(loadwater_group_key + deptId);
+		if(CollectionUtil.isNotEmpty(gourps)){
+			return gourps;
+		}
 		Map<Dept,List<StationEntity>> 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<PlanGenerationEntity> plans = planGenertionClient.getPlanGenerationByParam(codes,null,String.valueOf(Calendar.getInstance().get(Calendar.YEAR)));
-		return areas.entrySet().stream().map(entry->{
+		List<HydropowerAreaVo> 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;
 	}
 
 	/**

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<String,String> points = o.getPoint();
 			if(CollectionUtil.isEmpty(points)){
-				return "";
+				return "0";
 			}
 			String realId = points.get(HomePageConstant.JOINT_RELAY);
-			if(StringUtil.isBlank(realId)){
+			if(StringUtil.isEmpty(realId)){
-				return "";
+				return "0";
+			}
+			if(MapUtils.isEmpty(realMap)){
+				return "0";
 			}
 			String value = realMap.get(realId);
-			if(StringUtil.isBlank(value)){
+			if(StringUtil.isEmpty(value)){
-				return  "";
+				return  "0";
 			}
 			if (value.contains("1") || "1.0".equals(value)) {
 				return o.getEmCode();
 			}
-			return "";
+			return "0";
 		}).distinct().collect(Collectors.toList());
 	}