From 15fd776a22e816144f24e3281d92559fcd55e2c0 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 10:59:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 3216db6..f84a751 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,22 +1,20 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.BaseCategoryParam;
-import com.consum.base.service.BaseCategoryServiceImpl;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.model.po.BaseCategory;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.service.BaseGoodsModelsService;
import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 瑙勬牸鍨嬪彿
@@ -28,7 +26,7 @@
public class BaseGoodsModelsController extends BaseController {
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
/**
* @Description 瑙勬牸鍒楄〃鏌ヨ锛堟牴鎹墿鍝乮d鏌ヨ瑙勬牸鍨嬪彿锛�
@@ -54,7 +52,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("鍙傛暟閿欒");
}
@@ -75,7 +78,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("鍙傛暟閿欒");
}
@@ -90,7 +98,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涓虹┖");
}
@@ -110,6 +123,27 @@
return ResponseValue.success(list);
}
+ @GetMapping("query/goodsModel")
+ public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
+// S_user_core currentUser = this.getCurrentUser();
+// if (currentUser == null) {
+// return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+// }
+// if (goodsTemplatesId == null) {
+// return ResponseValue.error("鐗╁搧id涓嶅瓨鍦�");
+// }
+ BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ baseGoodsModels.setGoodsTemplatesId(goodsTemplatesId);
+ 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