From ebcecf6fca972470f1cafe7ebf23fad7fdc7c022 Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Fri, 9 Sep 2022 10:15:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/item/EpdcItemDto.java | 21 -------------------
 .../modules/events/dao/EpdcEventsDao.java     |  4 ----
 .../service/impl/EpdcEventsServiceImpl.java   | 12 +----------
 .../resources/mapper/events/EpdcEventsDao.xml |  4 ----
 4 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/EpdcItemDto.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/EpdcItemDto.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/EpdcItemDto.java
deleted file mode 100644
index bd851a9d6..000000000
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/EpdcItemDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.elink.esua.epdc.dto.item;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class EpdcItemDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**|
-     * 编码全称
-     */
-    private String categoryFullCode;
-
-    /**
-     * 事件id
-     */
-    private String eventId;
-}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
index ae27161bd..5b9c925c8 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
@@ -24,7 +24,6 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
-import com.elink.esua.epdc.dto.item.EpdcItemDto;
 import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
@@ -242,7 +241,4 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
     * @return java.util.List<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
     */
     List<EpdcEventsDTO> selectListOfGenPendingReviewEvents(Map<String, Object> params);
-
-
-    void insertByEventId(@Param("eventId") String eventId, @Param("categoryFullCode") String categoryFullCode);
 }
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 2d6dc26fb..5cfe98651 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
@@ -57,7 +57,6 @@ import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.EpdcItemDto;
 import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
@@ -294,8 +293,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         }
 
         EpdcEventsEntity entity = new EpdcEventsEntity();
-        EpdcItemDto itemEntity = new EpdcItemDto();
-        itemEntity.setEventId(dto.getId());
         entity.setId(dto.getId());
         entity.setEventState(dto.getEventState());
         // 初始化分类
@@ -303,13 +300,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             EventsCategoryDTO categoryInfo = this.initCategoryInfo(dto.getCategoryId());
             entity.setCategoryCode(categoryInfo.getCategoryCode());
             entity.setFirstCategoryCode(categoryInfo.getFirstCategoryCode());
-            itemEntity.setCategoryFullCode(categoryInfo.getCategoryFullCode());
+            entity.setCategoryFullName(categoryInfo.getCategoryFullName());
         }
 
         entity.setAdvice(dto.getAdvice());
         // 更新事件表审核状态
         updateById(entity);
-        baseDao.insertByEventId(itemEntity.getEventId(),itemEntity.getCategoryFullCode());
         // 积分埋点   事件状态 0-待审核，2-驳回，4-审核通过 议题规则：话题被群主转为议题，事件转为议题
         if("4".equals(dto.getEventState())){
             PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
@@ -652,24 +648,18 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             resultDto.setFirstCategoryCode(cateList.get(0).getCategoryCode());
             //分类标签全称拼接:-分割
             String name = "";
-            String code = "";
             for (int i = 0; i < cateList.size(); i++) {
                 if (i == cateList.size() - 1) {
-                    code = code + cateList.get(i).getCategoryCode();
                     name = name + cateList.get(i).getCategoryName();
                 } else {
                     name = name + cateList.get(i).getCategoryName() + "-";
-                    code = code + cateList.get(i).getCategoryCode() + "-";
                 }
             }
-            code = code + "-" + cateDto.getCategoryCode();
             name = name + "-" + cateDto.getCategoryName();
-            resultDto.setCategoryFullCode(code);
             resultDto.setCategoryFullName(name);
             // 所选分类标签为一级
         } else {
             //当前标签作为一级标签
-            resultDto.setCategoryFullCode(cateDto.getCategoryCode());
             resultDto.setFirstCategoryCode(cateDto.getCategoryCode());
             resultDto.setCategoryFullName(cateDto.getCategoryName());
         }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 555afada1..192a9a793 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -26,10 +26,6 @@
             <result property="image" column="IIMG_URL"/>
         </collection>
     </resultMap>
-    <insert id="insertByEventId">
-        insert into epdc_item(CATEGORY_FULL_CODE) values(#{categoryFullCode}) where eventId = #{eventId}
-    </insert>
-
     <select id="selectOneOfEventDetailById" resultMap="eventDetailMap">
         SELECT
             e.ID,