diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ClientTypeEnum.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginEnum.java similarity index 78% rename from epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ClientTypeEnum.java rename to epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginEnum.java index 0dcbccfc4f..47ef5eed86 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ClientTypeEnum.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginEnum.java @@ -1,12 +1,12 @@ package com.epmet.constant; /** - * @Classname ClientType - * @Description TODO + * @Classname ReginEnum + * @Description 所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区 * @Date 2020/3/17 15:22 * @Created by yangs */ -public enum ClientTypeEnum { +public enum ReginEnum { //所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区 title("0", "title"), top("1","top"), @@ -20,7 +20,7 @@ public enum ClientTypeEnum { * @param key * @param name */ - ClientTypeEnum(String key, String name) { + ReginEnum(String key, String name) { this.key = key; this.name = name; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java index 22b2c3a521..53f42e0acd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java @@ -1,7 +1,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.ClientTypeEnum; +import com.epmet.constant.ReginEnum; import com.epmet.dao.CustomerHomeDao; import com.epmet.dao.CustomerHomeDetailDao; import com.epmet.dao.HomeComponentDao; @@ -53,13 +53,13 @@ public class HomeServiceImpl implements HomeService { for(CommonComponentDesignResultDTO c:list){ usedComponent.add(c.getComponentId()); //所属区域:0.标题区、1.置顶区、2.功能区、3.悬浮区 - if(ClientTypeEnum.title.getKey().equals(c.getRegion())){ + if(ReginEnum.title.getKey().equals(c.getRegion())){ resultDTO.setTitleList(c); - }else if(ClientTypeEnum.top.getKey().equals(c.getRegion())){ + }else if(ReginEnum.top.getKey().equals(c.getRegion())){ resultDTO.setTopList(c); - }else if(ClientTypeEnum.function.getKey().equals(c.getRegion())){ + }else if(ReginEnum.function.getKey().equals(c.getRegion())){ flist.add(c); - }else if(ClientTypeEnum.floating.getKey().equals(c.getRegion())){ + }else if(ReginEnum.floating.getKey().equals(c.getRegion())){ resultDTO.setFloatingList(c); } }