From e75d48a23c2bb7da64c86996392c5248bcdb5749 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 6 Dec 2022 00:06:47 +0800 Subject: [PATCH] =?UTF-8?q?base-ui=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=EF=BC=8CSAX=E8=AF=BB=E5=8F=96xlsx=E4=BC=A0-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-ui/src/layout/components/AppMain.vue | 4 +- base-ui/src/views/kucun/kcxxcx/index.vue | 34 +++++++++++++++-- .../supervise-portal-biz/pom.xml | 37 ++++++++++++++----- .../supervise/portal/PortalApplication.java | 4 +- .../biz/gdinventory/GdInventoryRest.java | 20 +++++++--- .../biz/gdinventory/GdInventoryService.java | 34 +++++++++++++++++ .../supervise/portal/extexcel/CsvTool.java | 5 +++ .../src/main/resources/application-devv.yml | 12 +++--- .../src/main/resources/application.yml | 28 +++++++------- yxt_supervise/supervise-supplychain/pom.xml | 8 ++-- 10 files changed, 139 insertions(+), 47 deletions(-) diff --git a/base-ui/src/layout/components/AppMain.vue b/base-ui/src/layout/components/AppMain.vue index 966c6c40..90e9fa15 100644 --- a/base-ui/src/layout/components/AppMain.vue +++ b/base-ui/src/layout/components/AppMain.vue @@ -28,8 +28,8 @@ export default { height: calc(100vh - 140px); position: relative; background-color: #FFFFFF; - /* margin-left:10px; */ - /*padding: 0 20px;*/ +/* margin-left:10px; */ + padding: 20px; overflow-x: hidden; overflow-y: hidden; } diff --git a/base-ui/src/views/kucun/kcxxcx/index.vue b/base-ui/src/views/kucun/kcxxcx/index.vue index d3b83ce2..215cbb7a 100644 --- a/base-ui/src/views/kucun/kcxxcx/index.vue +++ b/base-ui/src/views/kucun/kcxxcx/index.vue @@ -1,8 +1,23 @@ @@ -12,7 +27,9 @@ export default { // components: { }, data() { return { - name: '库存数据导入' + updateAction: process.env.VUE_APP_BASE_API + '/kucun/upToCount', + name: '库存数据导入', + fileList: [] } }, created() { @@ -27,6 +44,15 @@ export default { // 返回 handleReturn() { this.$router.go(-1) + }, + submitUpload() { + this.$refs.upload.submit() + }, + handleRemove(file, fileList) { + console.log(file, fileList) + }, + handlePreview(file) { + console.log(file) } } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml index b5b9c0e7..b790ea38 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml @@ -20,6 +20,25 @@ com.yxt yxt-common-base 0.0.1 + + + + + + + + + + + + + + + + + + + supervise-portal-api @@ -27,10 +46,10 @@ 0.0.1-SNAPSHOT - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + mysql @@ -116,11 +135,11 @@ - - xerces - xercesImpl - 2.12.2 - + + + + + diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java index 59a8a79c..152ab641 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java @@ -10,8 +10,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.supervise.portal" }) -@EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.supervise.*"}) +// @EnableDiscoveryClient +// @EnableFeignClients(basePackages = {"com.yxt.supervise.*"}) public class PortalApplication { public static void main(String[] args) { SpringApplication.run(PortalApplication.class, args); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java index 10dbc310..f076203e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java @@ -25,11 +25,13 @@ *********************************************************/ package com.yxt.supervise.portal.biz.gdinventory; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.Console; /** * Project: yxt_supervise
@@ -45,13 +47,13 @@ import org.springframework.web.bind.annotation.RestController; * @since 1.0 */ @RestController("com.yxt.supervise.portal.biz.gdinventory.GdInventoryRest") -@RequestMapping("/gd") +@RequestMapping("/kucun") public class GdInventoryRest { @Autowired private GdInventoryService gdInventoryService; - @GetMapping("/implInventory") + @GetMapping("/implgd") public ResultBean implInventory() { gdInventoryService.doCheck(); @@ -61,4 +63,12 @@ public class GdInventoryRest { // gdInventoryService.importFromXlsx("D:/works/projects/javaee/lzh/niejinyi/yunyan/docs/sheji/wx20221202/汇融银行_库存信息查询.xlsx"); return ResultBean.fireSuccess(); } + + @PostMapping("/upToCount") + public ResultBean upToCount(@RequestParam("file") MultipartFile file) { + System.out.println("ffffff"); + ResultBean rb = gdInventoryService.importAndCount(file); + return ResultBean.fireSuccess(); + } + } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java index 90d3b408..b04154a8 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java @@ -28,18 +28,24 @@ package com.yxt.supervise.portal.biz.gdinventory; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.csv.*; +import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.sax.handler.RowHandler; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.FileUploadResult; +import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.portal.biz.storeindex.StoreIndexService; import com.yxt.supervise.portal.extexcel.CsvTool; import com.yxt.supervise.portal.extexcel.ExcelTool; import org.apache.poi.ss.usermodel.CellStyle; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.Charset; import java.nio.file.Paths; import java.util.ArrayList; @@ -67,6 +73,8 @@ public class GdInventoryService extends ServiceImpl fub = fileUploadComponent.uploadFile(file); + String filePath = fub.getData().getFilePath(); + String fp = fileUploadComponent.getUploadPath() + filePath; + + long millis = System.currentTimeMillis(); + // InputStream inputStream = null; + // try { + // inputStream = file.getInputStream(); + // } catch (IOException e) { + // throw new RuntimeException(e); + // } + ExcelUtil.read07BySax(fp, -1, createRowHandler()); + // ExcelReader reader = ExcelUtil.getReader(fp); + // int rowCount = reader.getRowCount(); + // for (int i = 0; i < rowCount; i++) { + // List objList = reader.readRow(i); + // System.out.println("" + i + " , " + objList.toString()); + // } + + + System.out.println("用时:" + (System.currentTimeMillis() - millis)); + return ResultBean.fireSuccess(); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/CsvTool.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/CsvTool.java index 34d4a334..35c4180b 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/CsvTool.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/CsvTool.java @@ -57,6 +57,7 @@ public class CsvTool { } return rs; } + public static double readDouble(CsvRow row, int col) { String s = row.get(col); if (StringUtils.isBlank(s)) @@ -69,6 +70,7 @@ public class CsvTool { } return rs; } + public static int readIntegerFastCsv(de.siegmar.fastcsv.reader.CsvRow row, int col) { String s = row.getField(col); if (StringUtils.isBlank(s)) @@ -81,6 +83,7 @@ public class CsvTool { } return rs; } + public static double readDoubleFastCsv(de.siegmar.fastcsv.reader.CsvRow row, int col) { String s = row.getField(col); if (StringUtils.isBlank(s)) @@ -93,6 +96,7 @@ public class CsvTool { } return rs; } + public static int readIntegerJavaCsv(com.csvreader.CsvReader row, int col) throws IOException { String s = row.get(col); if (StringUtils.isBlank(s)) @@ -105,6 +109,7 @@ public class CsvTool { } return rs; } + public static double readDoubleJavaCsv(com.csvreader.CsvReader row, int col) throws IOException { String s = row.get(col); if (StringUtils.isBlank(s)) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml index 5567f4f2..6b3b809f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-devv.yml @@ -4,10 +4,10 @@ spring: url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true username: root password: root - cloud: - nacos: - discovery: - server-addr: 127.0.0.1:8848 +# cloud: +# nacos: +# discovery: +# server-addr: 127.0.0.1:8848 redis: database: 3 # Redis数据库索引（默认为0） host: 127.0.0.1 @@ -23,10 +23,10 @@ spring: image: upload: - path: D:\\supervise\\upload\\ + path: D:/supervise/upload/ url: prefix: http://127.0.0.1:7003/upload/ login: - path: D:\\images\\pic-click + path: D:/images/pic-click diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 704c366d..ad2764b0 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -19,8 +19,6 @@ spring: async: request-timeout: 20000 - - server: port: 7003 max-http-header-size: 102400 @@ -51,19 +49,19 @@ logging: demojar: mapper: DEBUG #hystrix的超时时间 -hystrix: - command: - default: - execution: - timeout: - enabled: true - isolation: - thread: - timeoutInMilliseconds: 30000 -#ribbon的超时时间 -ribbon: - ReadTimeout: 30000 - ConnectTimeout: 30000 +#hystrix: +# command: +# default: +# execution: +# timeout: +# enabled: true +# isolation: +# thread: +# timeoutInMilliseconds: 30000 +##ribbon的超时时间 +#ribbon: +# ReadTimeout: 30000 +# ConnectTimeout: 30000 diff --git a/yxt_supervise/supervise-supplychain/pom.xml b/yxt_supervise/supervise-supplychain/pom.xml index c1c4ec3f..bd0520cd 100644 --- a/yxt_supervise/supervise-supplychain/pom.xml +++ b/yxt_supervise/supervise-supplychain/pom.xml @@ -40,10 +40,10 @@ yxt-common-base 0.0.1 - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + mysql