From a8ba678a3fe5a39da2c732014cebbb66e408e97c Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期三, 02 四月 2025 18:45:12 +0800
Subject: [PATCH] 问题与漏洞修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 98 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 1a90e83..44e7ae3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -6,8 +6,7 @@
import java.util.Objects;
import java.util.Optional;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,7 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
@@ -39,18 +38,13 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
/**
* @Description 鐩樼偣
* @Author 鍗㈠簡闃�
* @Date 2023/10/23
*/
-@Api(value = "鐩樼偣", tags = "鐩樼偣")
+// @Api(value = "鐩樼偣", tags = "鐩樼偣")
@RestController
@RequestMapping("/pc/l/wh/form/inventory")
public class LWhFormInventoryController extends BaseController {
@@ -58,15 +52,15 @@
@Autowired
private LWhFormInventoryService lWhFormInventoryService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @Description 鏂板
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- @ApiOperation(value = "鏂板鐩樼偣", notes = "鏂板鐩樼偣")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
+ // @ApiOperation(value = "鏂板鐩樼偣", notes = "鏂板鐩樼偣")
+ // @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
@PostMapping("/add")
public ResponseValue add() {
@@ -84,7 +78,7 @@
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
finSysTenantUser.setSysUserId(param.getOperatorUserId());
FinSysTenantUser operatorUser =
- finSysTenantUserService.select(finSysTenantUser).stream().findFirst().orElse(null);
+ finSysTenantUserService.select(finSysTenantUser).stream().findFirst().orElse(null);
// 鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
@@ -101,9 +95,9 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- @ApiOperation(value = "鐩樼偣鍗曞垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曞垪琛ㄦ煡璇�")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
- required = true, paramType = "query")})
+ // @ApiOperation(value = "鐩樼偣鍗曞垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曞垪琛ㄦ煡璇�")
+ // @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
+ // required = true, paramType = "query")})
@GetMapping("/list")
public ResponseValue queryList() {
LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
@@ -119,10 +113,32 @@
return ResponseValue.success(pager);
}
- @ApiOperation(value = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", response = FormInventoryVO.class)
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
- @ApiResponse(code = 200, message = "鎴愬姛", response = FormInventoryVO.class)
+ /**
+ * 鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�
+ *
+ * @return
+ */
+ // @ApiOperation(value = "鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�", notes = "鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�")
+// @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
+// required = true, paramType = "query")})
+ @GetMapping("/isAddInventory")
+ public ResponseValue isAddInventory() {
+ LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
+ LWhFormInventoryQry param2 = new LWhFormInventoryQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ Integer res = lWhFormInventoryService.isAddInventory(param, sysInfo);
+ return ResponseValue.success(res);
+ }
+
+ // @ApiOperation(value = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", response = FormInventoryVO.class)
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+// @ApiResponse(code = 200, message = "鎴愬姛", response = FormInventoryVO.class)
@GetMapping("/query")
public ResponseValue queryInventBaseGoodTemplate(Long id) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -145,8 +161,8 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- @ApiOperation(value = "缂栬緫鐩樼偣", notes = "缂栬緫鐩樼偣")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
+ // @ApiOperation(value = "缂栬緫鐩樼偣", notes = "缂栬緫鐩樼偣")
+ // @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
@PostMapping("/edit")
public ResponseValue edit() {
FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class);
@@ -186,9 +202,9 @@
/**
* @Description 鏍规嵁id鍒犻櫎
*/
- @ApiOperation(value = "鏍规嵁id鍒犻櫎鐩樼偣", notes = "鏍规嵁id鍒犻櫎鐩樼偣")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+ // @ApiOperation(value = "鏍规嵁id鍒犻櫎鐩樼偣", notes = "鏍规嵁id鍒犻櫎鐩樼偣")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@DeleteMapping("/del")
public ResponseValue delById(Long id) {
if (id == null) {
@@ -215,8 +231,8 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
- @ApiOperation(value = "鐩樼偣鏆傚瓨", notes = "鐩樼偣鏆傚瓨")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
+ // @ApiOperation(value = "鐩樼偣鏆傚瓨", notes = "鐩樼偣鏆傚瓨")
+ // @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
@PostMapping("/temporary/storage")
public ResponseValue updateTemporaryStorage() {
LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
@@ -238,8 +254,8 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
- @ApiOperation(value = "瀹屾垚鐩樼偣", notes = "瀹屾垚鐩樼偣")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
+ // @ApiOperation(value = "瀹屾垚鐩樼偣", notes = "瀹屾垚鐩樼偣")
+ // @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
@PostMapping("/finish")
public ResponseValue updateFinishPd() {
LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
@@ -262,9 +278,9 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/1
*/
- @ApiOperation(value = "寮傚父鏄庣粏鍒楄〃鏌ヨ", notes = "寮傚父鏄庣粏鍒楄〃鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")})
+ // @ApiOperation(value = "寮傚父鏄庣粏鍒楄〃鏌ヨ", notes = "寮傚父鏄庣粏鍒楄〃鏌ヨ")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")})
@GetMapping("/list/PdDetail")
public ResponseValue queryPdDetailList() {
LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
@@ -280,9 +296,9 @@
return ResponseValue.success(result);
}
- @ApiOperation(value = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅", notes = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣id", dataType = "Long", required = true, paramType = "query")})
+ // @ApiOperation(value = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅", notes = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "id", value = "鐩樼偣id", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/detail")
public ResponseValue selectDetailById(Long id) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -303,11 +319,11 @@
return ResponseValue.success(formInventoryVO);
}
- @ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+ // @ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -329,8 +345,8 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
-
- downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
--
Gitblit v1.9.1