修改项目绑定事件标签品牌id传参

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>0.0.1-SNAPSHOT</event-client.version>
+        <event-client.version>1.0.1-SNAPSHOT</event-client.version>
     </properties>
 
     <dependencies>

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

@@ -95,10 +95,10 @@ public class ProjectServiceImpl implements ProjectService {
         String submitterId = JwtUtil.unsign(request.getHeader(jwtKey), Map.class).get(GenericAttribute.USER_ID).toString();
         String submitter = userService.queryUserInfo(submitterId, project.getId()).getNickname();
 
-        // 主品牌绑定事件标签
+        // 主品牌绑定事件标签，主品牌品牌id使用项目id
         List<EventTagRelatedDTO> eventTagsList = projectVO.getEventTagsList();
         eventTagClient.bindBrandkbs(project.getBrandLinkedGroup(), project.getBrandLinkedGroupId(), eventTagsList,
-                project.getProjectName(), project.getId(), project.getBrandName(), Constant.PRIMARY_CONTEND_ID, submitter, submitterId);
+                project.getProjectName(), project.getId(), project.getBrandName(), project.getId(), submitter, submitterId);
         // 竞品绑定事件标签
         List<Contend> contendList = project.getContendList();
         if (CollectionUtils.isNotEmpty(contendList)) {
@@ -148,7 +148,9 @@ public class ProjectServiceImpl implements ProjectService {
         Map<String, List<EventTagRelatedDTO>> eventTagsMap = (Map<String, List<EventTagRelatedDTO>>) eventTagClient.getBrandkbsBindingEventTags(pid).getData();
         List<EventTagRelatedDTO> eventTagsList = new ArrayList<>();
         if (!Tools.isEmpty(eventTagsMap)) {
-            eventTagsList = eventTagsMap.get(Constant.PRIMARY_CONTEND_ID);
+            // 获取主品牌标签
+            eventTagsList = eventTagsMap.get(projectVO.getId());
+            // 获取竞品标签
             List<Contend> contendList = projectVO.getContendList();
             if (!Tools.isEmpty(contendList)) {
                 for (Contend contend : contendList) {
@@ -160,7 +162,6 @@ public class ProjectServiceImpl implements ProjectService {
         return projectVO;
     }
 
-
     @Override
     public Project getProjectById(String pid) {
         return projectDao.findOneById(pid);
@@ -187,10 +188,10 @@ public class ProjectServiceImpl implements ProjectService {
         String submitterId = JwtUtil.unsign(request.getHeader(jwtKey), Map.class).get(GenericAttribute.USER_ID).toString();
         String submitter = userService.queryUserInfo(submitterId, project.getId()).getNickname();
 
-        // 主品牌修改绑定事件标签
+        // 主品牌修改绑定事件标签, 主品牌id使用项目id
         List<EventTagRelatedDTO> eventTagsList = projectVO.getEventTagsList();
         eventTagClient.modifyBrandkbsEventTags(project.getBrandLinkedGroup(), project.getBrandLinkedGroupId(), eventTagsList,
-                project.getProjectName(), project.getId(), project.getBrandName(), Constant.PRIMARY_CONTEND_ID, submitter, submitterId);
+                project.getProjectName(), project.getId(), project.getBrandName(), project.getId(), submitter, submitterId);
         // 竞品修改绑定事件标签
         List<Contend> contendList = project.getContendList();
         if (CollectionUtils.isNotEmpty(contendList)) {