From 29a7615a483286ef3714da2d1edc52db841ae9fb Mon Sep 17 00:00:00 2001 From: xyiege Date: Sat, 16 Jul 2022 12:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminGoodsController.java | 77 +++++++++++++++++-- .../cn/chjyj/szwh/mapper/GoodsMapper.java | 7 ++ .../cn/chjyj/szwh/service/GoodsService.java | 8 ++ .../szwh/service/impl/GoodsServiceImpl.java | 24 ++++++ .../resources/mapper/szwh/GoodsMapper.xml | 18 +++++ .../cn/chjyj/szwh/mapper/GoodsMapperTest.java | 12 +++ 6 files changed, 141 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java index 703b22a..3c411dc 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java @@ -9,6 +9,7 @@ import cn.chjyj.szwh.service.GoodsDetailService; import cn.chjyj.szwh.service.GoodsService; import cn.chjyj.szwh.service.UserService; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,14 +34,80 @@ public class AdminGoodsController extends BaseController { * @return */ @RequestMapping("/list") - public JSONObject list(@RequestParam(name = "page",defaultValue = "1") String page){ + public JSONObject list(HttpServletRequest request){ + // 查询条件 + Map qmap = new HashMap(); + + //分页 + String page = request.getParameter("page"); + if(StringUtils.isBlank(page)){ + page="1"; + } int ipage=Integer.parseInt(page); - List goodsList = goodsService.getGoodsList(ipage); - // convert to json - JSONObject jsonObject= new JSONObject(); + // 查询 + String limit = request.getParameter("limit"); + int ilimit=(StringUtils.isBlank(limit))?10:Integer.valueOf(limit); + + int start= ipage>1?(ipage-1)*ilimit:0; + qmap.put("id",start); + + // 委托编码 + String islicode=request.getParameter("islicode"); + if(!StringUtils.isBlank(islicode)){ + qmap.put("islicode",islicode); + } + // 商品名称 + String gname=request.getParameter("goods_name"); + if(!StringUtils.isBlank(gname)){ + qmap.put("goods_name",gname); + } + // + String entrust_name =request.getParameter("entrust_name"); + if(StringUtils.isNotBlank(entrust_name)){ + qmap.put("entrust_name",entrust_name); + } + + // + String goods_entrust = request.getParameter("goods_entrust"); + if(StringUtils.isNotBlank(goods_entrust)){ + qmap.put("goods_entrust",goods_entrust); + } + // + String goods_type= request.getParameter("goods_type"); + if(StringUtils.isNotBlank(goods_type)){ + qmap.put("goods_type",goods_type); + } + // + String data_type= request.getParameter("data_type"); + if (StringUtils.isNotBlank(data_type)) { + qmap.put("data_type",data_type); + } + // 创建时间 +// String createtime=request.getParameter("createtime"); +// if(StringUtils.isNotBlank("createtime")){ +// // 拆分 +// String[] aa= createtime.split(","); +// qmap.put("createtime","between "+aa[0]+" and "+aa[1]); +// } + // 委托状态 + String entrust_status = request.getParameter("entrust_status"); + if(StringUtils.isNotBlank(entrust_status)){ + qmap.put("entrust_status",entrust_status); + } + // 交易 + String transaction = request.getParameter("transaction"); + if(StringUtils.isNotBlank(transaction)){ + qmap.put("transaction",transaction); + } + // 查询返回的结果 + Map retmap = goodsService.getGoodsByMap(qmap,ilimit); + retmap.put("start",start); + retmap.put("curr_page",page); + retmap.put("per_page",limit); + // 结果 jsonObject.put("code",200); jsonObject.put("msg","成功"); - jsonObject.put("data",goodsList); + jsonObject.put("data",retmap); return jsonObject; } diff --git a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java index 9cc0111..68fbe97 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java @@ -56,4 +56,11 @@ public interface GoodsMapper { @Param("limit") int limit, @Param("order") String order, @Param("orderway") String orderway); + + /** + * 根据map对象组装查询条件 + * @param gmap + * @return + */ + List getGoodsListByMap(@Param("map")Map gmap,@Param("limit") int limit); } diff --git a/src/main/java/cn/chjyj/szwh/service/GoodsService.java b/src/main/java/cn/chjyj/szwh/service/GoodsService.java index a6e462a..11ab726 100644 --- a/src/main/java/cn/chjyj/szwh/service/GoodsService.java +++ b/src/main/java/cn/chjyj/szwh/service/GoodsService.java @@ -34,4 +34,12 @@ public interface GoodsService { * @return */ List getMapDataByTyep(int type); + + /** + * 按照对象查询指定数量的记录 + * @param gmap 查询对象 + * @param limit 条目 + * @return + */ + Map getGoodsByMap(Map gmap,int limit); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java index f018e57..62d29bf 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -122,4 +122,28 @@ public class GoodsServiceImpl implements GoodsService { } return nglist; } + + /** + * map 对象查询 + * @param gmap 查询对象 + * @param limit 条目 + * @return + */ + @Override + public Map getGoodsByMap(Map gmap, int limit) { + Map retmap =new HashMap(); + // 符合条件的记录总数 + List glist = goodsMapper.getGoodsListByMap(gmap,limit); + retmap.put("data",glist); + + // 总的记录 + int total = goodsMapper.goodsCount(gmap); + retmap.put("total",total); + + // 总的页 + int totalpage = (int)Math.ceil(total/limit); + retmap.put("last_page",totalpage); + + return retmap; + } } diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml index 390453e..9b630c0 100644 --- a/src/main/resources/mapper/szwh/GoodsMapper.xml +++ b/src/main/resources/mapper/szwh/GoodsMapper.xml @@ -24,6 +24,24 @@ + + + +