spec and type list

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

@@ -329,6 +329,7 @@ public class SysUserController extends BaseController {
         ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
         return sysmenu;
     }
+
     @ApiOperation(value = "當前員工離職", notes = "當前員工離職")
     @RequestMapping(value = "/fireUser", method = RequestMethod.PUT)
     public ResponseBean fireUser(@RequestParam(value = "userId",required = false) Integer userId) {

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

@@ -1,20 +1,20 @@
 package com.huiju.welcome.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysUserRole;
 import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITdGoodsTypeService;
+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.*;
 
 
 /**
@@ -113,4 +113,19 @@ public class TdGoodsTypeController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "商品类型列表", notes = "商品类型列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "typeName", value = "商品类型名称")
+    })
+    @RequestMapping(value = "/typeList", method = RequestMethod.GET)
+    public ResponseBean typeList(@RequestParam(defaultValue = "1") int pageNum,
+                                       @RequestParam(defaultValue = "10") int pageSize,
+                                       @RequestParam(value = "typeName",required = false) String typeName) {
+        IPage<TdGoodsType> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTdGoodsTypeService.typeList(pg,typeName);
+
+        return userManagement;
+    }
 }

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

@@ -1,18 +1,18 @@
 package com.huiju.welcome.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TdSpec;
 import com.huiju.welcome.service.ITdSpecService;
+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.*;
 
 
 /**
@@ -111,4 +111,19 @@ public class TdSpecController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "商品规格列表", notes = "商品规格列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "specName", value = "商品规格名称")
+    })
+    @RequestMapping(value = "/specList", method = RequestMethod.GET)
+    public ResponseBean specList(@RequestParam(defaultValue = "1") int pageNum,
+                                 @RequestParam(defaultValue = "10") int pageSize,
+                                 @RequestParam(value = "specName",required = false) String specName) {
+        IPage<TdSpec> pg = new Page<>(pageNum, pageSize);
+
+        ResponseBean userManagement= iTdSpecService.specList(pg,specName);
+
+        return userManagement;
+    }
 }

src/main/java/com.huiju.welcome/mapper/TdGoodsTypeMapper.java

@@ -2,8 +2,10 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TdGoodsType;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
 
+    /**
+     *
+     * @param pg
+     * @param typeName
+     * @return
+     */
+    IPage<TdGoodsType> typeList(IPage<TdGoodsType> pg, @Param("typeName") String typeName);
 }

src/main/java/com.huiju.welcome/mapper/TdSpecMapper.java

@@ -2,8 +2,10 @@ package com.huiju.welcome.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TdSpec;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdSpecMapper extends BaseMapper<TdSpec> {
 
+    /**
+     *
+     * @param pg
+     * @param specName
+     * @return
+     */
+    IPage<TdSpec> specList(IPage<TdSpec> pg, @Param("specName") String specName);
 }

src/main/java/com.huiju.welcome/service/ITdGoodsTypeService.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.TdGoodsType;
 
 /**
@@ -14,4 +16,12 @@ import com.huiju.welcome.model.TdGoodsType;
  */
 public interface ITdGoodsTypeService extends IService<TdGoodsType> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param typeName
+     * @return
+     */
+    ResponseBean typeList(IPage<TdGoodsType> pg, String typeName);
+
 }

src/main/java/com.huiju.welcome/service/ITdSpecService.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.TdSpec;
 
 /**
@@ -14,4 +16,11 @@ import com.huiju.welcome.model.TdSpec;
  */
 public interface ITdSpecService extends IService<TdSpec> {
 
+    /**
+     * 商品类型列表
+     * @param pg
+     * @param specName
+     * @return
+     */
+    ResponseBean specList(IPage<TdSpec> pg, String specName);
 }

src/main/java/com.huiju.welcome/service/impl/TdGoodsTypeServiceImpl.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.TdGoodsTypeMapper;
 import com.huiju.welcome.model.TdGoodsType;
 import com.huiju.welcome.service.ITdGoodsTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,5 +20,14 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TdGoodsTypeServiceImpl extends ServiceImpl<TdGoodsTypeMapper, TdGoodsType> implements ITdGoodsTypeService {
+    @Autowired
+    private TdGoodsTypeMapper tdGoodsTypeMapper;
+    @Override
+    public ResponseBean typeList(IPage<TdGoodsType> pg,String typeName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TdGoodsType> list= tdGoodsTypeMapper.typeList(pg,typeName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 
 }

src/main/java/com.huiju.welcome/service/impl/TdSpecServiceImpl.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.TdSpecMapper;
 import com.huiju.welcome.model.TdSpec;
 import com.huiju.welcome.service.ITdSpecService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +21,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TdSpecServiceImpl extends ServiceImpl<TdSpecMapper, TdSpec> implements ITdSpecService {
 
+    @Autowired
+    private TdSpecMapper tdSpecMapper;
+
+    @Override
+    public ResponseBean specList(IPage<TdSpec> pg, String specName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TdSpec> list= tdSpecMapper.specList(pg,specName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TdGoodsTypeMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TdGoodsTypeMapper">
+    <select id="typeList" resultType="com.huiju.welcome.model.TdGoodsType">
+        select
+        *
+        from td_goods_type
+        <where>
+            <if test="typeName !=null and typeName !=''">
+                typeName LIKE CONCAT('%',#{typeName},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>

src/main/resources/mapper/TdSpecMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TdSpecMapper">
+    <select id="specList" resultType="com.huiju.welcome.model.TdSpec">
+        select
+        *
+        from td_spec
+        <where>
+            <if test="specName !=null and typeName !=''">
+                specName LIKE CONCAT('%',#{specName},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>