commit temp

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

@@ -50,54 +50,62 @@ public class DealLeaderDataService {
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         BoolQueryBuilder boolQueryBuilder1 = QueryBuilders.boolQuery()
                 .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);
         searchSourceBuilder.sort("createDate", SortOrder.DESC);
 
-        Integer pagesize = 1;
+        Integer pagesize =5;
         for (int i = 1; true; i++) {
             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);
-                log.info("request");
-                String result = HttpUtil.doPost(relationEntityUrl, jsonObjectParam, 40000);
-                log.info("response:{}",result);
-                Object objectResult = parseResult(result);
-                JSONArray dataResultList = null;
-                if (null != objectResult) {
-                    dataResultList = (JSONArray) JSONArray.parse(objectResult.toString());
-                }
-                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());
+
+                for (InfoExtractionParam record : records) {
+                    List<CharacterChangeInfoExtract> list = new ArrayList<>();
+                    Map<String, List<InfoExtractionParam>> map = new HashMap<>();
+                    map.put("data_list", Collections.singletonList(record));
+                    jsonObjectParam.put("data", map);
+                    log.info("request");
+                    String result = HttpUtil.doPost(relationEntityUrl, jsonObjectParam, 40000);
+                    log.info("response:{}", result);
+                    Object objectResult = parseResult(result);
+                    JSONArray dataResultList = null;
+                    if (null != objectResult) {
+                        dataResultList = (JSONArray) JSONArray.parse(objectResult.toString());
+                    }
+                    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() : "")
+                                            .articleId(dataResult.get("id") != null ? dataResult.get("id").toString() : "")
+                                            .build());
+                                }
+                            }
                         }
                     }
+                    if (!list.isEmpty()) {
+                        try {
+                            log.info("inserting");
+                            characterChangeInfoExtractService.saveBatch(list);
+                        }catch (Exception e){
+                            log.error("异常：{}",e.getMessage());
+                        }
+
                     }
                 }
-                if(!list.isEmpty()){
-                    characterChangeInfoExtractService.saveBatch(list);
-                }
-
 
             } else {
                 log.info("此轮数据处理完毕============================================");