From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java | 89 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 39 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..099c6a2 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,32 +1,37 @@
package com.consum.base.controller;
+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;
+
import com.consum.base.BaseController;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.service.BaseGoodsModelsService;
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 io.swagger.annotations.Api;
/**
* @Description 瑙勬牸鍨嬪彿
* @Author 鍗㈠簡闃�
* @Date 2023/10/25
*/
+@Api(value = "瑙勬牸鍨嬪彿", tags = "瑙勬牸鍨嬪彿")
@RestController
@RequestMapping("/pc/base/goods/models")
public class BaseGoodsModelsController extends BaseController {
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
/**
* @Description 瑙勬牸鍒楄〃鏌ヨ锛堟牴鎹墿鍝乮d鏌ヨ瑙勬牸鍨嬪彿锛�
@@ -52,29 +57,43 @@
* @Date 2023/10/23
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody BaseGoodsModels models) {
- if (models.getGoodsTemplatesId() == null || StringUtils.isEmpty(models.getModelName()) || StringUtils.isEmpty(models.getUnit()) || models.getStates() == null) {
+ 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("鍙傛暟閿欒");
}
- //鍒ゆ柇鍚屼竴鐗╁搧妯℃澘id涓嬬殑 瑙勬牸鍨嬪彿鍚嶇О鏄惁閲嶅
+ // 鍒ゆ柇鍚屼竴鐗╁搧妯℃澘id涓嬬殑 瑙勬牸鍨嬪彿鍚嶇О鏄惁閲嶅
BaseGoodsModels baseGoodsModels = this.baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(models);
if (baseGoodsModels != null) {
return ResponseValue.error("瑙勬牸鍨嬪彿鍚嶇О宸插瓨鍦�");
}
int result = this.baseGoodsModelsService.add(models);
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success();
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
* 淇敼鐘舵��
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/25
*/
@PostMapping("/updStatus")
- public ResponseValue updateStatus(@RequestBody BaseGoodsModels models) {
- if (models == null || models.getId() == null || models.getStates() == null) {
+ public ResponseValue updateStatus() {
+ BaseGoodsModels models = CommonUtil.getObjFromReqBody(BaseGoodsModels.class);
+ BaseGoodsModels param2 = new BaseGoodsModels();
+ CommonUtil.copyProperties(models, param2);
+ models = param2;
+
+ if (models.getId() == null || models.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
@@ -88,7 +107,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涓虹┖");
}
@@ -97,30 +121,17 @@
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
- /**
- * @Description 鏍规嵁鐗╁搧id鏌ヨ瑙勬牸鍨嬪彿
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/30
- */
- @GetMapping("/selectByGoodsTemplatesId")
- public ResponseValue queryByGoodsTemplatesId(Long goodsTemplatesId) {
- List<BaseGoodsModels> list = this.baseGoodsModelsService.queryByGoodsTemplatesId(goodsTemplatesId);
- 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);
+ List<BaseGoodsModels> result = baseGoodsModelsService.queryGoodsModelByGoodsTemplatesId(goodsTemplatesId);
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