From 773f11dde8ac9b21ce111cbf310daf88d416d2f8 Mon Sep 17 00:00:00 2001
From: walton <1239357677@qq.com>
Date: Thu, 28 Nov 2024 17:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=B1=BB=20=201?=
 =?UTF-8?q?=E6=97=A0=E8=8A=82=E5=88=B6=E7=94=B5=E7=AB=99=20=20=202?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=AE=A1=E7=94=B5=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/main/constant/HomePageConstant.java     | 3 ++-
 .../com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java  | 2 +-
 .../hzims/operational/station/service/impl/StationServiceImpl.java     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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<String> SERVETYPE_LIST = Arrays.asList("1","2");
+    //1无节制电站   2流量计电站
+    List<Integer> 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<StationCountVo> 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<StationMapper, StationEn
     public List<StationEntity> select(Integer type, Integer serveType) {
         List<Integer> types;
         if (ObjectUtil.isEmpty(type)) {
-            types = HomePageConstant.TYPES;
+            types = HomePageConstant.SERVETYPE_LIST;
         } else if (HomePageConstant.WATER_CONSERVANCY.equals(type)) {
             types = HomePageConstant.waterList;
         } else {