From e441e9925ecc8c46f52de2bf20d472d138c81f70 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 8 Apr 2024 17:34:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7autopoi=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=B01.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot-base/jero-boot-base-core/pom.xml    |  4 +-
 .../impl/PaySpendingContractServiceImpl.java  | 65 +++++++++----------
 .../service/impl/ImportFileServiceImpl.java   |  5 ++
 pom.xml                                       | 23 +++++--
 4 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/pom.xml b/jero-boot-base/jero-boot-base-core/pom.xml
index cfc1be6d..1ccfaceb 100644
--- a/jero-boot-base/jero-boot-base-core/pom.xml
+++ b/jero-boot-base/jero-boot-base-core/pom.xml
@@ -14,7 +14,7 @@
 		<repository>
 			<id>aliyun</id>
 			<name>aliyun Repository</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
+			<url>https://maven.aliyun.com/repository/public</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -22,7 +22,7 @@
 		<repository>
 			<id>jeecg</id>
 			<name>jeecg Repository</name>
-			<url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+			<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index 8a6c7d60..b1ecccaf 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -2,7 +2,6 @@ package com.jero.contract.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -40,7 +39,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1007,37 +1005,38 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
         DecimalFormat df = new DecimalFormat("0.0000");
         String val = "";
-        switch (cell.getCellType()) {
-            case XSSFCell.CELL_TYPE_NUMERIC:
-                if (DateUtil.isCellDateFormatted(cell)) {
-                    val = fmt.format(cell.getDateCellValue()); //日期型
-                } else {
-                    val = df.format(cell.getNumericCellValue()); //数字型
-                    // 去掉多余的0，如最后一位是.则去掉
-                    val = val.replaceAll("0+?$", "").replaceAll("[.]$","");
-                }
-                break;
-            case XSSFCell.CELL_TYPE_STRING: //文本类型
-                val = cell.getStringCellValue();
-                break;
-            case XSSFCell.CELL_TYPE_BOOLEAN: //布尔型
-                val = String.valueOf(cell.getBooleanCellValue());
-                break;
-            case XSSFCell.CELL_TYPE_BLANK: //空白
-                val = cell.getStringCellValue();
-                break;
-            case XSSFCell.CELL_TYPE_ERROR: //错误
-                val = "";
-                break;
-            case XSSFCell.CELL_TYPE_FORMULA: //公式
-                try {
-                    val = String.valueOf(cell.getStringCellValue());
-                } catch (IllegalStateException e) {
-                    val = String.valueOf(cell.getNumericCellValue());
-                }
-                break;
-            default:
-                val = cell.getRichStringCellValue() == null ? null : cell.getRichStringCellValue().toString();
+        CellType cellType = cell.getCellType();
+        if (cellType.equals(CellType.NUMERIC)) {
+            if (DateUtil.isCellDateFormatted(cell)) {
+                val = fmt.format(cell.getDateCellValue()); //日期型
+            } else {
+                val = df.format(cell.getNumericCellValue()); //数字型
+                // 去掉多余的0，如最后一位是.则去掉
+                val = val.replaceAll("0+?$", "").replaceAll("[.]$", "");
+            }
+        } else if (cellType.equals(CellType.STRING)) {
+            //文本类型
+            val = cell.getStringCellValue();
+
+        } else if (cellType.equals(CellType.BOOLEAN)) {
+            //布尔型
+            val = String.valueOf(cell.getBooleanCellValue());
+
+        } else if (cellType.equals(CellType.BLANK)) {
+            //空白
+            val = cell.getStringCellValue();
+        } else if (cellType.equals(CellType.ERROR)) {
+            //错误
+            val = "";
+        } else if (cellType.equals(CellType.FORMULA)) {
+            //公式
+            try {
+                val = String.valueOf(cell.getStringCellValue());
+            } catch (IllegalStateException e) {
+                val = String.valueOf(cell.getNumericCellValue());
+            }
+        } else {
+            val = cell.getRichStringCellValue() == null ? null : cell.getRichStringCellValue().toString();
         }
         return val;
     }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ImportFileServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ImportFileServiceImpl.java
index b4e6e1eb..e483d72a 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ImportFileServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ImportFileServiceImpl.java
@@ -23,4 +23,9 @@ public class ImportFileServiceImpl implements ImportFileServiceI {
     public String doUpload(byte[] data) {
         return CommonUtils.uploadOnlineImage(data, upLoadPath, "import", uploadType);
     }
+
+    @Override
+    public String doUpload(byte[] data, String s) {
+        return CommonUtils.uploadOnlineImage(data, upLoadPath, s, uploadType);
+    }
 }
diff --git a/pom.xml b/pom.xml
index 74329eb5..6f5249e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 		<shiro.version>1.7.1</shiro.version>
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.1.0</shiro-redis.version>
-		<autopoi-web.version>1.2.5</autopoi-web.version>
+		<autopoi-web.version>1.4.7</autopoi-web.version>
 		<minio.version>8.0.3</minio.version>
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
@@ -72,16 +72,16 @@
 			<url>http://maven.hzwlsoft.com:4000/repository/maven-snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
+
 	<repositories>
 		<repository>
-            <id>aliyun</id>
-            <name>aliyun Repository</name>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-            <snapshots>
+			<id>aliyun</id>
+			<name>aliyun Repository</name>
+			<url>https://maven.aliyun.com/repository/public</url>
+			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-        </repository>
+		</repository>
 		<repository>
 			<id>hzwl-maven</id>
 			<name>hzwl-maven</name>
@@ -93,6 +93,15 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+
+		<repository>
+			<id>jeecg</id>
+			<name>jeecg Repository</name>
+			<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 
 	<dependencies>