张京坤

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

+package com.zzsn.leaderbase.controller;
+
+import com.zzsn.leaderbase.service.CharacterDetailsService;
+import com.zzsn.leaderbase.service.CorrelationEnterpriseService;
+import com.zzsn.leaderbase.service.LearningAchievementService;
+import com.zzsn.leaderbase.service.impl.CisXgraPaperServiceImpl;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 14:18
+ * @Content:
+ */
+@RestController
+@RequestMapping("/api/detail")
+public class CharacterDetailsController {
+
+    //重要讲话 相关报道查询
+    @Autowired
+    CharacterDetailsService characterDetailsService;
+
+    //学术信息
+    @Autowired
+    CisXgraPaperServiceImpl cisXgraPaperService;
+
+    //学术成果
+    @Autowired
+    LearningAchievementService learningAchievementService;
+
+    //企业信息
+    @Autowired
+    CorrelationEnterpriseService correlationEnterpriseService;
+
+    /**
+     * 重要讲话 相关报道查询
+     * @param detailsListVo
+     * @return
+     */
+    @PostMapping("/informationList")
+    public Result<?> informationList(@RequestBody DetailsListVo detailsListVo){
+
+        String uid = detailsListVo.getUid();
+        if(uid == null || "".equals(uid))
+            return Result.error("人物id不能为空！");
+        Long type = detailsListVo.getType();
+        if(type == null)
+            return Result.error("类型type不能为空！");
+
+        Integer pageNo = detailsListVo.getPageNo();
+        Integer pageSize= detailsListVo.getPageSize();
+        if(pageNo < 1)
+            return Result.error("参数pageNo的值不能小于1！");
+        if(pageSize < 0)
+            return Result.error("参数pageSize的值不能小于0！");
+        Integer office = pageSize * (pageNo - 1);
+        detailsListVo.setOffset(office);
+
+        return characterDetailsService.informationList(detailsListVo);
+    }
+
+    /**
+     * 根据关联咨询索引和id查询咨询详情
+     * @param index 关联咨询所在es索引
+     * @param id 关联咨询es id
+     * @return
+     */
+    @GetMapping("/getInformation")
+    public Result<?> getInformation(
+            @RequestParam(name="index",required=true) String index,
+            @RequestParam(name="id",required=true) String id
+    ){
+
+        if(index == null || "".equals(index))
+            return Result.error("索引名称不能为空");
+        if(id == null || "".equals(id))
+            return Result.error("id不能为空！");
+
+        return characterDetailsService.getInformation(index, id);
+    }
+
+    /**
+     * 学术信息查询
+     * 根据人物uid
+     * @param uid
+     * @return
+     */
+    @GetMapping("/getCisXgraPaper")
+    public Result<?> getCisXgraPaper(@RequestParam(name="uid",required=true) String uid){
+        if(uid == null || "".equals(uid))
+            Result.error("人物id不能为空！");
+        return cisXgraPaperService.getCisXgraPaper(uid);
+    }
+
+
+    /**
+     * 学术成果查询
+     * @param detailsListVo
+     * @return
+     */
+    @PostMapping("/getLearningAchievementList")
+    public Result<?> getLearningAchievementList(@RequestBody DetailsListVo detailsListVo){
+        String uid = detailsListVo.getUid();
+        if(uid == null || "".equals(uid))
+            return Result.error("人物id不能为空！");
+
+        Integer pageNo = detailsListVo.getPageNo();
+        Integer pageSize= detailsListVo.getPageSize();
+        if(pageNo < 1)
+            return Result.error("参数pageNo的值不能小于1！");
+        if(pageSize < 0)
+            return Result.error("参数pageSize的值不能小于0！");
+        Integer office = pageSize * (pageNo - 1);
+        detailsListVo.setOffset(office);
+
+        return learningAchievementService.getLearningAchievementList(detailsListVo);
+    }
+
+
+    /**
+     * CorrelationEnterprise
+     * 相关企业查询
+     * @param detailsListVo
+     * @return
+     */
+    @PostMapping("/getCorrelationEnterpriseList")
+    public Result<?> getCorrelationEnterpriseList(@RequestBody DetailsListVo detailsListVo) {
+        String uid = detailsListVo.getUid();
+        if (uid == null || "".equals(uid))
+            return Result.error("人物id不能为空！");
+
+        Integer pageNo = detailsListVo.getPageNo();
+        Integer pageSize = detailsListVo.getPageSize();
+        if (pageNo < 1)
+            return Result.error("参数pageNo的值不能小于1！");
+        if (pageSize < 0)
+            return Result.error("参数pageSize的值不能小于0！");
+        Integer office = pageSize * (pageNo - 1);
+        detailsListVo.setOffset(office);
+
+        return correlationEnterpriseService.getCorrelationEnterpriseList(detailsListVo);
+    }
+}

