From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index bb83f02..91b671b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -1,40 +1,5 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import cn.hutool.core.convert.Convert;
-import com.consum.base.BaseController;
-import com.consum.base.config.WhWarningImportVerifyHandler;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.base.pojo.WarnConfImEntity;
-import com.consum.base.pojo.WhWarningConfigParam;
-import com.consum.base.pojo.query.WhWarningConfigQry;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.LWhWarningConfigServiceImpl;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.WhWarningConfig;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.walker.db.page.GenericPager;
-import com.walker.file.FileInfo;
-import com.walker.infrastructure.utils.NumberGenerator;
-import com.walker.web.ResponseCode;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -44,6 +9,48 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.handler.WhWarningImportVerifyHandler;
+import com.consum.base.pojo.WarnConfImEntity;
+import com.consum.base.pojo.WhWarningConfigParam;
+import com.consum.base.pojo.query.WhWarningConfigQry;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LWhWarningConfigService;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.WhWarningConfig;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.walker.db.page.GenericPager;
+import com.walker.file.FileInfo;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.web.ResponseCode;
+import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import cn.hutool.core.convert.Convert;
+import io.swagger.annotations.Api;
/**
* @ClassName LWhWarningConfigController
@@ -58,9 +65,9 @@
public class LWhWarningConfigController extends BaseController {
@Resource
- private LWhWarningConfigServiceImpl lWhWarningConfigService;
+ private LWhWarningConfigService lWhWarningConfigService;
@Resource
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
private ObjectMapper mapper = new ObjectMapper();
/**
@@ -223,7 +230,7 @@
* @return 鑾峰彇椤圭洰瀵煎叆鐨勬ā鏉�
* @throws IOException
*/
- @PostMapping("getWarnConfImportTemplate")
+ @GetMapping("getWarnConfImportTemplate")
public ResponseEntity<InputStreamResource> getProjectImportTemplate() throws IOException {
// 浠庡綋鍓嶉」鐩祫婧愮洰褰曡幏鍙栨枃浠�
org.springframework.core.io.Resource resource = new ClassPathResource("import/warningConfImp.xls");
--
Gitblit v1.9.1