From e5a96bc789ca0252e31fd2e01bec5e471a02c0d6 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期四, 22 五月 2025 17:57:29 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java index 3e6c84b..99f01a4 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWeldSeamStandardJobServiceImpl.java @@ -1,5 +1,6 @@ package com.aps.job.service.impl; +import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -95,6 +96,7 @@ public boolean syncWeldSeamStandardData() { try { + log.info("寮�濮嬪悓姝ョ墿鏂欐爣鍑嗙剨缂濇暟鎹�"); // 浣跨敤POST鏂规硶璋冪敤鎺ュ彛 HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); @@ -174,23 +176,32 @@ if (jobList.isEmpty()) { return false; } - + log.info("娓呯┖鏃ф暟鎹� deleteAllApsWeldSeamStandardJob"); // 娓呯┖鏃ф暟鎹� deleteAllApsWeldSeamStandardJob(); // 鎵归噺鎻掑叆鏂版暟鎹� - batchInsertApsWeldSeamStandardJob(jobList); - + List<List<ApsWeldSeamStandardJob>> dataGroup = ListUtil.split(jobList, 1000); + for (List<ApsWeldSeamStandardJob> data : dataGroup) { + batchInsertApsWeldSeamStandardJob(data); + } + + // 鍒犻櫎涓氬姟琛ㄦ暟鎹紙鍏ㄩ噺瑕嗙洊锛� + deleteAllApsWeldSeamStandard(); // 鍚屾鏁版嵁鍒颁笟鍔¤〃 - syncToBizTable(jobList); - + for (List<ApsWeldSeamStandardJob> data : dataGroup) { + syncToBizTable(data); + } return true; } catch (Exception e) { log.error("鍚屾鐗╂枡鏍囧噯鐒婄紳鏁版嵁寮傚父", e); throw e; } } - + + private void deleteAllApsWeldSeamStandard() { + apsWeldSeamStandardMapper.deleteAllApsWeldSeamStandard(); + } /** * 鍚屾鏁版嵁鍒颁笟鍔¤〃 * @@ -198,9 +209,6 @@ */ private void syncToBizTable(List<ApsWeldSeamStandardJob> jobList) { try { - // 鍒犻櫎涓氬姟琛ㄦ暟鎹紙鍏ㄩ噺瑕嗙洊锛� - apsWeldSeamStandardMapper.deleteAllApsWeldSeamStandard(); - if (jobList == null || jobList.isEmpty()) { return; } -- Gitblit v1.9.3