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 | 112 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 41 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 783f3de..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,39 +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.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;
@@ -43,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
@@ -57,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();
/**
@@ -68,6 +76,10 @@
@PostMapping("/add")
public ResponseValue add() throws Exception {
WhWarningConfigParam param = CommonUtil.getObjFromReqBody(WhWarningConfigParam.class);
+ WhWarningConfigParam param2 = new WhWarningConfigParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
String modelConfigStr = param.getModelConfigStr();
Long baseWarehouseId = param.getBaseWarehouseId();
Long baseGoodsTemplateId = param.getBaseGoodsTemplateId();
@@ -119,7 +131,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);
@@ -144,6 +156,10 @@
@PostMapping("/upd")
public ResponseValue upd() {
WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+ WhWarningConfig param2 = new WhWarningConfig();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
if (param.getId() == null || (param.getUpperLimit() == null && param.getLowerLimit() == null)) {
return ResponseValue.error("搴撳瓨涓婇檺銆佷笅闄愪笉鑳藉叏涓虹┖锛�");
}
@@ -160,6 +176,9 @@
@DeleteMapping("del")
public ResponseValue delById() {
WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+ WhWarningConfig param2 = new WhWarningConfig();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
if (param.getId() == null) {
return ResponseValue.error("id涓虹┖");
}
@@ -170,6 +189,9 @@
@GetMapping("/getList")
public ResponseValue getConfigList() {
WhWarningConfigQry param = CommonUtil.getObjFromReq(WhWarningConfigQry.class);
+ WhWarningConfigQry param2 = new WhWarningConfigQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
/*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
FinSysTenantUser sysInfo = this.getSysInfo();
String tenantId = sysInfo.getTenantId();
@@ -184,12 +206,20 @@
@GetMapping("/getById")
public ResponseValue getById() {
WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+ WhWarningConfig param2 = new WhWarningConfig();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
WhWarningConfig whWarningConfig = lWhWarningConfigService.get(param);
return ResponseValue.success(whWarningConfig);
}
@GetMapping("/getConfigList")
- public ResponseValue getConfigList(WhWarningConfig param) {
+ public ResponseValue getWarnConfigList() {
+ WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+ WhWarningConfig param2 = new WhWarningConfig();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
if (param.getBaseWarehouseId() == null || param.getWarehouseType() == null || (param.getBaseGoodsModelsId() == null || param.getBaseGoodsTemplateId() == null)) {
return ResponseValue.error("缂哄皯蹇呰鍙傛暟");
}
@@ -200,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");
@@ -277,7 +307,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());
@@ -310,7 +340,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