From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/config/InitConfig.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/lf/server/config/InitConfig.java b/src/main/java/com/lf/server/config/InitConfig.java
index bc8219d..b4dbeb5 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -17,6 +17,7 @@
import com.lf.server.service.show.LocateService;
import com.lf.server.service.sys.ArgsService;
import com.lf.server.service.sys.BlacklistService;
+import com.lf.server.service.sys.ReportService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,9 @@
@Autowired
Environment env;
+
+ @Autowired
+ ReportService reportService;
@Override
public void run(ApplicationArguments args) {
@@ -205,7 +209,7 @@
}
private void testReadExcel() {
- List<MdZxcgEntity> listMdZxcg = ExcelHelper.readExcel(MdZxcgEntity.class, "D:\\LF\\data\\xls\\娴嬬粯\\1-椤圭洰鎴愭灉-瑗夸笁涓璡\1-1涓嚎鎴愭灉琛╘\娴峰師鍘夸腑绾挎垚鏋滆〃.xlsx");
+ List<?> listMdZxcg = ExcelHelper.readExcel(MdzxcgEntity.class, "D:\\LF\\data\\xls\\娴嬬粯\\1-椤圭洰鎴愭灉-瑗夸笁涓璡\1-1涓嚎鎴愭灉琛╘\娴峰師鍘夸腑绾挎垚鏋滆〃.xlsx");
int r1 = listMdZxcg.size();
//List<MdGdcgEntity> listGdcg = ExcelHelper.readExcel(MdGdcgEntity.class, "D:\\LF\\data\\xls\\娴嬬粯\\2-鍦颁笅绠＄嚎鎺㈡祴鎴愭灉\\2-2 绠＄嚎鎴愭灉琛�.xlsx");
--
Gitblit v1.9.3