spec and type return

src/main/java/com.huiju.welcome/controller/TaGoodsController.java

@@ -2,6 +2,8 @@ package com.huiju.welcome.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.huiju.welcome.common.base.BaseController;
@@ -9,19 +11,19 @@ import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoods;
 import com.huiju.welcome.model.TaGoodsImg;
 import com.huiju.welcome.model.TaGoodsSpec;
+import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITaGoodsImgService;
 import com.huiju.welcome.service.ITaGoodsService;
 import com.huiju.welcome.service.ITaGoodsSpecService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 
 
 /**
@@ -63,14 +65,15 @@ public class TaGoodsController extends BaseController {
         try {
             Boolean flag = iTaGoodsService.save(taGoods);
             Boolean flagImg = iTaGoodsImgService.save(taGoodsImg);
-            Boolean flagSpec = false;
-            for(int i = 0;i<spec.size();i++){
-                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
-                taGoodsSpec.setGoodsId(taGoods.getGoodsId());
-                flagSpec = iTaGoodsSpecService.save(taGoodsSpec);
-            }
-            if (flag&& flagImg&&flagSpec){
-                responseBean.addSuccess("success");
+            List<TaGoodsSpec> specList = spec.toJavaList(TaGoodsSpec.class);
+            specList.stream().forEach(e -> {
+                e.setGoodsId(taGoods.getGoodsId());
+            });
+
+            boolean result = iTaGoodsSpecService.saveBatch(specList);
+
+            if (flag&&flagImg&&result){
+                responseBean.addSuccess(taGoods);
             }else {
                 responseBean.addError("fail");
             }
@@ -151,6 +154,22 @@ public class TaGoodsController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "商品列表", notes = "商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "typeName", value = "商品名称")
+    })
+    @RequestMapping(value = "/taGoods", method = RequestMethod.GET)
+    public ResponseBean typeList(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "goodsName",required = false) String goodsName,
+                                 @RequestParam(value = "typeId",required = false) Integer typeId) {
+        IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTaGoodsService.goodsList(pg,goodsName,typeId);
+
+        return userManagement;
+    }
+
 
 
 

src/main/java/com.huiju.welcome/controller/TdGoodsTypeController.java

@@ -45,7 +45,7 @@ public class TdGoodsTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTdGoodsTypeService.save(tdGoodsType)){
-                responseBean.addSuccess("success");
+                responseBean.addSuccess(tdGoodsType);
             }else {
                 responseBean.addError("fail");
             }
@@ -87,7 +87,7 @@ public class TdGoodsTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTdGoodsTypeService.updateById(tdGoodsType)){
-                responseBean.addSuccess("success");
+                responseBean.addSuccess(tdGoodsType);
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com.huiju.welcome/controller/TdSpecController.java

@@ -43,7 +43,7 @@ public class TdSpecController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTdSpecService.save(tdSpec)){
-                responseBean.addSuccess("success");
+                responseBean.addSuccess(tdSpec);
             }else {
                 responseBean.addError("fail");
             }
@@ -85,7 +85,7 @@ public class TdSpecController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTdSpecService.updateById(tdSpec)){
-                responseBean.addSuccess("success");
+                responseBean.addSuccess(tdSpec);
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com.huiju.welcome/model/TaGoods.java

@@ -48,5 +48,8 @@ public class TaGoods implements Serializable {
     @TableField(exist = false)
     private String imgUrl;
 
+    @TableField(exist = false)
+    private String typeName;
+
 
 }

src/main/java/com.huiju.welcome/service/ITaGoodsService.java

@@ -1,7 +1,9 @@
 package com.huiju.welcome.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaGoods;
 
 /**
@@ -14,4 +16,12 @@ import com.huiju.welcome.model.TaGoods;
  */
 public interface ITaGoodsService extends IService<TaGoods> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param goodsName
+     * @param typeId
+     * @return
+     */
+    ResponseBean goodsList(IPage<TaGoods> pg, String goodsName,Integer typeId);
 }

src/main/java/com.huiju.welcome/service/impl/TaGoodsServiceImpl.java

@@ -1,10 +1,13 @@
 package com.huiju.welcome.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaGoodsMapper;
 import com.huiju.welcome.model.TaGoods;
 import com.huiju.welcome.service.ITaGoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> implements ITaGoodsService {
 
+    @Autowired
+    private TaGoodsMapper taGoodsMapper;
+
+    @Override
+    public ResponseBean goodsList(IPage<TaGoods> pg, String goodsName, Integer typeId) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TaGoods> list= taGoodsMapper.goodsList(pg,goodsName,typeId);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaGoodsMapper.xml

@@ -3,10 +3,12 @@
 <mapper namespace="com.huiju.welcome.mapper.TaGoodsMapper">
     <select id="goodsList" resultType="com.huiju.welcome.model.TaGoods">
         select
-        a.*
+        g.*
         i.img_url as imgUrl
+        t.type_name as typeName
         from ta_goods g
         left join ta_goods_img i on g.goods_id = i.goods_id
+        left join td_goods_type t on g.type_id = t.type_id
         <where>
             <if test="goodsName !=null and goodsName !=''">
                 g.goods_name LIKE CONCAT('%',#{goodsName},'%')