From 18877546c8e7fa36c537fe7f9cfc07e7ac6e7654 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 14:00:05 +0800
Subject: [PATCH] 修改模板下载
---
admin-web/src/views/systemManger/org/index.vue | 2
deploy-jar-single/src/main/resources/import/物品信息.xls | 0
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 152 ++++++++++++++++++++++----------------------------
admin-web/src/views/foundation/material/index.vue | 2
4 files changed, 70 insertions(+), 86 deletions(-)
diff --git a/admin-web/src/views/foundation/material/index.vue b/admin-web/src/views/foundation/material/index.vue
index b38160b..7317e74 100644
--- a/admin-web/src/views/foundation/material/index.vue
+++ b/admin-web/src/views/foundation/material/index.vue
@@ -118,7 +118,7 @@
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=goods' // 涓嬭浇鍦板潃
},
onSuccess: null
},
diff --git a/admin-web/src/views/systemManger/org/index.vue b/admin-web/src/views/systemManger/org/index.vue
index 10a61eb..fd390d2 100644
--- a/admin-web/src/views/systemManger/org/index.vue
+++ b/admin-web/src/views/systemManger/org/index.vue
@@ -70,7 +70,7 @@
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=tenant' // 涓嬭浇鍦板潃
},
onSuccess: null
},
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index bdfe0a0..ece10af 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -1,5 +1,32 @@
package com.consum.base.controller;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
@@ -18,34 +45,10 @@
import com.walker.infrastructure.tree.TreeNode;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
/**
* @Description 鍖哄垝
@@ -231,7 +234,7 @@
while (var3.hasNext()) {
Object obj = var3.next();
- node = this.toTreeNode((FinSysTenant) obj);
+ node = this.toTreeNode((FinSysTenant)obj);
if (node.getId() == this.defaultParentId) {
this.rootMap.put(node.getId(), node);
@@ -251,7 +254,7 @@
var3 = this.rootMap.values().iterator();
while (var3.hasNext()) {
- TreeNode n = (TreeNode) var3.next();
+ TreeNode n = (TreeNode)var3.next();
n.setParentId(this.defaultParentId);
this.dummyRoot.addChild(n);
}
@@ -266,16 +269,16 @@
Iterator i = childMap.values().iterator();
while (i.hasNext()) {
- _node = (TreeNode) i.next();
+ _node = (TreeNode)i.next();
this.mountMiddleNode(_node, childMap);
}
}
private void mountMiddleNode(TreeNode currentNode, Map<Long, TreeNode> childMap) {
- TreeNode _parentNode = (TreeNode) this.rootMap.get(currentNode.getParentId());
+ TreeNode _parentNode = (TreeNode)this.rootMap.get(currentNode.getParentId());
if (_parentNode == null) {
- _parentNode = (TreeNode) childMap.get(currentNode.getId());
+ _parentNode = (TreeNode)childMap.get(currentNode.getId());
if (_parentNode == null) {
throw new NullPointerException("parent node not found, current: " + currentNode);
}
@@ -290,7 +293,7 @@
protected TreeNode toTreeNode(FinSysTenant entity) {
TreeNode treeNode =
- new TreeNode(entity.getId(), entity.getName(), (List) null, entity.getParentId(), entity.getCode());
+ new TreeNode(entity.getId(), entity.getName(), (List)null, entity.getParentId(), entity.getCode());
return treeNode;
}
@@ -302,7 +305,7 @@
Iterator var2 = this.rootMap.values().iterator();
while (var2.hasNext()) {
- TreeNode node = (TreeNode) var2.next();
+ TreeNode node = (TreeNode)var2.next();
list.add(node);
}
return list;
@@ -324,7 +327,8 @@
if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) {
whStr.append(" and name is not null and(");
String upperCase = param.getFirstZmS().toUpperCase();
- whStr.append("instr(:upperFirstZmS,F_PINYIN( SUBSTR(name, 1, 1)))>0 or instr(:upperFirstZmS2,SUBSTR(name, 1, 1))>0");
+ whStr.append(
+ "instr(:upperFirstZmS,F_PINYIN( SUBSTR(name, 1, 1)))>0 or instr(:upperFirstZmS2,SUBSTR(name, 1, 1))>0");
parameter.put("upperFirstZmS", upperCase);
parameter.put("upperFirstZmS2", upperCase);
whStr.append(")");
@@ -333,7 +337,6 @@
List<FinSysTenant> select = this.finSysTenantService.select(new FinSysTenant(), whStr.toString(), parameter);
return ResponseValue.success(select);
}
-
/**
* 鍒犻櫎
@@ -394,50 +397,27 @@
}
@GetMapping("getImportTemplate")
- public ResponseEntity<InputStreamResource> getImportTemplate() throws IOException {
+ public ResponseEntity<InputStreamResource> getImportTemplate(String type) throws IOException {
// 浠庡綋鍓嶉」鐩祫婧愮洰褰曡幏鍙栨枃浠�
- Resource resource = new ClassPathResource("import/鏈烘瀯瀵煎叆妯℃澘.xls");
+ String fileName = null;
+ if ("tenant".equals(type)) {
+ fileName = "鏈烘瀯瀵煎叆妯℃澘.xls";
+ } else if ("goods".equals(type)) {
+ fileName = "鐗╁搧淇℃伅.xls";
+ }
+ Resource resource = new ClassPathResource("import/" + fileName);
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = resource.getInputStream();
// 璁剧疆HTTP鍝嶅簲澶�
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- String encodedFilename = URLEncoder.encode("鏈烘瀯瀵煎叆妯℃澘.xls", "UTF-8");
+ String encodedFilename = URLEncoder.encode(fileName, "UTF-8");
headers.setContentDispositionFormData("attachment", encodedFilename);
// 鍒涘缓InputStreamResource瀵硅薄锛屽皢鏂囦欢杈撳叆娴佸寘瑁呰捣鏉�
InputStreamResource resourceToDownload = new InputStreamResource(inputStream);
// 杩斿洖甯︽湁鏂囦欢杈撳叆娴佺殑ResponseEntity瀵硅薄
- return ResponseEntity
- .status(HttpStatus.OK)
- .headers(headers)
- .body(resourceToDownload);
+ return ResponseEntity.status(HttpStatus.OK).headers(headers).body(resourceToDownload);
}
-
-
- /**
- * @return 鑾峰彇椤圭洰瀵煎叆鐨勬ā鏉�
- * @throws IOException
- */
- @GetMapping("getProjectImportTemplate")
- public ResponseEntity<InputStreamResource> getProjectImportTemplate() throws IOException {
- // 浠庡綋鍓嶉」鐩祫婧愮洰褰曡幏鍙栨枃浠�
- Resource resource = new ClassPathResource("import/椤圭洰瀵煎叆妯℃澘.xls");
- // 鑾峰彇鏂囦欢杈撳叆娴�
- InputStream inputStream = resource.getInputStream();
- // 璁剧疆HTTP鍝嶅簲澶�
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- String encodedFilename = URLEncoder.encode("椤圭洰瀵煎叆妯℃澘.xls", "UTF-8");
- headers.setContentDispositionFormData("attachment", encodedFilename);
- // 鍒涘缓InputStreamResource瀵硅薄锛屽皢鏂囦欢杈撳叆娴佸寘瑁呰捣鏉�
- InputStreamResource resourceToDownload = new InputStreamResource(inputStream);
- // 杩斿洖甯︽湁鏂囦欢杈撳叆娴佺殑ResponseEntity瀵硅薄
- return ResponseEntity
- .status(HttpStatus.OK)
- .headers(headers)
- .body(resourceToDownload);
- }
-
@PostMapping("import")
public ResponseValue upload(@RequestParam Long pid, MultipartFile file) throws IOException {
@@ -466,7 +446,8 @@
throw exception;
}
if (null != finSysTenantService.queryOneByCode(finSysTenantParam.getCode())) {
- throw new IllegalStateException("绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿宸插瓨鍦�");
+ throw new IllegalStateException(
+ "绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿宸插瓨鍦�");
}
if (StringUtils.isEmpty(finSysTenantParam.getName()) || finSysTenantParam.getName().length() > 100) {
IllegalStateException exception = new IllegalStateException(
@@ -488,15 +469,16 @@
public void onException(Exception exception, AnalysisContext context) {
// 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿
if (exception instanceof ExcelDataConvertException) {
- ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
+ ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
- excelDataConvertException.getColumnIndex() + 1, excelDataConvertException.getCellData().getStringValue());
- throw new IllegalStateException(
- "绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�" + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯�,寮傚父鏁版嵁涓�:[ "
- + excelDataConvertException.getCellData().getStringValue() + " ]");
+ excelDataConvertException.getColumnIndex() + 1,
+ excelDataConvertException.getCellData().getStringValue());
+ throw new IllegalStateException("绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�"
+ + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯�,寮傚父鏁版嵁涓�:[ "
+ + excelDataConvertException.getCellData().getStringValue() + " ]");
}
if (exception instanceof IllegalStateException) {
- throw (IllegalStateException) exception;
+ throw (IllegalStateException)exception;
}
}
@@ -527,10 +509,10 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- // FinSysTenant finSysTenant1 = this.finSysTenantService.selectByTenantId(sysInfo.getTenantCode());
-// if (finSysTenant1.getLv() != 1) {
-// return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
-// }
+ // FinSysTenant finSysTenant1 = this.finSysTenantService.selectByTenantId(sysInfo.getTenantCode());
+ // if (finSysTenant1.getLv() != 1) {
+ // return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
+ // }
int num = this.finSysTenantService.updateFinSysTenant(param, this.getSysInfo());
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
@@ -571,7 +553,8 @@
}
// 鐪�
FinSysTenant finSysTenant1 = this.finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList = this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
+ List<FinSysTenantUser> finSysTenantUserList =
+ this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant1.getId());
@@ -592,7 +575,8 @@
}
// 甯�
FinSysTenant finSysTenant2 = this.finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList2 = this.finSysTenantUserService.getByOrgId(finSysTenant2.getId());
+ List<FinSysTenantUser> finSysTenantUserList2 =
+ this.finSysTenantUserService.getByOrgId(finSysTenant2.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList2)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant2.getId());
@@ -602,7 +586,8 @@
}
// 鐪�
FinSysTenant finSysTenant1 = this.finSysTenantService.get(new FinSysTenant(finSysTenant2.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList = this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
+ List<FinSysTenantUser> finSysTenantUserList =
+ this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant1.getId());
@@ -616,8 +601,7 @@
@ApiOperation(value = "鑾峰彇鐖剁骇鏈烘瀯", notes = "鑾峰彇鐖剁骇鏈烘瀯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "Authorization", value = "token", dataType = "String", paramType = "header"),
- })
+ @ApiImplicitParam(name = "Authorization", value = "token", dataType = "String", paramType = "header"),})
@GetMapping("/get/parent/tenant")
public ResponseValue getParentTenant() {
FinSysTenantUser sysInfo = getSysInfo();
@@ -629,7 +613,7 @@
finSysTenant.setTempId(Long.valueOf(tenantId));
FinSysTenant userTenant = this.finSysTenantService.get(finSysTenant);
Long parentId = userTenant.getParentId();
- //绗竴绾�
+ // 绗竴绾�
if (parentId == 0) {
return ResponseValue.success(userTenant);
} else {
diff --git "a/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls" "b/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls"
new file mode 100644
index 0000000..9c7709e
--- /dev/null
+++ "b/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls"
Binary files differ
--
Gitblit v1.9.1