Skip to content

L
leader-base
提交 89a7ddee 作者: chenshiqiang
操作

commit

上级 a30a9c26
正在显示 包含 240 行增加 和 15 行删除
src/main/java/com/zzsn/leaderbase/config/TaskExecutor.java
......@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit;
@Component
public class TaskExecutor implements CommandLineRunner {
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
private final Integer PERIOD=100;
private final Integer PERIOD=10;
@Autowired
private DealLeaderDataService dealLeaderDataService;
......
src/main/java/com/zzsn/leaderbase/entity/CharacterChangeInfoExtract.java 0 → 100644
package com.zzsn.leaderbase.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.*;
import java.util.Date;
/**
* <p>
*5.1 人物变更信息咨询抽取表
* </p>
*
* @since
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("character_change_info_extract")
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class CharacterChangeInfoExtract extends Model<CharacterChangeInfoExtract>
{
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
/**
* 关联人物id
*/
@TableField("uid")
private String uid;
/**
*人物名称
*/
@TableField("name")
private String name;
/**
*原部门 原单位 原企业
*/
@TableField("department_original")
private String departmentOriginal;
/**
*原职务
*/
@TableField("duty_original")
private String dutyOriginal;
/**
*部门 单位 企业(现)
*/
@TableField("department")
private String department;
/**
*职务(现)
*/
@TableField("duty")
private String duty;
/**
*任职时间
*/
@TableField("take_office_status")
private String takeOfficeStatus;
/**
*任职状态
*/
@TableField("take_office_time")
private Date takeOfficeTime;
/**
*变更链接
*/
@TableField("change_url")
private String changeUrl;
/**
*职务变更时间
*/
@TableField("duties_update_time")
private Date dutiesUpdateTime;
/**
*职务变更原因
*/
@TableField("duties_update_reason")
private String dutiesUpdateReason;
/**
*是否审核 1是 0否
*/
@TableField("check_status")
private Integer checkStatus;
/**
*是否审核通过 0未通过 1通过 2待定
*/
@TableField("check")
private Integer check;
/**
*关联资讯id
*/
@TableField("article_id")
private String articleId;
/**
*关联资讯标题
*/
@TableField("article_title")
private String articleTitle;
/**
*变更描述
*/
@TableField("update_desc")
private String updateDesc;
/**
* 创建时间
*/
@TableField("create_time")
private Date createTime;
}
src/main/java/com/zzsn/leaderbase/mapper/CharacterChangeInfoExtractMapper.java 0 → 100644
package com.zzsn.leaderbase.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zzsn.leaderbase.entity.CharacterCategoryStructure;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author obcy
* @since 2024-01-04
*/
@Mapper
public interface CharacterChangeInfoExtractMapper extends BaseMapper<CharacterChangeInfoExtract> {
}
src/main/java/com/zzsn/leaderbase/service/CharacterChangeInfoExtractService.java 0 → 100644
package com.zzsn.leaderbase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zzsn.leaderbase.entity.CharacterCategoryStructure;
import com.zzsn.leaderbase.entity.CharacterChangeInfoExtract;
import com.zzsn.leaderbase.vo.Result;
/**
* <p>
* 服务类
* </p>
*
* @author obcy
* @since 2024-01-04
*/
public interface CharacterChangeInfoExtractService extends IService<CharacterChangeInfoExtract> {
}
src/main/java/com/zzsn/leaderbase/service/DealLeaderDataService.java
package com.zzsn.leaderbase.service;
import cn.hutool.core.collection.CollectionUtil;
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;
......@@ -18,11 +21,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
@Slf4j
......@@ -33,6 +34,8 @@ public class DealLeaderDataService {
private String relationEntityUrl;
@Autowired
RedisTemplate redisTemplate;
@Resource
private CharacterChangeInfoExtractService characterChangeInfoExtractService;
public void getData() throws IOException {
......@@ -46,7 +49,8 @@ public class DealLeaderDataService {
}
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
BoolQueryBuilder boolQueryBuilder1 = QueryBuilders.boolQuery()
.must(QueryBuilders.termsQuery("subjectId", Arrays.asList("1750716233967157250", "1750716067187048450")));
.must(QueryBuilders.termsQuery("subjectId", Arrays.asList("1750716233967157250", "1750716067187048450")))
.must(QueryBuilders.termsQuery("id", Arrays.asList("1750716067187048450284182235652014131")));
boolQueryBuilder1.filter(QueryBuilders.rangeQuery("createDate").gte(EsDateUtil.esFieldDateFormat(startTime)));
searchSourceBuilder.query(boolQueryBuilder1);
......@@ -57,19 +61,41 @@ public class DealLeaderDataService {
Page<InfoExtractionParam> subjectdatabase = esUtil.queryPage("subjectdatabase", searchSourceBuilder, InfoExtractionParam.class, i, pagesize);
List<InfoExtractionParam> records = subjectdatabase.getRecords();
log.info("页码：{},总页：{},总数量{}", i, subjectdatabase.getPages(), subjectdatabase.getTotal());
List<CharacterChangeInfoExtract > list=new ArrayList<>();
if (CollectionUtil.isNotEmpty(records)) {
JSONObject jsonObjectParam = new JSONObject();
Map<String, List<InfoExtractionParam>> map = new HashMap<>();
map.put("data_list", records);
jsonObjectParam.put("data", map);
String result = HttpUtil.doPost(relationEntityUrl, jsonObjectParam, 10000);
log.info("request");
String result = HttpUtil.doPost(relationEntityUrl, jsonObjectParam, 40000);
log.info("response:{}",result);
Object objectResult = parseResult(result);
JSONObject dataResult = null;
JSONArray dataResultList = null;
if (null != objectResult) {
dataResult = JSONObject.parseObject(objectResult.toString());
dataResultList = (JSONArray) JSONArray.parse(objectResult.toString());
}
if (dataResult != null) {
log.info(String.valueOf(dataResult));
if (dataResultList != null) {
for (Object dataResultObject : dataResultList) {
JSONObject dataResult = JSONObject.parseObject(dataResultObject.toString());
if(dataResult.get("infos")!=null){
JSONArray jsonArray= (JSONArray) JSONArray.parse(String.valueOf(dataResult.get("infos")));
for (Object data : jsonArray) {
JSONObject temp = JSONObject.parseObject(data.toString());
list.add(CharacterChangeInfoExtract.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():"")
.name(temp.get("person")!=null?temp.get("person").toString():"")
.articleTitle(dataResult.get("id")!=null?dataResult.get("id").toString():"")
.articleId(dataResult.get("id")!=null?dataResult.get("id").toString():"")
.build());
}
}
}
}
if(!list.isEmpty()){
characterChangeInfoExtractService.saveBatch(list);
}
......@@ -85,8 +111,8 @@ public class DealLeaderDataService {
private Object parseResult(String result) {
JSONObject jsonObject = JSONObject.parseObject(result);
if (null != jsonObject && "200".equals(jsonObject.getString("code"))) {
return jsonObject.get("result");
if (null != jsonObject && "true".equals(jsonObject.getString("isHandleSuccess"))) {
return jsonObject.get("resultData");
}
log.error("python 服务结果异常，响应信息{}", result);
......
src/main/java/com/zzsn/leaderbase/service/impl/CharacterChangeInfoExtractServiceImpl.java 0 → 100644
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.CharacterChangeInfoExtractService;
import org.springframework.stereotype.Service;
/**
* <p>
* 分类树服务实现类
* </p>
*
* @author
* @since
*/
@Service
public class CharacterChangeInfoExtractServiceImpl extends ServiceImpl<CharacterChangeInfoExtractMapper, CharacterChangeInfoExtract> implements CharacterChangeInfoExtractService {
}
src/main/resources/application.yml
......@@ -17,8 +17,8 @@ spring:
password: clbzzsn
port: 6379
python:
# getInfoUrl: http://114.115.130.239:1818/update_extraction/
getInfoUrl: http://192.168.1.116:1818/update_extraction/
getInfoUrl: http://114.115.130.239:1818/update_extraction/
# getInfoUrl: http://192.168.1.116:1818/update_extraction/
es1:
endpoint1: 114.115.215.250
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论