src/main/java/com/zzsn/leaderbase/controller/CharacterInfoContorller.java → src/main/java/com/zzsn/leaderbase/controller/CharacterInfoController.java

 package com.zzsn.leaderbase.controller;
 
 import com.zzsn.leaderbase.service.CharacterInfoService;
+import com.zzsn.leaderbase.vo.CharacterCheckVo;
 import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
@@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/api/character")
-public class CharacterInfoContorller {
+public class CharacterInfoController {
 
     @Autowired
     CharacterInfoService characterInfoService;
@@ -67,10 +68,38 @@ public class CharacterInfoContorller {
      */
     @PostMapping("/list")
     public Result<?> getList(@RequestBody CharacterListVo characterListVo){
+        //参数校验
+        Integer pageNo = characterListVo.getPageNo();
+        Integer pageSize= characterListVo.getPageSize();
+        if(pageNo < 1)
+            return Result.error("参数pageNo的值不能小于1！");
+        if(pageSize < 0)
+            return Result.error("参数pageSize的值不能小于0！");
+        Integer office = pageSize * (pageNo - 1);
+        characterListVo.setOffset(office);
         return characterInfoService.getList(characterListVo);
     }
 
-    //审核
+    //审核 更新人物
+    @PostMapping("/checkUpdate")
+    public Result<?> checkUpdate(@RequestBody CharacterCheckVo characterCheckVo){
+        if(characterCheckVo.getOriginalCharacter() == null || characterCheckVo.getCharacter() == null)
+            Result.error("参数有误：originalCharacter和character不能为空！");
+        String originalCharacterId = characterCheckVo.getOriginalCharacter().getId();
+        if(originalCharacterId == null || "".equals(originalCharacterId))
+            Result.error("参数有误：原人物id不能为空");
+
+        return characterInfoService.checkUpdate(characterCheckVo);
+
+    }
+
+    //审核 取消人物
+    @PostMapping("/checkCancelUpdate")
+    public Result<?> checkCancelUpdate(@RequestBody CharacterVo characterVo){
+
+        return characterInfoService.checkCancelUpdate(characterVo);
+    }
+
 
 
 }

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

@@ -32,8 +32,8 @@ public class CharacterBasicInfo extends Model<CharacterBasicInfo> {
   //出生地
   private String birthplace;
   //出生日期
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date birthday;
   //籍贯
   private String nativePlace;

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

@@ -32,8 +32,8 @@ public class CharacterBasicInfoHistory extends Model<CharacterBasicInfoHistory>
   //出生地
   private String birthplace;
   //出生日期
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date birthday;
   //籍贯
   private String nativePlace;

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

@@ -40,16 +40,16 @@ public class CharacterChangeInfo extends Model<CharacterChangeInfo> {
   //职务(现)
   private String duty;
   //任职时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date takeOfficeTime;
   //任职状态
   private String takeOfficeStatus;
   //变更链接
   private String changeUrl;
   //职务变更时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date dutiesUpdateTime;
   //职务变更原因
   private String dutiesUpdateReason;

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

@@ -40,16 +40,16 @@ public class CharacterChangeInfoHistory extends Model<CharacterChangeInfoHistory
   //职务(现)
   private String duty;
   //任职时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date takeOfficeTime;
   //任职状态
   private String takeOfficeStatus;
   //变更链接
   private String changeUrl;
   //职务变更时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date dutiesUpdateTime;
   //职务变更原因
   private String dutiesUpdateReason;

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

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("cis_xgra_paper")
+public class CisXgraPaper extends Model<CisXgraPaper> {
+
+
+  //主键
+  @TableId(value = "id", type = IdType.ASSIGN_ID)
+  private String id;
+  //'关联人物id'
+  private String uid;
+  //'人物名称'
+  private String name;
+  //'所属工作单位/学校'
+  private String unit;
+  //'职称'
+  private String professionalTitle;
+  //'研究方向'
+  private String researchDirection;
+  //'研究领域'
+  private String researchArea;
+  //'文献篇数'
+  private Long documentCount;
+  //'基金论文数'
+  private Long foundsDocCount;
+  //'核心期刊论文数'
+  private Long coreDocCount;
+  //'第一作者篇数'
+  private Long firstAuthor;
+  //'总被引频次'
+  private Long allCitedCount;
+  //'平均被引频次'
+  private Long perCitedCount;
+  //'总下载频次'
+  private Long allDownloadCount;
+  //'H指数'
+  private Long hIndex;
+  //'排序研究领域'
+  private String sortArea;
+  //'排序领域发文数量'
+  private Long sortAreaDocCount;
+  //'排序领域发文数是排名'
+  private Long sortAreaDocNum;
+  //'排序领域被引次数'
+  private Long sortAreaCitedCount;
+  //'排序领域被引次数排名'
+  private Long sortAreaCitedNum;
+  //'排序领域H指数'
+  private Long sortAreaHIndex;
+  //'排序领域H指数'
+  private Long sortAreaHIndexNun;
+  //'排冬排序领域G指数'
+  private Long sortAreaGIndex;
+  //'排序领域G指教排名'
+  private Long sortAreaGIndexNum;
+  //'个人简介'
+  private String personalDes;
+  //'履历'
+  private String record;
+  //'荣誉'
+  private String honour;
+  //'学者关注点'
+  private String focusPoint;
+  //'创建人'
+  private String createBy;
+  //'创建时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  //'更新人'
+  private String updateBy;
+  //'更新时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  //'启停状态  1启 0停'
+  private Long status;
+
+}

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

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("correlation_enterprise")
+public class CorrelationEnterprise extends Model<CorrelationEnterprise> {
+
+  //主键
+  @TableId(value = "id", type = IdType.ASSIGN_ID)
+  private String id;
+  //'关联人物id'
+  private String uid;
+  //'姓名'
+  private String uname;
+  //'企业信用代码'
+  private String socialCreditCode;
+  //'企业名称'
+  private String ename;
+  //'职位:股东、法人、董事长等'
+  private String position;
+  //'持股比例'
+  private double shareholdingRatio;
+  //'创建人'
+  private String createBy;
+  //'创建时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  //'更新人'
+  private String updateBy;
+  //'更新时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  //'启停状态  1启 0停'
+  private Long status;
+}

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

+package com.zzsn.leaderbase.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("correlation_information")
+public class CorrelationInformation extends Model<CorrelationInformation> {
+
+  private static final long serialVersionUID = 1L;
+
+  //
+  private String id;
+  //关联人物id
+  private String uid;
+  //类型: 1重要讲话、2相关报道
+  private Long type;
+  //关联资讯所在索引
+  private String articleIndex;
+  //关联资讯id
+  private String articleId;
+  //关联资讯标题
+  private String articleTitle;
+  //关联资讯摘要
+  private String articleSummary;
+  //关联资讯内容
+  private String articleContent;
+  //资讯来源
+  private String articleSource;
+  //资讯发布时间
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date articlePublishDate;
+  //创建时间
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  //启停状态  1启 0停
+  private Long status;
+  //备注
+  private String remarks;
+
+}

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

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("learning_achievement")
+public class LearningAchievement extends Model<LearningAchievement> {
+
+  //主键
+  @TableId(value = "id", type = IdType.ASSIGN_ID)
+  private String id;
+  //'关联人物id'
+  private String uid;
+  //'标题 题名'
+  private String title;
+  //'作者'
+  private String author;
+  //'摘要'
+  private String summary;
+  //'来源 机构'
+  private String origin;
+  //'刊名'
+  private String journal;
+  //'ISSN号'
+  private String issnCode;
+  //'CN号'
+  private String cnCode;
+  //'馆藏号'
+  private String collectionCode;
+  //'关键词'
+  private String keyword;
+  //'载体类型 期刊、会议、专利'
+  private String carrierType;
+  //'出版周期'
+  private String publishingCycle;
+  //'引用数'
+  private Long citeCount;
+  //'下载数'
+  private Long downloadCount;
+  //'发表时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private Date publishData;
+  //'附注'
+  private String annotations;
+  //'创建人'
+  private String createBy;
+  //'创建时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date createTime;
+  //'更新人'
+  private String updateBy;
+  //'更新时间'
+  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private Date updateTime;
+  //'启停状态  1启 0停'
+  private Long status;
+
+}

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

+package com.zzsn.leaderbase.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsn.leaderbase.entity.CorrelationInformation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 16:29
+ * @Content:
+ */
+@Mapper
+public interface CharacterDetailsMapper extends BaseMapper<CorrelationInformation> {
+}

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

+package com.zzsn.leaderbase.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsn.leaderbase.entity.CisXgraPaper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 14:46
+ * @Content:
+ */
+@Mapper
+public interface CisXgraPaperMapper extends BaseMapper<CisXgraPaper> {
+}

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

+package com.zzsn.leaderbase.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsn.leaderbase.entity.CorrelationEnterprise;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 16:47
+ * @Content:
+ */
+@Mapper
+public interface CorrelationEnterpriseMapper extends BaseMapper<CorrelationEnterprise> {
+}

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

+package com.zzsn.leaderbase.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsn.leaderbase.entity.LearningAchievement;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 15:19
+ * @Content:
+ */
+public interface LearningAchievementMapper extends BaseMapper<LearningAchievement> {
+}

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

+package com.zzsn.leaderbase.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.leaderbase.entity.CorrelationInformation;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 16:27
+ * @Content:
+ */
+public interface CharacterDetailsService extends IService<CorrelationInformation> {
+
+    Result<?> informationList(DetailsListVo detailsListVo);
+
+    Result<?> getInformation(String articleIndex, String articleId);
+
+}

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

 package com.zzsn.leaderbase.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zzsn.leaderbase.vo.CharacterCheckVo;
 import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
@@ -27,5 +28,8 @@ public interface CharacterInfoService {
 
     Result<?> getList(CharacterListVo characterListVo);
 
+    Result<?> checkUpdate(CharacterCheckVo characterCheckVo);
+
+    Result<?> checkCancelUpdate(CharacterVo characterVo);
 }
 

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

+package com.zzsn.leaderbase.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.leaderbase.entity.CisXgraPaper;
+import com.zzsn.leaderbase.vo.Result;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 14:44
+ * @Content:
+ */
+public interface CisXgraPaperService extends IService<CisXgraPaper> {
+    Result<?> getCisXgraPaper(String uid);
+}

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

+package com.zzsn.leaderbase.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.leaderbase.entity.CorrelationEnterprise;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 15:34
+ * @Content:
+ */
+public interface CorrelationEnterpriseService extends IService<CorrelationEnterprise> {
+    Result<?> getCorrelationEnterpriseList(DetailsListVo detailsListVo);
+}

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

+package com.zzsn.leaderbase.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsn.leaderbase.entity.LearningAchievement;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 15:17
+ * @Content:
+ */
+public interface LearningAchievementService extends IService<LearningAchievement> {
+    Result<?> getLearningAchievementList(DetailsListVo detailsListVo);
+}

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

+package com.zzsn.leaderbase.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.leaderbase.entity.CorrelationInformation;
+import com.zzsn.leaderbase.mapper.CharacterDetailsMapper;
+import com.zzsn.leaderbase.service.CharacterDetailsService;
+import com.zzsn.leaderbase.util.EsUtil;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+import com.zzsn.leaderbase.vo.SubjectInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 16:28
+ * @Content:
+ */
+@Service
+public class CharacterDetailsServiceImpl extends ServiceImpl<CharacterDetailsMapper, CorrelationInformation> implements CharacterDetailsService {
+
+    @Autowired
+    CharacterDetailsMapper characterDetailsMapper;
+
+    @Autowired
+    private EsUtil esUtil;
+
+    @Override
+    public Result<?> informationList(DetailsListVo detailsListVo) {
+
+        String uid = detailsListVo.getUid();
+        Long type = detailsListVo.getType();
+
+        LambdaQueryWrapper<CorrelationInformation> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(CorrelationInformation::getUid, uid);
+        lambdaQuery.eq(CorrelationInformation::getType, type);
+        lambdaQuery.orderByDesc(CorrelationInformation::getArticlePublishDate);
+
+        StringBuffer sb = new StringBuffer()
+                .append(" limit ")
+                .append(detailsListVo.getOffset())
+                .append(",")
+                .append(detailsListVo.getPageSize());
+        lambdaQuery.last(sb.toString());
+
+        List<CorrelationInformation> list = characterDetailsMapper.selectList(lambdaQuery);
+        return Result.OK(list);
+    }
+
+    @Override
+    public Result<?> getInformation(String articleIndex, String articleId) {
+        SubjectInfoVo subjectInfo = esUtil.getInfoByid(articleIndex,articleId, SubjectInfoVo.class);
+        return Result.OK(subjectInfo);
+    }
+
+}

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.entity.CharacterBasicInfoHistory;
 import com.zzsn.leaderbase.entity.CharacterChangeInfo;
+import com.zzsn.leaderbase.entity.CharacterChangeInfoHistory;
 import com.zzsn.leaderbase.service.*;
+import com.zzsn.leaderbase.vo.CharacterCheckVo;
 import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -45,17 +48,20 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
     @Override
     public Result<?> add(CharacterVo characterVo) {
 
+        characterVo.setUid(generatorIdService.getOrderId().toString());
+
         String id = Long.toString(generatorIdService.getOrderId());
+        characterVo.setId(id);
+        characterVo.setCreateTime(new Date());
+
         //vo对象获取转entity对象，基本信息
         CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
         BeanUtils.copyProperties(characterVo, characterBasicInfo);
-        characterBasicInfo.setId(id);
         characterBasicInfoService.save(characterBasicInfo);
 
         //vo对象获取转entity对象，任职变更信息
         CharacterChangeInfo characterChangeInfo = new CharacterChangeInfo();
         BeanUtils.copyProperties(characterVo, characterChangeInfo);
-        characterChangeInfo.setId(id);
         characterChangeInfoService.save(characterChangeInfo);
 
         //记录任务基本信息修改记录
@@ -75,14 +81,15 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         List<CharacterBasicInfoHistory> characterBasicInfoHistoryList = new ArrayList<>();
         for (CharacterVo characterVo : list) {
             String id = Long.toString(generatorIdService.getOrderId());
+            characterVo.setId(id);
+            characterVo.setCreateTime(new Date());
+
             CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
             BeanUtils.copyProperties(characterVo, characterBasicInfo);
-            characterBasicInfo.setId(id);
             characterBasicInfoList.add(characterBasicInfo);
 
             CharacterChangeInfo characterChangeInfo = new CharacterChangeInfo();
             BeanUtils.copyProperties(characterVo, characterChangeInfo);
-            characterChangeInfo.setId(id);
             characterChangeInfoList.add(characterChangeInfo);
 
             CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
@@ -110,6 +117,9 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
 
     @Override
     public Result<?> edit(CharacterVo characterVo) {
+
+        characterVo.setUpdateTime(new Date());
+
         //vo对象获取转entity对象，基本信息
         CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
         BeanUtils.copyProperties(characterVo, characterBasicInfo);
@@ -120,10 +130,11 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         BeanUtils.copyProperties(characterVo, characterChangeInfo);
         characterChangeInfoService.updateById(characterChangeInfo);
 
-        //记录任务基本信息修改记录
+        //记录人物基本信息修改记录
         CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
         BeanUtils.copyProperties(characterBasicInfo, characterBasicInfoHistory);
         characterBasicInfoHistory.setId(null);
+        characterBasicInfoHistory.setCreateTime(new Date());
         characterBasicInfoHistoryService.save(characterBasicInfoHistory);
 
         return Result.OK();
@@ -131,29 +142,71 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
 
     @Override
     public Result<?> getList(CharacterListVo characterListVo) {
-
-        //参数校验
-        Integer pageNo = characterListVo.getPageNo();
-        Integer pageSize= characterListVo.getPageSize();
-        if(pageNo < 1)
-            return Result.error("参数pageNo的值不能小于1！");
-        if(pageSize < 0)
-            return Result.error("参数pageSize的值不能小于0！");
-        Integer office = pageSize * (pageNo - 1);
-        characterListVo.setOffset(office);
+        IPage page = new Page();
 
         //根据条件查询数据
         List<CharacterVo> list = characterBasicInfoService.getList(characterListVo);
 
-        IPage page = new Page();
         page.setRecords(list);
-
         //查询总数
         Integer total = characterBasicInfoService.getCount(characterListVo);
         page.setTotal(total);
+        Integer pageNo = characterListVo.getPageNo();
+        Integer pageSize= characterListVo.getPageSize();
         page.setCurrent(pageNo);
         page.setSize(pageSize);
 
         return Result.OK(page);
     }
+
+    @Override
+    public Result<?> checkUpdate(CharacterCheckVo characterCheckVo) {
+
+        CharacterVo originalCharacter = characterCheckVo.getOriginalCharacter();
+        //先查询更新之前的任职信息保存到历史任职记录表中
+        CharacterChangeInfo cci = characterChangeInfoService.getById(originalCharacter.getId());
+        CharacterChangeInfoHistory characterChangeInfoHistory = new CharacterChangeInfoHistory();
+        BeanUtils.copyProperties(cci, characterChangeInfoHistory);
+        characterChangeInfoHistory.setId(null);
+        characterChangeInfoHistory.setCreateTime(new Date());
+        characterChangeInfoHistoryService.save(characterChangeInfoHistory);
+
+
+        CharacterVo character = characterCheckVo.getCharacter();
+        String characterId = character.getId();
+        //更新人物
+        character.setId(originalCharacter.getId());
+        character.setUpdateTime(new Date());
+
+        //vo对象获取转entity对象，基本信息
+        CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
+        BeanUtils.copyProperties(character, characterBasicInfo);
+        characterBasicInfoService.updateById(characterBasicInfo);
+
+        //vo对象获取转entity对象，任职变更信息
+        CharacterChangeInfo characterChangeInfo = new CharacterChangeInfo();
+        BeanUtils.copyProperties(character, characterChangeInfo);
+        characterChangeInfo.setUpdateDesc(characterId);
+        characterChangeInfoService.updateById(characterChangeInfo);
+
+        //记录人物基本信息修改记录
+        CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
+        BeanUtils.copyProperties(characterBasicInfo, characterBasicInfoHistory);
+        characterBasicInfoHistory.setId(null);
+        characterBasicInfoHistory.setCreateTime(new Date());
+        characterBasicInfoHistoryService.save(characterBasicInfoHistory);
+
+        //合并后的数据改为停用状态
+        CharacterChangeInfo cciStatus = new CharacterChangeInfo();
+        cciStatus.setId(characterId);
+        cciStatus.setStatus(0L);
+        characterChangeInfoService.updateById(cciStatus);
+
+        return Result.OK();
+    }
+
+    @Override
+    public Result<?> checkCancelUpdate(CharacterVo characterVo) {
+        return null;
+    }
 }

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

+package com.zzsn.leaderbase.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.leaderbase.entity.CisXgraPaper;
+import com.zzsn.leaderbase.mapper.CisXgraPaperMapper;
+import com.zzsn.leaderbase.service.CisXgraPaperService;
+import com.zzsn.leaderbase.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 14:44
+ * @Content:
+ */
+@Service
+public class CisXgraPaperServiceImpl extends ServiceImpl<CisXgraPaperMapper, CisXgraPaper> implements CisXgraPaperService {
+
+    @Autowired
+    CisXgraPaperMapper cisXgraPaperMapper;
+
+    @Override
+    public Result<?> getCisXgraPaper(String uid) {
+
+
+        LambdaQueryWrapper<CisXgraPaper> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(CisXgraPaper::getUid, uid);
+        CisXgraPaper cisXgraPaper = cisXgraPaperMapper.selectOne(lambdaQuery);
+        return Result.OK(cisXgraPaper);
+    }
+}

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

+package com.zzsn.leaderbase.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.leaderbase.entity.CorrelationEnterprise;
+import com.zzsn.leaderbase.mapper.CorrelationEnterpriseMapper;
+import com.zzsn.leaderbase.service.CorrelationEnterpriseService;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 16:45
+ * @Content:
+ */
+@Service
+public class CorrelationEnterpriseServiceImpl extends ServiceImpl<CorrelationEnterpriseMapper, CorrelationEnterprise> implements CorrelationEnterpriseService {
+
+    @Autowired
+    CorrelationEnterpriseMapper correlationEnterpriseMapper;
+
+    @Override
+    public Result<?> getCorrelationEnterpriseList(DetailsListVo detailsListVo) {
+
+        String uid = detailsListVo.getUid();
+
+        LambdaQueryWrapper<CorrelationEnterprise> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(CorrelationEnterprise::getUid, uid);
+        lambdaQuery.orderByDesc(CorrelationEnterprise::getSocialCreditCode);
+        StringBuffer sb = new StringBuffer()
+                .append(" limit ")
+                .append(detailsListVo.getOffset())
+                .append(",")
+                .append(detailsListVo.getPageSize());
+        lambdaQuery.last(sb.toString());
+        List<CorrelationEnterprise> list = correlationEnterpriseMapper.selectList(lambdaQuery);
+
+        return Result.OK(list);
+    }
+}

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

+package com.zzsn.leaderbase.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.leaderbase.entity.LearningAchievement;
+import com.zzsn.leaderbase.mapper.LearningAchievementMapper;
+import com.zzsn.leaderbase.service.LearningAchievementService;
+import com.zzsn.leaderbase.vo.DetailsListVo;
+import com.zzsn.leaderbase.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/5 15:18
+ * @Content:
+ */
+@Service
+public class LearningAchievementServiceImpl extends ServiceImpl<LearningAchievementMapper, LearningAchievement> implements LearningAchievementService {
+
+    @Autowired
+    LearningAchievementMapper learningAchievementMapper;
+
+    @Override
+    public Result<?> getLearningAchievementList(DetailsListVo detailsListVo) {
+        String uid = detailsListVo.getUid();
+
+        LambdaQueryWrapper<LearningAchievement> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(LearningAchievement::getUid, uid);
+        lambdaQuery.orderByDesc(LearningAchievement::getPublishData);
+
+        StringBuffer sb = new StringBuffer()
+                .append(" limit ")
+                .append(detailsListVo.getOffset())
+                .append(",")
+                .append(detailsListVo.getPageSize());
+        lambdaQuery.last(sb.toString());
+        List<LearningAchievement> list = learningAchievementMapper.selectList(lambdaQuery);
+
+        return Result.OK(list);
+    }
+}

src/main/java/com/zzsn/leaderbase/vo/CharacterCheckVo.java

+package com.zzsn.leaderbase.vo;
+
+import lombok.Data;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/2 16:32
+ * @Content:
+ */
+@Data
+public class CharacterCheckVo {
+    private CharacterVo originalCharacter;
+    private CharacterVo character;
+}

src/main/java/com/zzsn/leaderbase/vo/CharacterListVo.java

@@ -21,9 +21,9 @@ public class CharacterListVo {
     private Integer pageSize = 10;
 
     //排序字段，多个排序字段用逗号分隔
-    private String orders = "create_time";
+    private String column = "create_time";
     //降序DESC 升序 ASC 默认为DESC
-    private String ordersBy = "DESC";
+    private String order = "DESC";
 
     //人物名称
     private String name;

src/main/java/com/zzsn/leaderbase/vo/CharacterVo.java

@@ -38,8 +38,8 @@ public class CharacterVo {
     //出生地
     private String birthplace;
     //出生日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     //籍贯
     private String nativePlace;
@@ -96,16 +96,16 @@ public class CharacterVo {
     //职务(现)
     private String duty;
     //任职时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date takeOfficeTime;
     //任职状态
     private String takeOfficeStatus;
     //变更链接
     private String changeUrl;
     //职务变更时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date dutiesUpdateTime;
     //职务变更原因
     private String dutiesUpdateReason;

src/main/java/com/zzsn/leaderbase/vo/DetailsListVo.java

+package com.zzsn.leaderbase.vo;
+
+import lombok.Data;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 16:12
+ * @Content:
+ */
+@Data
+public class DetailsListVo {
+
+    //当前页码，默认值为1
+    private Integer pageNo = 1;
+
+    //分页偏移量 根据 pageNo 和 pageSize 计算得到
+    private Integer offset;
+
+    //每页数量，默认值为10
+    private Integer pageSize = 10;
+
+    //排序字段，多个排序字段用逗号分隔
+    private String column = "article_publish_date";
+    //降序DESC 升序 ASC 默认为DESC
+    private String order = "DESC";
+
+    //人物id
+    private String uid;
+    //类型: 1重要讲话、2相关报道
+    private Long type;
+
+}

src/main/resources/application.yml

@@ -2,6 +2,13 @@ server:
   port: 9098
 
 spring:
+  servlet:
+    multipart:
+      #单个上传文件大小
+      max-file-size: 100MB
+      #总上传文件大小
+      max-request-size: 1000MB
+
   datasource:
     url: jdbc:mysql://114.116.44.11:3306/leader?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
     username: ciglobal

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -5,11 +5,13 @@
 <mapper namespace="com.zzsn.leaderbase.mapper.CharacterBasicInfoMapper">
 
     <select id="getList" resultType="com.zzsn.leaderbase.vo.CharacterVo">
-        select a.id,a.uid,a.name,a.sex,a.birthplace,a.birthday,a.native_place,a.school,a.speciality,a.education,a.expert_occupation,a.head_sculpture,a.biographical_notes,a.category,a.award_records,a.part_time_job,a.research_field,a.evaluate,a.create_by,a.create_time,a.update_by,a.update_time,a.status,department_original,duty_original,department,duty,b.take_office_time,b.take_office_status,b.change_url,b.duties_update_time,b.duties_update_reason,b.check_status,b.check_result,b.article_id,b.article_title,b.update_desc
+select * from (
+        select a.id,a.uid,a.name,a.sex,a.birthplace,a.birthday,a.native_place,a.school,a.speciality,a.education,a.expert_occupation,a.head_sculpture,a.biographical_notes,a.category,a.award_records,a.part_time_job,a.research_field,a.evaluate,a.status,department_original,duty_original,department,duty,b.take_office_time,b.take_office_status,b.change_url,b.duties_update_time,b.duties_update_reason,b.check_status,b.check_result,b.article_id,b.article_title,b.update_desc,a.create_by,a.create_time,a.update_by,a.update_time
         from character_basic_info a
         LEFT JOIN character_change_info b
         on a.id = b.id
         where 1 = 1
+        and (b.status != 0 or b.status IS NULL)
         <if test="name != null and name != ''">
             AND a.name = #{name}
         </if>
@@ -25,9 +27,9 @@
         <if test="checkResult != null">
             AND b.check_result = #{checkResult}
         </if>
-
-        <if test="orders != null and orders != ''">
-            ORDER BY ${orders} ${ordersBy}
+        )t1
+        <if test="order != null and order != ''">
+            ORDER BY ${column} ${order}
         </if>
 
         limit  #{offset}, #{pageSize}
@@ -40,6 +42,7 @@
         LEFT JOIN character_change_info b
         on a.id = b.id
         where 1 = 1
+        and (b.status != 0 or b.status IS NULL)
         <if test="name != null and name != ''">
             AND a.name = #{name}
         </if>