From 6b36599c6bd372a5cce5e078c2f4e4cb9e2ee36a Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 13 十二月 2023 19:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 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 e1610e4..6bd3d9e 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
@@ -7,10 +7,11 @@
 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.BaseWarehouseService;
 import com.consum.base.service.LWhWarningConfigServiceImpl;
 import com.consum.model.po.BaseWarehouse;
 import com.consum.model.po.FinSysTenantUser;
@@ -22,18 +23,6 @@
 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;
@@ -43,6 +32,21 @@
 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;
 
 /**
  * @ClassName LWhWarningConfigController
@@ -59,7 +63,7 @@
     @Resource
     private LWhWarningConfigServiceImpl lWhWarningConfigService;
     @Resource
-    private BaseWarehouseServiceImpl baseWarehouseService;
+    private BaseWarehouseService baseWarehouseService;
     private ObjectMapper mapper = new ObjectMapper();
 
     /**
@@ -123,7 +127,7 @@
                 return ResponseValue.error("搴撳瓨涓婇檺涓嶈兘灏忎簬涓嬮檺锛�");
             }
             WhWarningConfig whWarningConfig = new WhWarningConfig();
-            whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+            whWarningConfig.setId(IdUtil.generateId());
             whWarningConfig.setWarehouseType(0);
             whWarningConfig.setBaseWarehouseId(baseWarehouseId);
             whWarningConfig.setBaseGoodsTemplateId(baseGoodsTemplateId);
@@ -222,7 +226,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");
@@ -299,7 +303,7 @@
                 for (WarnConfImEntity warnConfImEntity : houseModelList) {
                     // 鏂板
                     WhWarningConfig whWarningConfig = new WhWarningConfig();
-                    whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+                    whWarningConfig.setId(IdUtil.generateId());
                     whWarningConfig.setWarehouseType(0);
                     whWarningConfig.setBaseWarehouseId(warnConfImEntity.getBaseWarehouseId());
                     whWarningConfig.setBaseGoodsTemplateId(warnConfImEntity.getGoodsTemplateId());
@@ -332,7 +336,7 @@
                         limitEditByModeInfo(whWarningConfig);
                     } else {
                         // 鏂板
-                        whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+                        whWarningConfig.setId(IdUtil.generateId());
                         whWarningConfig.setBaseGoodsTemplateId(warnConfImEntity.getGoodsTemplateId());
                         if (whWarningConfig.getBaseGoodsModelsId() == null) {
                             whWarningConfig.setGoodsType(1);

--
Gitblit v1.9.1