Browse Source

修改站类 1无节制电站 2流量计电站

遂昌项目
walton 4 months ago
parent
commit
773f11dde8
  1. 3
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java
  2. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java
  3. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

3
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);
/**
* 站点类型 云服务

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

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

Loading…
Cancel
Save