Skip to content

L
leader-base
提交 5588dc14 作者: chenshiqiang
操作

delete CharacterChangeInfoExtract

上级 98df2606
正在显示 包含 16 行增加 和 170 行删除
src/main/java/com/zzsn/leaderbase/entity/CharacterChangeInfoExtract.java deleted 100644 → 0
package com.zzsn.leaderbase.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
@Data
@TableName("character_change_info_extract")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="character_change_info_extract对象", description="信息")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class CharacterChangeInfoExtract {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**关联人物id*/
@Excel(name = "关联人物id", width = 15)
@ApiModelProperty(value = "关联人物id")
private String uid;
/**人物名称*/
@Excel(name = "人物名称", width = 15)
@ApiModelProperty(value = "人物名称")
private String name;
/**原部门 原单位 原企业*/
@Excel(name = "原部门 原单位 原企业", width = 15)
@ApiModelProperty(value = "原部门 原单位 原企业")
private String departmentOriginal;
/**原职务*/
@Excel(name = "原职务", width = 15)
@ApiModelProperty(value = "原职务")
private String dutyOriginal;
/**部门 单位 企业(现)*/
@Excel(name = "部门 单位 企业(现)", width = 15)
@ApiModelProperty(value = "部门 单位 企业(现)")
private String department;
/**职务(现)*/
@Excel(name = "职务(现)", width = 15)
@ApiModelProperty(value = "职务(现)")
private String duty;
/**任职时间*/
@Excel(name = "任职时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "任职时间")
private Date takeOfficeTime;
/**任职状态*/
@Excel(name = "任职状态", width = 15)
@ApiModelProperty(value = "任职状态")
private String takeOfficeStatus;
/**变更链接*/
@Excel(name = "变更链接", width = 15)
@ApiModelProperty(value = "变更链接")
private String changeUrl;
/**职务变更时间*/
@Excel(name = "职务变更时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "职务变更时间")
private Date dutiesUpdateTime;
/**职务变更原因*/
@Excel(name = "职务变更原因", width = 15)
@ApiModelProperty(value = "职务变更原因")
private String dutiesUpdateReason;
/**是否审核 1是 0否*/
@Excel(name = "是否审核 1是 0否", width = 15)
@ApiModelProperty(value = "是否审核 1是 0否")
private Integer checkStatus;
/**是否审核通过 0未通过 1通过 2待定*/
@Excel(name = "是否审核通过 0未通过 1通过 2待定", width = 15)
@ApiModelProperty(value = "是否审核通过 0未通过 1通过 2待定")
private Integer checkResult;
/**关联资讯id*/
@Excel(name = "关联资讯id", width = 15)
@ApiModelProperty(value = "关联资讯id")
private String articleId;
/**关联资讯标题*/
@Excel(name = "关联资讯标题", width = 15)
@ApiModelProperty(value = "关联资讯标题")
private String articleTitle;
/**变更描述*/
@Excel(name = "变更描述", width = 15)
@ApiModelProperty(value = "变更描述")
private String updateDesc;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
}
src/main/java/com/zzsn/leaderbase/mapper/CharacterChangeInfoExtractMapper.java deleted 100644 → 0
package com.zzsn.leaderbase.mapper;
import java.util.List;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
public interface CharacterChangeInfoExtractMapper extends BaseMapper<CharacterChangeInfoExtract> {
}
src/main/java/com/zzsn/leaderbase/service/DealLeaderDataService.java
......@@ -5,11 +5,11 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsn.leaderbase.constant.CommonConstant;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import com.zzsn.leaderbase.mapper.CharacterChangeInfoExtractMapper;
import com.zzsn.leaderbase.util.EsDateUtil;
import com.zzsn.leaderbase.util.EsUtil;
import com.zzsn.leaderbase.util.HttpUtil;
import com.zzsn.leaderbase.vo.CharacterVo;
import com.zzsn.leaderbase.vo.InfoExtractionParam;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.index.query.BoolQueryBuilder;
......@@ -33,9 +33,10 @@ public class DealLeaderDataService {
@Value("${python.getInfoUrl}")
private String relationEntityUrl;
@Autowired
RedisTemplate redisTemplate;
@Resource
private ICharacterChangeInfoExtractService characterChangeInfoExtractService;
private RedisTemplate redisTemplate;
@Autowired
private CharacterInfoService characterInfoService;
public void getData() throws IOException {
......@@ -66,7 +67,7 @@ public class DealLeaderDataService {
JSONObject jsonObjectParam = new JSONObject();
for (InfoExtractionParam record : records) {
List<CharacterChangeInfoExtract> list = new ArrayList<>();
List<CharacterVo> list = new ArrayList<>();
Map<String, List<InfoExtractionParam>> map = new HashMap<>();
map.put("data_list", Collections.singletonList(record));
jsonObjectParam.put("data", map);
......@@ -85,7 +86,7 @@ public class DealLeaderDataService {
JSONArray jsonArray = (JSONArray) JSONArray.parse(String.valueOf(dataResult.get("infos")));
for (Object data : jsonArray) {
JSONObject temp = JSONObject.parseObject(data.toString());
list.add(CharacterChangeInfoExtract.builder()
list.add(CharacterVo.builder()
.updateDesc(temp.get("updateDesc") != null ? temp.get("updateDesc").toString() : "")
.dutyOriginal(temp.get("oriStation") != null ? temp.get("oriStation").toString() : "")
.duty(temp.get("curStation") != null ? temp.get("curStation").toString() : "")
......@@ -99,7 +100,8 @@ public class DealLeaderDataService {
if (!list.isEmpty()) {
try {
log.info("inserting");
characterChangeInfoExtractService.saveBatch(list);
//todo saveBatch
characterInfoService.add(list.get(0));
}catch (Exception e){
log.error("异常：{}",e.getMessage());
}
......
src/main/java/com/zzsn/leaderbase/service/ICharacterChangeInfoExtractService.java deleted 100644 → 0
package com.zzsn.leaderbase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
/**
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
public interface ICharacterChangeInfoExtractService extends IService<CharacterChangeInfoExtract> {
}
src/main/java/com/zzsn/leaderbase/service/impl/CharacterChangeInfoExtractServiceImpl.java deleted 100644 → 0
package com.zzsn.leaderbase.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import com.zzsn.leaderbase.mapper.CharacterChangeInfoExtractMapper;
import com.zzsn.leaderbase.service.ICharacterChangeInfoExtractService;
import org.springframework.stereotype.Service;
/**
* @Description: 信息
* @Author: jeecg-boot
* @Date: 2024-02-29
* @Version: V1.0
*/
@Service
public class CharacterChangeInfoExtractServiceImpl extends ServiceImpl<CharacterChangeInfoExtractMapper, CharacterChangeInfoExtract> implements ICharacterChangeInfoExtractService {
}
src/main/java/com/zzsn/leaderbase/vo/CharacterVo.java
package com.zzsn.leaderbase.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
......@@ -16,6 +19,9 @@ import java.util.Date;
* 人物职务变更信息，只有再点击变更时再历史表中记录，只修改时不记录
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class CharacterVo {
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论