diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java index 499677f..18f273a 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java @@ -88,7 +88,8 @@ public interface HomePageConstant { */ Integer HYDROPOWER_SERVETYPE = 2; - List SERVETYPE_LIST = Arrays.asList("1","2"); + //1无节制电站 2流量计电站 + List SERVETYPE_LIST = Arrays.asList(1,2); /** * 站点类型 : 云服务 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java index 717f72e..5a7c259 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java @@ -149,7 +149,7 @@ public class HomeServiceImpl implements HomeService { List counts = new ArrayList<>(); HomePageConstant.SERVETYPE_LIST.forEach(serve ->counts.addAll(HomePageConstant.HOME_TYPES.stream().map(type -> { StationCountVo count = new StationCountVo(); - count.setServeType(serve); + count.setServeType(serve.toString()); if(HomePageConstant.CHARGE.equals(type) && "2".equals(serve)){ TargetVo target = (TargetVo) redisTemplate.opsForValue().get(charge); if(ObjectUtil.isNotEmpty(target)){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index 3b75d33..da73ccf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -749,7 +749,7 @@ public class StationServiceImpl extends BaseServiceImpl select(Integer type, Integer serveType) { List types; if (ObjectUtil.isEmpty(type)) { - types = HomePageConstant.TYPES; + types = HomePageConstant.SERVETYPE_LIST; } else if (HomePageConstant.WATER_CONSERVANCY.equals(type)) { types = HomePageConstant.waterList; } else {