Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/leaderbase/controller/CharacterBasicInfoController.java

 package com.zzsn.leaderbase.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.service.CharacterBasicInfoService;
 import com.zzsn.leaderbase.util.SortUtil;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
-import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,18 +21,19 @@ import java.util.Map;
 @RestController
 @RequestMapping("/api/character/basic")
 public class CharacterBasicInfoController {
-
+    
     @Autowired
     CharacterBasicInfoService characterBasicInfoService;
-
+    
     /**
      * 资讯抽取人物信息分页查询
      * 人物审核列表
+     *
      * @param
      * @return
      */
     @PostMapping("/list")
-    public Result<?> getList(@RequestBody BasicInfoListVo basicInfoListVo){
+    public Result<?> getList(@RequestBody BasicInfoListVo basicInfoListVo) {
         log.info("人物管理列表:{}", basicInfoListVo);
         Integer office = basicInfoListVo.getPageSize() * (basicInfoListVo.getPageNo() - 1);
         basicInfoListVo.setOffset(office);
@@ -37,107 +41,144 @@ public class CharacterBasicInfoController {
         IPage page = characterBasicInfoService.getList(basicInfoListVo);
         return Result.OK(page);
     }
-
+    
     @GetMapping("/getById")
-    public Result<?> getById(@RequestParam(name="id",required=true) String id){
+    public Result<?> getById(@RequestParam(name = "id", required = true) String id) {
         log.info("人物审核根据人物id查询:{}", id);
         CharacterBasicInfo info = characterBasicInfoService.getOneById(id);
         return Result.OK(info);
     }
-
+    
     /**
      * 根据姓名查询 疑似人物查询
+     *
      * @param name
      * @return
      */
     @GetMapping("/getListByName")
-    public Result<?> getListByName(@RequestParam(name="name",required=true) String name){
+    public Result<?> getListByName(@RequestParam(name = "name", required = true) String name) {
         log.info("根据人物名称查询疑似人物:{}", name);
         List<CharacterBasicInfo> list = characterBasicInfoService.getListByName(name);
         return Result.OK(list);
     }
-
+    
     /**
      * 新增人物
      */
     @PostMapping("/add")
-    public Result<?> add(@RequestBody CharacterBasicInfo characterBasicInfo){
-        log.info("新增人物:{}",characterBasicInfo);
+    public Result<?> add(@RequestBody CharacterBasicInfo characterBasicInfo) {
+        log.info("新增人物:{}", characterBasicInfo);
         return characterBasicInfoService.add(characterBasicInfo);
     }
-
+    
     /**
      * 修改人物
      */
     @PostMapping("/edit")
-    public Result<?> edit(@RequestBody CharacterBasicInfo characterBasicInfo){
-        log.info("新增人物:{}",characterBasicInfo);
+    public Result<?> edit(@RequestBody CharacterBasicInfo characterBasicInfo) {
+        log.info("新增人物:{}", characterBasicInfo);
         String id = characterBasicInfo.getId();
-        if(id == null || id.length() == 0)
+        if (id == null || id.length() == 0)
             return Result.error("人物id不能为空");
         return characterBasicInfoService.edit(characterBasicInfo);
     }
-
+    
     /**
      * 根据id删除人物
+     *
      * @param id
      * @return
      */
     @GetMapping("/del")
-    public Result<?> del(@RequestParam(name="id",required=true) String id){
+    public Result<?> del(@RequestParam(name = "id", required = true) String id) {
         log.info("根据id删除人物:{}", id);
         Boolean res = characterBasicInfoService.del(id);
         return Result.OK(res);
     }
-
-
+    
     /**
      * 根据uid查询人物的历任职务
+     *
      * @param uid
      * @return
      */
     @GetMapping("/getPreviousDuty")
-    public Result<?> getPreviousDuty(@RequestParam(name="uid",required=true) String uid){
-        log.info("根据uid查询人物的历任职务:{}",uid);
+    public Result<?> getPreviousDuty(@RequestParam(name = "uid", required = true) String uid) {
+        log.info("根据uid查询人物的历任职务:{}", uid);
         List<CharacterBasicInfo> list = characterBasicInfoService.getPreviousDuty(uid);
         return Result.OK(list);
     }
-
+    
     /**
      * 关联
+     *
      * @param characterBasicInfo
      * @return
      */
     @PostMapping("/correlation")
-    public Result<?> correlation(@RequestBody CharacterBasicInfo characterBasicInfo){
+    public Result<?> correlation(@RequestBody CharacterBasicInfo characterBasicInfo) {
         log.info("关联:{}", characterBasicInfo.getId());
         return characterBasicInfoService.correlation(characterBasicInfo);
     }
-
+    
     /**
      * 修改关联人物
+     *
      * @param characterBasicInfo
      * @return
      */
     @PostMapping("/correlationEdit")
-    public Result<?> correlationEdit(@RequestBody CharacterBasicInfo characterBasicInfo){
+    public Result<?> correlationEdit(@RequestBody CharacterBasicInfo characterBasicInfo) {
         log.info("修改关联人物:{}", characterBasicInfo.getId());
         return characterBasicInfoService.correlationEdit(characterBasicInfo);
     }
-
+    
     /**
      * 企业查询
-     * @param socialCreditCode  社会信用代码
+     *
+     * @param socialCreditCode 社会信用代码
      * @param department
      * @return
      */
     @GetMapping("/getDepartment")
-    public Result<?> getDepartment(@RequestParam(name="socialCreditCode",required=false) String socialCreditCode,
-                                   @RequestParam(name="department",required=false) String department,
-                                   @RequestParam(name="keyword",required=false) String keyword) {
-        log.info("查询企业名称:{}---{}---{}", socialCreditCode,department,keyword);
+    public Result<?> getDepartment(@RequestParam(name = "socialCreditCode", required = false) String socialCreditCode,
+                                   @RequestParam(name = "department", required = false) String department,
+                                   @RequestParam(name = "keyword", required = false) String keyword) {
+        log.info("查询企业名称:{}---{}---{}", socialCreditCode, department, keyword);
         List<Map<String, String>> list = characterBasicInfoService.getDepartment(socialCreditCode, department, keyword);
         return Result.OK(list);
     }
+    
+    /**
+     * @param basicInfoListVo 条件封装
+     * @描述 查询专家列表
+     * @作者 hejinyu
+     * @创建时间 2024/12/26
+     **/
+    @PostMapping("/listAll")
+    public Result<?> listAll(@RequestBody BasicInfoListVo basicInfoListVo) {
+        //类别过滤为专家
+        basicInfoListVo.setCategory("2");
+        basicInfoListVo.setColumn(SortUtil.humpToLine(basicInfoListVo.getColumn()));
+        List<CharacterBasicInfo> list= characterBasicInfoService.getAllList(basicInfoListVo);
+        return Result.OK(list);
+    }
+    
+    /**
+     * @param basicInfoListVo 条件封装
+     * @描述 查询专家列表（分页，产业链关联专家时查询用）
+     * @作者 hejinyu
+     * @创建时间 2024/12/26
+     **/
+    @PostMapping("/pageListAll")
+    public Result<?> pageListAll(@RequestBody BasicInfoListVo basicInfoListVo) {
+        //类别过滤为专家
+        basicInfoListVo.setCategory("2");
+        Integer office = basicInfoListVo.getPageSize() * (basicInfoListVo.getPageNo() - 1);
+        basicInfoListVo.setOffset(office);
+        basicInfoListVo.setColumn(SortUtil.humpToLine(basicInfoListVo.getColumn()));
+        IPage page = characterBasicInfoService.getList(basicInfoListVo);
+        return Result.OK(page);
+    }
 }
 

src/main/java/com/zzsn/leaderbase/entity/CharacterBasicInfo.java

@@ -117,5 +117,7 @@ public class CharacterBasicInfo extends Model<CharacterBasicInfo> {
   //有没有历任数据 1-有；0-没有
   @TableField(exist = false)
   private Integer hasChild;
-
+  //关键词
+  @TableField(exist = false)
+  private String keyword;
 }

src/main/java/com/zzsn/leaderbase/mapper/CharacterBasicInfoMapper.java

@@ -126,4 +126,6 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
             "limit 20 " +
             "</script>")
     List<Map<String, String>> getDepartment(String socialCreditCode, String department, String keyword);
+    
+    List<CharacterBasicInfo> getAllList(BasicInfoListVo basicInfoListVo);
 }

src/main/java/com/zzsn/leaderbase/service/CharacterBasicInfoService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
-import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
 
@@ -54,4 +53,6 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
     List<CharacterBasicInfo> getBasicInfoByCreditCode(String socialCreditCode);
 
     List<Map<String, String>> getDepartment(String socialCreditCode, String department, String keyword);
+    
+    List<CharacterBasicInfo> getAllList(BasicInfoListVo basicInfoListVo);
 }

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

@@ -12,7 +12,6 @@ import com.zzsn.leaderbase.service.CharacterBasicInfoService;
 import com.zzsn.leaderbase.service.CharacterTagService;
 import com.zzsn.leaderbase.service.IGeneratorIdService;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
-import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,9 +51,20 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
     public IPage<CharacterBasicInfo> getList(BasicInfoListVo basicInfoListVo) {
         List<CharacterBasicInfo> list = baseMapper.getList(basicInfoListVo);
         Integer total = baseMapper.getListCount(basicInfoListVo);
-
+        List<CharacterBasicInfo> listNew =setListValues(list,basicInfoListVo);
+        IPage page = new Page();
+        page.setRecords(listNew);
+        page.setTotal(total);
+        Integer pageNo = basicInfoListVo.getPageNo();
+        Integer pageSize= basicInfoListVo.getPageSize();
+        page.setCurrent(pageNo);
+        page.setSize(pageSize);
+        return page;
+    }
+    
+    private List<CharacterBasicInfo> setListValues(List<CharacterBasicInfo> list, BasicInfoListVo basicInfoListVo) {
         //查询结果替换主数据
-        List<CharacterBasicInfo> listNew = new ArrayList<>(list.size());
+        List<CharacterBasicInfo> listNew=new ArrayList<>(list.size());
         for (CharacterBasicInfo characterBasicInfo : list) {
             Integer mainEntry = characterBasicInfo.getMainEntry();
             if(mainEntry == 0){
@@ -71,10 +81,8 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
                 listNew.add(characterBasicInfo);
             }
         }
-
         //判断是否有关联数据
         hasChild(listNew);
-
         //记录热门标签
         String tagId = basicInfoListVo.getTagId();
         if(tagId != null && tagId.length() >0){
@@ -83,17 +91,9 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
                 characterTagService.addTagTop(s);
             }
         }
-
-        IPage page = new Page();
-        page.setRecords(listNew);
-        page.setTotal(total);
-        Integer pageNo = basicInfoListVo.getPageNo();
-        Integer pageSize= basicInfoListVo.getPageSize();
-        page.setCurrent(pageNo);
-        page.setSize(pageSize);
-        return page;
-
+        return list;
     }
+    
     //判断是否有关联数据
     private List<CharacterBasicInfo> hasChild(List<CharacterBasicInfo> list){
         if(list != null && list.size() > 0 ){
@@ -242,5 +242,11 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
         }
         return baseMapper.getDepartment(socialCreditCode, department, keyword);
     }
-
+    
+    @Override
+    public List<CharacterBasicInfo> getAllList(BasicInfoListVo basicInfoListVo) {
+        List<CharacterBasicInfo> list = baseMapper.getAllList(basicInfoListVo);
+        List<CharacterBasicInfo> listNew =setListValues(list,basicInfoListVo);
+        return listNew;
+    }
 }

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -14,6 +14,16 @@
         ORDER BY CONVERT (${column} USING gbk) ${order}
         limit  #{offset}, #{pageSize}
     </select>
+    
+    <select id="getAllList" resultType="com.zzsn.leaderbase.entity.CharacterBasicInfo">
+        select
+        *
+        from character_basic_info
+        where 1 = 1
+        <include refid="getListWhere"/>
+        group by uid
+        ORDER BY CONVERT (${column} USING gbk) ${order}
+    </select>
 
     <select id="getListCount" resultType="int">
 select count(1) from (