From b76e13d9e4ce2ae87066811b42718fbadc19636e Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 28 May 2025 17:33:42 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1431236432592896]优化工单数据导入接口 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1431236432592896
---
 .../api/processtask/ImportProcessTaskDataApi.java     | 10 +++++++---
 .../process/dao/mapper/ProcessTaskDataMapper.java     |  2 ++
 .../process/dao/mapper/ProcessTaskDataMapper.xml      | 11 +++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/ImportProcessTaskDataApi.java b/src/main/java/neatlogic/module/process/api/processtask/ImportProcessTaskDataApi.java
index 7e2542ffa..bbcce5037 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ImportProcessTaskDataApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ImportProcessTaskDataApi.java
@@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
@@ -67,6 +68,7 @@ public class ImportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
     @Description(desc = "导入工单相关表数据")
     @Override
     public Object myDoService(JSONObject paramObj, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        Map<String, List<Integer>> resultObj = new HashMap<>();
         Long fileId = paramObj.getLong("fileId");
         FileVo fileVo = fileMapper.getFileById(fileId);
         if (fileVo == null) {
@@ -102,7 +104,8 @@ public class ImportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
                                             columnNameList.add(entry1.getKey());
                                             columnValueList.add(entry1.getValue());
                                         }
-                                        processTaskDataMapper.insertOne(tableName, columnNameList, columnValueList);
+                                        int count = processTaskDataMapper.replaceOne(tableName, columnNameList, columnValueList);
+                                        resultObj.computeIfAbsent(tableName, k -> new ArrayList<>()).add(count);
                                     }
                                 } else if (value instanceof JSONArray) {
                                     JSONArray valueArray = (JSONArray) value;
@@ -115,7 +118,8 @@ public class ImportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
                                                 columnNameList.add(entry1.getKey());
                                                 columnValueList.add(entry1.getValue());
                                             }
-                                            processTaskDataMapper.insertOne(tableName, columnNameList, columnValueList);
+                                            int count = processTaskDataMapper.replaceOne(tableName, columnNameList, columnValueList);
+                                            resultObj.computeIfAbsent(tableName, k -> new ArrayList<>()).add(count);
                                         }
                                     }
                                 }
@@ -127,6 +131,6 @@ public class ImportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas
         } catch (IOException e) {
             logger.error(e.getMessage(), e);
         }
-        return null;
+        return resultObj;
     }
 }
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.java
index 728370c31..8f28beac8 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.java
@@ -13,4 +13,6 @@ public interface ProcessTaskDataMapper {
     Long getLong(String sql);
 
     int insertOne(@Param("tableName") String tableName, @Param("columnNameList") List<String> columnNameList, @Param("columnValueList") List<Object> columnValueList);
+
+    int replaceOne(@Param("tableName") String tableName, @Param("columnNameList") List<String> columnNameList, @Param("columnValueList") List<Object> columnValueList);
 }
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.xml
index aaf9044fc..cf8030cec 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/ProcessTaskDataMapper.xml
@@ -38,4 +38,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{columnValue}
         </foreach>
     </insert>
+
+    <insert id="replaceOne">
+        replace into ${tableName}
+        <foreach collection="columnNameList" item="columnName" open="(" separator="," close=")">
+            `${columnName}`
+        </foreach>
+        values
+        <foreach collection="columnValueList" item="columnValue" open="(" separator="," close=")">
+            #{columnValue}
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file
-- 
Gitee