From 89881b5b34a65afa4a93abd9377840751672be56 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 30 十一月 2023 15:10:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index e4ce6b3..f074e93 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -1,20 +1,17 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.model.po.BaseGoodsModels;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Description 瑙勬牸鍨嬪彿
@@ -52,7 +49,12 @@
* @Date 2023/10/23
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody BaseGoodsModels models) {
+ public ResponseValue add() {
+ BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+ BaseGoodsModels param2 = new BaseGoodsModels();
+ CommonUtil.copyProperties(models, param2);
+ models = param2;
+
if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
@@ -73,7 +75,12 @@
* @date 2023/10/25
*/
@PostMapping("/updStatus")
- public ResponseValue updateStatus(@RequestBody BaseGoodsModels models) {
+ public ResponseValue updateStatus() {
+ BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+ BaseGoodsModels param2 = new BaseGoodsModels();
+ CommonUtil.copyProperties(models, param2);
+ models = param2;
+
if (models == null || models.getId() == null || models.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
@@ -88,7 +95,12 @@
* @Date 2023/10/25
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseGoodsModels models) {
+ public ResponseValue updateById() {
+ BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+ BaseGoodsModels param2 = new BaseGoodsModels();
+ CommonUtil.copyProperties(models, param2);
+ models = param2;
+
if (models.getId() == null) {
return ResponseValue.error("瑙勬牸鍨嬪彿id涓虹┖");
}
@@ -122,5 +134,13 @@
List<BaseGoodsModels> result = this.baseGoodsModelsService.select(baseGoodsModels);
return ResponseValue.success(result);
}
+
+ @GetMapping("queryGoodsModelInfo")
+ public ResponseValue queryGoodsModelInfo(Long baseGoodsModelsId) {
+ if (baseGoodsModelsId== null){
+ return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖锛�");
+ }
+ return ResponseValue.success(baseGoodsModelsService.queryGoodsModelInfo(baseGoodsModelsId));
+ }
}
--
Gitblit v1.9.1