【事件关键词回显】

src/main/java/com/zzsn/event/mapper/KeyWordsMapper.java

@@ -36,6 +36,7 @@ public interface KeyWordsMapper extends BaseMapper<KeyWords> {
      * @date 2024/9/12
      */
     KeywordsVO keywordInfoByEventId(@Param("eventId") String eventId);
+    List<KeywordsVO> keywordInfoByEventIdList(@Param("eventId") String eventId);
 
 
     /**

src/main/java/com/zzsn/event/mapper/xml/KeyWordsMapper.xml

@@ -182,4 +182,10 @@
         </if>
         group by b.id
     </select>
+    <select id="keywordInfoByEventIdList" resultType="com.zzsn.event.vo.KeywordsVO">
+        select word.id, word.words_code, word.key_word, word.exclusion_word,map.binding_type
+        from key_words word
+                 inner join subject_keywords_map map on word.id = map.keywords_id
+        where map.subject_id = #{eventId}
+    </select>
 </mapper>

src/main/java/com/zzsn/event/service/IKeyWordsService.java

@@ -64,6 +64,7 @@ public interface IKeyWordsService extends IService<KeyWords> {
      * @date 2024/9/12
      */
     KeywordsVO keywordInfoByEventId(String eventId);
+    List<KeywordsVO> keywordInfoByEventIdList(String eventId);
 
     /**
      * 专题绑定的关键词组-分页列表

src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java

@@ -147,7 +147,11 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         eventVO.setEventTag(one);
         List<RegionVO> regionList = eventRegionMapService.regionList(eventId);
         eventVO.setRegionList(regionList);
-        KeywordsVO keywordsVO = keyWordsService.keywordInfoByEventId(eventId);
+//        KeywordsVO keywordsVO = keyWordsService.keywordInfoByEventId(eventId);
+        KeywordsVO keywordsVO = new KeywordsVO();
+        List<KeywordsVO> keywordsVOS = keyWordsService.keywordInfoByEventIdList(eventId);
+        keywordsVOS.stream().filter(f -> StrUtil.equals(f.getBindingType(),"1")).findFirst().ifPresent(f -> keywordsVO.setKeyword(f.getKeyword()));
+        keywordsVOS.stream().filter(f -> StrUtil.equals(f.getBindingType(),"3")).findFirst().ifPresent(f -> keywordsVO.setExclusionWord(f.getExclusionWord()));
         eventVO.setKeywordsVO(keywordsVO);
         return eventVO;
     }
@@ -467,9 +471,9 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             iXxlJobInfoService.update(Wrappers.<XxlJobInfo>lambdaUpdate().eq(XxlJobInfo::getInfoSourceCode, event.getEventCode())
                     .set(XxlJobInfo::getTriggerStatus, status));
             //关键词
-            KeywordsVO keywordsVO = keyWordsService.keywordInfoByEventId(eventId);
-            iXxlJobInfoService.update(Wrappers.<XxlJobInfo>lambdaUpdate().eq(XxlJobInfo::getInfoSourceCode, keywordsVO.getWordsCode())
-                    .set(XxlJobInfo::getTriggerStatus, status));
+//            KeywordsVO keywordsVO = keyWordsService.keywordInfoByEventId(eventId);
+//            iXxlJobInfoService.update(Wrappers.<XxlJobInfo>lambdaUpdate().eq(XxlJobInfo::getInfoSourceCode, keywordsVO.getWordsCode())
+//                    .set(XxlJobInfo::getTriggerStatus, status));
             if (1 == status) {
                 kafkaTemplate.send(EVENT_MODEL_KAFKA_CHANNEL, event.getEventCode());
             }

src/main/java/com/zzsn/event/service/impl/KeyWordsServiceImpl.java

@@ -278,6 +278,10 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
     public KeywordsVO keywordInfoByEventId(String eventId) {
         return baseMapper.keywordInfoByEventId(eventId);
     }
+    @Override
+    public List<KeywordsVO> keywordInfoByEventIdList(String eventId) {
+        return baseMapper.keywordInfoByEventIdList(eventId);
+    }
 
 
     @Override

src/main/java/com/zzsn/event/vo/KeywordsVO.java

@@ -29,4 +29,6 @@ public class KeywordsVO {
      * 屏蔽词
      */
     private String exclusionWord;
+    /**绑定类型1：绑定为采集词，2：绑定为过滤词，3绑定为排除词组*/
+    private String bindingType;
 }