人物服务2.0开发

src/main/java/com/zzsn/leaderbase/kafka/PersonOfJobChangeKafkaConsumer.java

@@ -43,7 +43,7 @@ public class PersonOfJobChangeKafkaConsumer {
 
     @KafkaListener(topics = "personOfJobChangeTopic", groupId = "group02")
     public void listen(String message) {
-        log.info("kafka pull personOfJobChangeTopic: {} ......", message.substring(0,300));
+        log.info("kafka pull personOfJobChangeTopic: {} ......", message.substring(0,30));
         getData(message);
     }
 
@@ -51,6 +51,7 @@ public class PersonOfJobChangeKafkaConsumer {
         //log.info(message);
         InfoExtractionParam record = JSON.parseObject(message, InfoExtractionParam.class);
         BaseData baseData = JSON.parseObject(message, BaseData.class);
+        log.info("create_date:{}---title:{}",baseData.getCreateDate(),baseData.getTitle());
         if(StringUtils.isEmpty(baseData.getId())){
             String id = String.valueOf(generatorIdService.getId());
             baseData.setId(id);

src/main/java/com/zzsn/leaderbase/service/impl/CharacterBasicInfoServiceImpl.java

@@ -53,8 +53,27 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
         List<CharacterBasicInfo> list = baseMapper.getList(basicInfoListVo);
         Integer total = baseMapper.getListCount(basicInfoListVo);
 
+        //查询结果替换主数据
+        List<CharacterBasicInfo> listNew = new ArrayList<>(list.size());
+        for (CharacterBasicInfo characterBasicInfo : list) {
+            Integer mainEntry = characterBasicInfo.getMainEntry();
+            if(mainEntry == 0){
+                QueryWrapper<CharacterBasicInfo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("uid", characterBasicInfo.getUid())
+                        .eq("main_entry",1);
+                List<CharacterBasicInfo> mainList = this.list(queryWrapper);
+                if(mainList.size() > 0){
+                    listNew.add(mainList.get(0));
+                } else {
+                    listNew.add(characterBasicInfo);
+                }
+            } else {
+                listNew.add(characterBasicInfo);
+            }
+        }
+
         //判断是否有关联数据
-        hasChild(list);
+        hasChild(listNew);
 
         //记录热门标签
         String tagId = basicInfoListVo.getTagId();
@@ -66,7 +85,7 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
         }
 
         IPage page = new Page();
-        page.setRecords(list);
+        page.setRecords(listNew);
         page.setTotal(total);
         Integer pageNo = basicInfoListVo.getPageNo();
         Integer pageSize= basicInfoListVo.getPageSize();
@@ -173,13 +192,12 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
     public Result<?> correlation(CharacterBasicInfo characterBasicInfo) {
         //传过来的id是操作的数据id
         String id = characterBasicInfo.getId();
-        if(id == null || "".equals(id))
-            return Result.error("id不能为空！");
+        CharacterBasicInfo newInfo = this.getById(id);
 
         String newId = Long.toString(generatorIdService.getOrderId());
         characterBasicInfo.setId(newId);
         characterBasicInfo.setMainEntry(0);
-        characterBasicInfo.setCategory("1");
+        characterBasicInfo.setCategory(newInfo.getCategory());
         characterBasicInfo.setCreateTime(new Date());
         Boolean res = this.save(characterBasicInfo);
         return Result.OK(res);

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -10,19 +10,22 @@
         from character_basic_info
         where 1 = 1
         <include refid="getListWhere"/>
+        group by uid
         ORDER BY CONVERT (${column} USING gbk) ${order}
         limit  #{offset}, #{pageSize}
     </select>
 
     <select id="getListCount" resultType="int">
-        SELECT count(1)
+select count(1) from (
+        SELECT count(1) as c
         from character_basic_info
         where 1 = 1
         <include refid="getListWhere"/>
+        group by uid
+        )t1
 
     </select>
     <sql id="getListWhere">
-        AND main_entry =1
         <if test="keyword != null and keyword != ''">
             AND CONCAT_WS(',',name,biographical_notes,department,duty,update_desc,article_title,article_origin,tag_name)
             like '%${keyword}%'