diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminClassifyController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminClassifyController.java index aadaf1d..a35f64b 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminClassifyController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminClassifyController.java @@ -32,10 +32,10 @@ public class AdminClassifyController extends BaseController { public JSONObject infolist(String marking,@RequestParam(value = "page",defaultValue = "1") String page){ int ipage=Integer.valueOf(page); Map map = new HashMap<>(); - List classifyList = classifyService.getClassifyList(map,ipage); + //List classifyList = classifyService.getClassifyList(map,10,ipage); jsonObject.put("code",200); jsonObject.put("msg","请求成功"); - jsonObject.put("data",classifyList); + //jsonObject.put("data",classifyList); return jsonObject; } diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java new file mode 100644 index 0000000..926b7d1 --- /dev/null +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsClassifyController.java @@ -0,0 +1,70 @@ +package cn.chjyj.szwh.controller.admin; + +import cn.chjyj.szwh.controller.BaseController; +import cn.chjyj.szwh.service.ClassifyService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 商品分类控制器 + */ +@RestController +@RequestMapping(value = "/admin/goods.Classify") +public class AdminGoodsClassifyController extends BaseController { + @Autowired + private ClassifyService classifyService; + + @PostMapping("/list") + public JSONObject clist(HttpServletRequest request){ + Map qmap = new HashMap<>();//组装查询条件 + String topClass=request.getParameter("top_clas"); + if(StringUtils.isNotBlank(topClass)){ + qmap.put("top_class",topClass); + } + // + String sonClass=request.getParameter("son_class"); + if (StringUtils.isNotBlank(sonClass)){ + qmap.put("son_class",sonClass); + } + + // + String userId= request.getParameter("user_id"); + if(StringUtils.isNotBlank(userId)){ + qmap.put("user_id",userId); + } + + // + String usestatus=request.getParameter("usestatus"); + if(StringUtils.isNotBlank(usestatus)){ + qmap.put("usestatus",usestatus); + } + + //时间段 + String createtime=request.getParameter("createtime"); + if(StringUtils.isNotBlank(createtime)){ + // 拆分时间 并组装时间段 + } + // 分页大小 + String limit=request.getParameter("limit"); + int ilimit = StringUtils.isBlank(limit)?10:Integer.valueOf(limit); + // 分页 + String page = request.getParameter("page"); + int ipage=StringUtils.isBlank(page)?1:Integer.valueOf(page); + + // + Map retmap =classifyService.getClassifyList(qmap,ilimit,ipage); + jsonObject.put("code",200); + jsonObject.put("msg","成功"); + jsonObject.put("data",retmap); + 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 a48b450..8cec367 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/ClassifyMapper.java @@ -22,4 +22,17 @@ public interface ClassifyMapper { List getClassifyList(@Param("map") Map qmap, @Param("startRs") Integer startRs, @Param("pageSize") int pageSize); + + /** + * 统计所有记录 + * @return + */ + int countAllRs(); + + /** + * 依据条件进行统计 + * @param strwhere + * @return + */ + int countWcon(String strwhere); } diff --git a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java index 0998f1e..07ad8cb 100644 --- a/src/main/java/cn/chjyj/szwh/service/ClassifyService.java +++ b/src/main/java/cn/chjyj/szwh/service/ClassifyService.java @@ -15,5 +15,5 @@ public interface ClassifyService { * @param qmap * @return */ - List getClassifyList(Map qmap,Integer page); + Map getClassifyList(Map qmap,int limit,int page); } 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 ad124ee..93c6e60 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/ClassifyServiceImpl.java @@ -1,12 +1,16 @@ package cn.chjyj.szwh.service.impl; +import cn.chjyj.szwh.bean.Admin; import cn.chjyj.szwh.bean.Classify; -import cn.chjyj.szwh.constant.ChConstant; +import cn.chjyj.szwh.mapper.AdminMapper; import cn.chjyj.szwh.mapper.ClassifyMapper; import cn.chjyj.szwh.service.ClassifyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,10 +18,44 @@ import java.util.Map; public class ClassifyServiceImpl implements ClassifyService { @Autowired private ClassifyMapper classifyMapper; + @Autowired + private AdminMapper adminMapper; @Override - public List getClassifyList(Map qmap, Integer page) { - int start=page>0?(page-1)* ChConstant.PAGESIZE:0; - return classifyMapper.getClassifyList(qmap,start,ChConstant.PAGESIZE); + public Map getClassifyList(Map qmap, int limit,int page) { + Map retmap =new HashMap(); + int start=page>0?(page-1)* limit:1; + + int end=page*limit; + + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + List retlist =new ArrayList(); + // 符合条件的 + List clflist = classifyMapper.getClassifyList(qmap,start,limit); + for(Classify c:clflist){ + // 找到对应的用户 + Admin admin =adminMapper.getAdminById(c.getUserId()); + Map cmap =new HashMap(); + cmap.put("id",c.getId()); + cmap.put("user_id",c.getUserId()); + cmap.put("account_id",admin.getAccountId()); + cmap.put("account_name",admin.getAccountName()); + cmap.put("createtime",sdf.format(c.getCreatetime())); + cmap.put("is_deleted",c.getIsDeleted()); + cmap.put("son_class",c.getSonClass()); + cmap.put("status",c.getStatus()); + cmap.put("top_class",c.getTopClass()); + cmap.put("user_id",c.getUserId()); + retlist.add(cmap); + } + + retmap.put("current_page",page); + retmap.put("per_page",limit); + retmap.put("start",start+1); + retmap.put("end",end); + retmap.put("data",retlist); + + return retmap; } } diff --git a/src/main/resources/mapper/szwh/ClassifyMapper.xml b/src/main/resources/mapper/szwh/ClassifyMapper.xml index c2dc6ac..0f93e7d 100644 --- a/src/main/resources/mapper/szwh/ClassifyMapper.xml +++ b/src/main/resources/mapper/szwh/ClassifyMapper.xml @@ -5,7 +5,9 @@ -id,top_class as topClass,son_class as sonClass,user_id as userId,`status`,createtime,is_deleted as isDeleted +id,top_class as topClass, +son_class as sonClass, +user_id as userId,`status`,createtime,is_deleted as isDeleted classify @@ -29,6 +31,18 @@ id,top_class as topClass,son_class as sonClass,user_id as userId,`status`,create limit #{pageSize} + + + + + + insert into diff --git a/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java index 80a9db5..3402a9d 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/ClassifyMapperTest.java @@ -33,4 +33,10 @@ public class ClassifyMapperTest { } // System.out.println(cllist.size()); } + + @Test + public void countAllTest(){ + int rs= classifyMapper.countAllRs(); + System.out.println(rs); + } } \ No newline at end of file