From 28c7b4a440b473cc2d08ddc34abbd1b55aa59bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 28 Nov 2019 14:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AE=A1=E6=A0=B8=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/entity/EpdcEventsEntity.java       | 10 ++++
 .../service/impl/EpdcEventsServiceImpl.java   | 49 +++++++++++--------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
index d9676c0ea..b980fb86e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
@@ -173,4 +173,14 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
 	 */
 	private String topicId;
 
+	/**
+	 * 一级分类ID
+	 */
+	private String firstcategoryCode;
+
+	/**
+	 * 分类全称
+	 */
+	private String categoryFullName;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index e170c2ba9..7de83043f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -180,7 +180,33 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         EpdcEventsEntity entity = new EpdcEventsEntity();
         entity.setId(dto.getId());
         entity.setEventState(dto.getEventState());
-        entity.setCategoryCode(dto.getCategoryId());
+//        entity.setCategoryCode(dto.getCategoryId());
+        //初始化分类
+        CategoryDTO cateDto =categoryService.get(Long.parseLong(dto.getCategoryId()));
+        entity.setCategoryCode(cateDto.getCategoryCode());
+        //获取所有父类分类标签
+        List<CategoryEntity> cateList = categoryService.getPidListById(Long.parseLong(dto.getCategoryId()));
+        //所选分类标签为多级
+        if(cateList != null && cateList.size() > 0) {
+            // list第一个为一级分类标签
+            entity.setFirstcategoryCode(cateList.get(0).getCategoryCode());
+            //分类标签全称拼接:-分割
+            String name = "";
+            for (int i = 0; i < cateList.size(); i++){
+                if (i == cateList.size() -1){
+                    name = name + cateList.get(i).getCategoryName();
+                }else {
+                    name = name + cateList.get(i).getCategoryName() + "-";
+                }
+            }
+            name = name + cateDto.getCategoryName();
+            entity.setCategoryFullName(name);
+        // 所选分类标签为一级
+        } else {
+            //当前标签作为一级标签
+            entity.setFirstcategoryCode(cateDto.getCategoryCode());
+            entity.setCategoryFullName(cateDto.getCategoryName());
+        }
         entity.setAdvice(dto.getAdvice());
         // 更新事件表审核状态
         updateById(entity);
@@ -354,25 +380,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueEntity.setGridId(entity.getGridId());
         issueEntity.setIssueAddress(entity.getIssueAddress());
         issueEntity.setCategoryCode(entity.getCategoryCode());
-        //初始化分类
-        List<CategoryEntity> cateList = categoryService.getPidListById(Long.parseLong(entity.getCategoryCode()));
-        if(cateList != null && cateList.size() > 0) {
-            issueEntity.setFirstcategoryCode(cateList.get(0).getCategoryCode());
-            String name = "";
-            for (int i = 0; i < cateList.size(); i++){
-                if (i == cateList.size() -1){
-                    name = name + cateList.get(i).getCategoryName();
-                }else {
-                    name = name + cateList.get(i).getCategoryName() + "-";
-                }
-            }
-            issueEntity.setCategoryFullName(name);
-
-        } else {
-            issueEntity.setFirstcategoryCode(entity.getCategoryCode());
-            CategoryDTO dto =categoryService.get(Long.parseLong(entity.getCategoryCode()));
-            issueEntity.setCategoryFullName(dto.getCategoryName());
-        }
+        issueEntity.setFirstcategoryCode(entity.getFirstcategoryCode());
+        issueEntity.setCategoryFullName(entity.getCategoryFullName());
         issueEntity.setIssueLatitude(entity.getIssueLatitude());
         issueEntity.setIssueLongitude(entity.getIssueLongitude());
         issueEntity.setGroupId(entity.getGroupId());