From aa52854f0a413e153efeea76a952dcf66d76c94a Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 26 六月 2025 20:29:50 +0800
Subject: [PATCH] 设备器件excel导入
---
src/main/java/com/whyc/util/CommonUtil.java | 2 ++
src/main/java/com/whyc/service/DeviceSpareService.java | 30 +++++++++++++++++++++++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/DeviceSpareService.java b/src/main/java/com/whyc/service/DeviceSpareService.java
index f00e1ec..e1c9f05 100644
--- a/src/main/java/com/whyc/service/DeviceSpareService.java
+++ b/src/main/java/com/whyc/service/DeviceSpareService.java
@@ -1,5 +1,6 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -271,9 +272,36 @@
String picUrl = File.separator + filePath.substring(filePath.indexOf(split));
spare.setPictureUrl(picUrl);
}
-
}
+ //鏂板鍒楄〃
+ List<DeviceSpare> spareListNew = new ArrayList<>();
+ //鏇存柊鍒楄〃
+ List<DeviceSpare> spareListUpdate = new ArrayList<>();
+ //鏌ヨ搴撲腑鐨勬墍鏈夎澶囧櫒浠�
+ List<DeviceSpare> deviceSpareListInDB = mapper.selectList((Wrapper<DeviceSpare>) CommonUtil.nullObject);
+ for (DeviceSpare spare : spareList){
+ for (DeviceSpare spareInDB : deviceSpareListInDB){
+ if (spare.getName().equals(spareInDB.getName())
+ && spare.getModel().equals(spareInDB.getModel())
+ && spare.getVersion().equals(spareInDB.getVersion())
+ && spare.getBrand().equals(spareInDB.getBrand())
+ && spare.getType().equals(spareInDB.getType())
+ && spare.getSupplier().equals(spareInDB.getSupplier())
+ ){
+ spare.setId(spareInDB.getId());
+ spare.setQuantity(spareInDB.getQuantity()+spare.getQuantity());
+ if (spare.getPictureUrl() != null && spareInDB.getPictureUrl()!=null){
+ spare.setPictureUrl(spareInDB.getPictureUrl()+","+spare.getPictureUrl());
+ }
+ spareListUpdate.add(spare);
+
+ }else{
+ spareListNew.add(spare);
+ }
+ }
+ }
+ //鏇存柊TODO
//addBatch(spareList);
diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index 26725ac..346a0b5 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -3,6 +3,7 @@
import com.whyc.constant.YamlProperties;
import com.whyc.pojo.db_user.User;
import com.whyc.service.UserLogService;
+import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
@Component
public class CommonUtil {
+ public static Object nullObject = null;
private static UserLogService userLogService;
@Autowired
--
Gitblit v1.9.1