From 203625ea7fcc195b867d2d16bca8849ee1881288 Mon Sep 17 00:00:00 2001
From: yangshaoping <123456>
Date: Tue, 17 Mar 2020 15:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A0=B9=E6=8D=AE=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7id,=E6=89=80=E5=B1=9E=E7=AB=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=A8=BF-=E6=B7=BB=E5=8A=A0=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E5=BC=95=E7=94=A8=E5=88=A4=E6=96=AD=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/{ClientTypeEnum.java => ReginEnum.java}   |  8 ++++----
 .../java/com/epmet/service/impl/HomeServiceImpl.java   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/{ClientTypeEnum.java => ReginEnum.java} (78%)

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);
             }
         }