diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java index 5b3769b325..7d7fe5d990 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/HomeStartPageResultDTO.java @@ -15,7 +15,7 @@ public class HomeStartPageResultDTO implements Serializable { /** * 居民端启动页文件url路径 */ - private String reisUrl; + private String resiUrl; /** * 居民端启动页展示时间,单位秒 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java index 0f4b64605e..1ab9f564c6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java @@ -47,10 +47,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 客户小程序启动页配置 @@ -133,6 +131,20 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl map = resultList.stream().collect(Collectors.toMap(StartPageResultDTO::getClientType,StartPageResultDTO::getClientType,(value1,value2)->{ + return value2; + })); + if(!map.containsKey("resi")){ + StartPageResultDTO resi = new StartPageResultDTO(); + resi.setClientType("resi"); + resultList.add(resi); + } + if(!map.containsKey("work")){ + StartPageResultDTO work = new StartPageResultDTO(); + work.setClientType("work"); + resultList.add(work); + } } //2.查询默认客户数据 @@ -188,7 +200,7 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl { if ("resi".equals(d.getClientType())) { - resultDTO.setReisUrl(d.getUrl()); + resultDTO.setResiUrl(d.getUrl()); resultDTO.setResiTime(d.getTime()); } if ("work".equals(d.getClientType())) {