From f470bdc535b6ca345d4e843da248f8860d294b85 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 11:36:54 +0800
Subject: [PATCH] 修改导出为标准返回

---
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 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..3fecfb9 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,34 +1,34 @@
 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 io.swagger.annotations.Api;
 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 瑙勬牸鍨嬪彿
  * @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鏌ヨ瑙勬牸鍨嬪彿锛�
@@ -54,7 +54,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 +80,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 +100,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 +125,20 @@
         return ResponseValue.success(list);
     }
 
+    @GetMapping("query/goodsModel")
+    public ResponseValue queryGoodsModelByGoodsTemplatesId(Long goodsTemplatesId) {
+        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