From 3295d00ae31a4cce6d311b3ee6da5bf283d4d742 Mon Sep 17 00:00:00 2001 From: xyiege Date: Tue, 19 Jul 2022 22:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=88=AB=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminGoodsClassifyController.java | 24 ++++++++++--------- .../cn/chjyj/szwh/mapper/ClassifyMapper.java | 2 +- .../chjyj/szwh/service/ClassifyService.java | 2 +- .../service/impl/ClassifyServiceImpl.java | 7 +++++- .../chjyj/szwh/mapper/ClassifyMapperTest.java | 9 +++++++ 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java index 81d7b44..4ff3ec6 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -25,40 +26,41 @@ public class AdminGoodsClassifyController extends BaseController { private ClassifyService classifyService; @PostMapping("/list") - public JSONObject clist(HttpServletRequest request){ + public JSONObject clist(@RequestBody String jsonStr){ + JSONObject request =JSONObject.parseObject(jsonStr); Map qmap = new HashMap<>();//组装查询条件 - String topClass=request.getParameter("top_clas"); + String topClass=request.getString("top_clas"); if(StringUtils.isNotBlank(topClass)){ qmap.put("top_class",topClass); } // - String sonClass=request.getParameter("son_class"); + String sonClass=request.getString("son_class"); if (StringUtils.isNotBlank(sonClass)){ qmap.put("son_class",sonClass); } // - String userId= request.getParameter("user_id"); + String userId= request.getString("user_id"); if(StringUtils.isNotBlank(userId)){ qmap.put("user_id",userId); } // - String usestatus=request.getParameter("usestatus"); + String usestatus=request.getString("usestatus"); if(StringUtils.isNotBlank(usestatus)){ qmap.put("usestatus",usestatus); } //时间段 - String createtime=request.getParameter("createtime"); + String createtime=request.getString("createtime"); if(StringUtils.isNotBlank(createtime)){ // 拆分时间 并组装时间段 } // 分页大小 - String limit=request.getParameter("limit"); + String limit=request.getString("limit"); int ilimit = StringUtils.isBlank(limit)?10:Integer.valueOf(limit); // 分页 - String page = request.getParameter("page"); + String page = request.getString("page"); int ipage=StringUtils.isBlank(page)?1:Integer.valueOf(page); // @@ -69,10 +71,10 @@ public class AdminGoodsClassifyController extends BaseController { return jsonObject; } - @PostMapping("/getTop") + @RequestMapping("/getTop") public JSONObject getTop(){ - Map map = classifyService.getTop(); - jsonObject.put("data",map); + List clist = classifyService.getTop(); + jsonObject.put("data",clist); jsonObject.put("code",200); jsonObject.put("msg","成功"); return jsonObject; diff --git a/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java b/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java index 5d8c81c..fbfd217 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java @@ -40,5 +40,5 @@ public interface ClassifyMapper { * 查找父级 * @return */ - Map getTop(); + List getTop(); } diff --git a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java index 1b13bfd..6239dc4 100644 --- a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java +++ b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java @@ -21,5 +21,5 @@ public interface ClassifyService { * 枚举所有顶级类 * @return */ - Map getTop(); + List getTop(); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java index 28ecab0..50a06a9 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java @@ -28,6 +28,9 @@ public class ClassifyServiceImpl implements ClassifyService { int end=page*limit; + //记录总数 + int total =classifyMapper.countAllRs(); + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List retlist =new ArrayList(); @@ -55,6 +58,7 @@ public class ClassifyServiceImpl implements ClassifyService { retmap.put("start",start+1); retmap.put("end",end); retmap.put("data",retlist); + retmap.put("total",total); return retmap; } @@ -64,7 +68,8 @@ public class ClassifyServiceImpl implements ClassifyService { * @return */ @Override - public Map getTop() { + public List getTop() { + return classifyMapper.getTop(); } } diff --git a/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java index 3402a9d..e3a4c37 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java @@ -39,4 +39,13 @@ public class ClassifyMapperTest { int rs= classifyMapper.countAllRs(); System.out.println(rs); } + + @Test + public void getTopTest(){ + List sslist = classifyMapper.getTop(); + for(String sc:sslist){ + System.out.println(sc.toString()); + } +// System.out.println(sslist.size()); + } } \ No newline at end of file