Merge branch 'release' into 'master'

Release

See merge request !269

pom.xml

@@ -35,7 +35,7 @@
         <dubbo.version>2.7.4.1</dubbo.version>
         <curator.version>2.12.0</curator.version>
         <push.log.version>2.17.0-SNAPSHOT</push.log.version>
-        <event-client.version>1.0.9-SNAPSHOT</event-client.version>
+        <event-client.version>1.0.9.3-SNAPSHOT</event-client.version>
     </properties>
 
     <dependencies>

src/main/java/com/zhiwei/brandkbs2/dao/EventMiddlewareDao.java

@@ -9,6 +9,7 @@ import com.zhiwei.middleware.event.pojo.dto.EventDTO;
 import com.zhiwei.middleware.event.pojo.dto.EventTagRelatedDTO;
 import com.zhiwei.middleware.event.pojo.entity.*;
 import com.zhiwei.middleware.event.pojo.vo.EventListInfoVO;
+import com.zhiwei.middleware.event.pojo.vo.EventTagBrandkbsVO;
 import com.zhiwei.middleware.event.pojo.vo.EventVO;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public interface EventMiddlewareDao {
      * @return
      */
     PageData<EventListInfoVO> getEventListBrandkbs(BrandkbsEventSearchDTO dto);
+
     /**
      * 根据id删除事件
      * @param eventId
@@ -276,6 +278,14 @@ public interface EventMiddlewareDao {
     ReturnData getBrandkbsBindingEventTags(String brandkbsProjectId);
 
     /**
+     * 获取品见项目标签绑定详情
+     * @param brandkbsProjectId 品见项目id
+     * @param brandkbsBrandId   品见品牌id
+     * @return
+     */
+    List<EventTagBrandkbsVO> getBrandkbsBindingEventTagsDetail(String brandkbsProjectId, String brandkbsBrandId);
+
+    /**
      * 修改品见关联关系,若存在则修改，否则新增
      * @param yuQingProject
      * @param yuQingProjectId

src/main/java/com/zhiwei/brandkbs2/dao/impl/EventMiddlewareDaoImpl.java

@@ -16,6 +16,7 @@ import com.zhiwei.middleware.event.pojo.entity.Event;
 import com.zhiwei.middleware.event.pojo.entity.EventDetailAdditionalInfo;
 import com.zhiwei.middleware.event.pojo.entity.EventDisseminationTrend;
 import com.zhiwei.middleware.event.pojo.vo.EventListInfoVO;
+import com.zhiwei.middleware.event.pojo.vo.EventTagBrandkbsVO;
 import com.zhiwei.middleware.event.pojo.vo.EventVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -197,6 +198,11 @@ public class EventMiddlewareDaoImpl implements EventMiddlewareDao {
     }
 
     @Override
+    public List<EventTagBrandkbsVO> getBrandkbsBindingEventTagsDetail(String brandkbsProjectId, String brandkbsBrandId) {
+        return eventTagClient.getBrandkbsBindingEventTagsDetail(brandkbsProjectId, brandkbsBrandId);
+    }
+
+    @Override
     public ReturnData modifyBrandkbsEventTags(String yuQingProject, String yuQingProjectId, List<EventTagRelatedDTO> eventTags, String brandkbsProject, String brandkbsProjectId, String brandkbsBrand, String brandkbsBrandId, String submitter, String submitterId) {
         return eventTagClient.modifyBrandkbsEventTags(yuQingProject, yuQingProjectId, eventTags, brandkbsProject, brandkbsProjectId, brandkbsBrand, brandkbsBrandId, submitter, submitterId);
     }

src/main/java/com/zhiwei/brandkbs2/service/impl/EventServiceImpl.java

@@ -751,10 +751,14 @@ public class EventServiceImpl implements EventService {
         // 品牌
         result.put("brands", projectService.getBrands(projectId, true));
         // 事件调性
-        AbstractProject abstractProject = projectService.getProjectByContendId(UserThreadLocal.getProjectId(), brandId);
+        AbstractProject abstractProject = projectService.getProjectByContendId(projectId, brandId);
         List<EventTagBrandkbsVO> eventTags = (List<EventTagBrandkbsVO>)eventMiddlewareDao.getEventTagGroupInfoBrandkbs(abstractProject.getBrandLinkedGroupId()).getData();
         List<EventTagBrandkbsVO> emotion = eventTags.stream().filter(eventTag -> EventTagEnum.EVENT_ATTRIBUTE.getName().equals(eventTag.getGroupName())).collect(Collectors.toList());
         result.put("emotions", emotion);
+        // 绑定中的事件标签
+        brandId = Objects.equals(Constant.PRIMARY_CONTEND_ID, brandId) ? projectId : brandId;
+        List<EventTagBrandkbsVO> brandkbsBindingEventTagsDetail = eventMiddlewareDao.getBrandkbsBindingEventTagsDetail(projectId, brandId);
+        result.put("eventTags", brandkbsBindingEventTagsDetail);
         // 时间
         result.put("times", getDefaultTimes());
         // 传播量