From e601e7e0ebb3660a0c286aa8a0143433b1b11e2d Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 12 Aug 2018 17:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxTagsController.java | 128 ++++++++++++------ .../java/com/simple/domain/vo/WxTagsVo.java | 34 +++++ .../java/com/simple/mapper/WxTagsMapper.java | 8 +- .../com/simple/service/WxTagsService.java | 12 +- .../service/impl/WxTagsServiceImpl.java | 11 ++ .../main/resources/mapper/WxTagsMapper.xml | 11 +- 6 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxTagsVo.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java index 52929d3c4..6ef267210 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java @@ -1,70 +1,108 @@ package com.simple.controller; +import java.util.ArrayList; +import java.util.List; + import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxTags; +import com.simple.domain.vo.WxTagsVo; import com.simple.service.WxTagsService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; + +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxTags") +@Api(description="标签弹窗接口") public class WxTagsController extends BaseController { @Autowired private WxTagsService wxTagsService; private Logger logger = Logger.getLogger(WxTagsController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxTags wxTags,Integer pageNum, Integer pageSize) { - if (null == wxTags) wxTags = new WxTags(); - final PageInfo page = wxTagsService.listAsPage(wxTags, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxTags wxTags) { - //Assert.notNull(wxTags.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxTagsService.saveOrUpdate(wxTags); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxTags wxTags) { - wxTagsService.saveOrUpdate(wxTags); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxTagsService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id)); + @GetMapping("getAllList") + @ApiOperation("标签弹窗接口") + public ResultData getAllList() { + List type1List = new ArrayList<>(); + List tags = wxTagsService.findType1Value(); + for(WxTags t:tags) { + WxTagsVo vo =new WxTagsVo(); + vo.setValue(t.getType1()); + List type2List =new ArrayList<>(); + List type2s = wxTagsService.findType2Value(t.getType1()); + for(WxTags wt:type2s) { + WxTagsVo v = new WxTagsVo(); + v.setValue(wt.getType2()); + List list = new ArrayList<>(); + WxTags tag = new WxTags(); + tag.setType2(wt.getType2()); + PageInfo page = wxTagsService.listAsPage(tag, 1, 1000); + for(WxTags wxT : page.getList()) { + WxTagsVo wxVo = new WxTagsVo(); + wxVo.setValue(wxT.getName()); + list.add(wxVo); + } + v.setSubTags(list); + type2List.add(v); + vo.setSubTags(type2List); + } + type1List.add(vo); + } + return new ResultData(Result.SUCCESS,"ok",type1List); } + + + +// @ApiOperation("分页列表接口") +// @GetMapping("list") +// @ApiImplicitParams({ +// @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), +// @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) +// public ResultData list(@ModelAttribute WxTags wxTags,Integer pageNum, Integer pageSize) { +// if (null == wxTags) wxTags = new WxTags(); +// final PageInfo page = wxTagsService.listAsPage(wxTags, pageNum, pageSize); +// return new ResultData(page); +// } +// +// @ApiOperation("新增接口") +// @PostMapping("add") +// public ResultData add(@RequestBody WxTags wxTags) { +// //Assert.notNull(wxTags.getName(), "角色名不能为空"); +// //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); +// wxTagsService.saveOrUpdate(wxTags); +// return new ResultData(); +// } +// +// @ApiOperation("根据id更新接口") +// @PostMapping("update") +// public ResultData update(@RequestBody WxTags wxTags) { +// wxTagsService.saveOrUpdate(wxTags); +// return new ResultData(); +// } +// +// @ApiOperation("根据id删除接口") +// @GetMapping("/del") +// @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) +// public ResultData delete(Long id) { +// wxTagsService.deleteById(id); +// return new ResultData(Result.SUCCESS, "删除成功", null); +// } +// +// @ApiOperation("根据id查询接口") +// @GetMapping("/findById") +// @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) +// public ResultData findById(Long id) { +// return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id)); +// } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxTagsVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxTagsVo.java new file mode 100644 index 000000000..9737c0012 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxTagsVo.java @@ -0,0 +1,34 @@ +package com.simple.domain.vo; + +import java.io.Serializable; +import java.util.List; + +public class WxTagsVo implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1786459967532225067L; + + private String value; + + private List subTags; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public List getSubTags() { + return subTags; + } + + public void setSubTags(List subTags) { + this.subTags = subTags; + } + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java index a432046aa..98930fcbd 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxTagsMapper.java @@ -1,14 +1,18 @@ package com.simple.mapper; -import java.util.*; +import java.util.List; + import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxTags; public interface WxTagsMapper extends CommonMapper { List findList(WxTags wxTags); + List findType1Value(); + + List findType2Value(String type1); + diff --git a/mallinkService/src/main/java/com/simple/service/WxTagsService.java b/mallinkService/src/main/java/com/simple/service/WxTagsService.java index a5fafc480..56a1c332c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxTagsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxTagsService.java @@ -38,8 +38,18 @@ public interface WxTagsService { */ void deleteById(Long id); + /** + * 查询第一个属性 + * @return + */ + List findType1Value(); - + /** + * 根据第一个属性获取第二个属性 + * @param type1 + * @return + */ + List findType2Value(String type1); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java index 921fe7b3c..394a33c9c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java @@ -43,6 +43,17 @@ public class WxTagsServiceImpl implements WxTagsService { public void deleteById(Long id) { wxTagsMapper.deleteByPrimaryKey(id); } + + @Override + public List findType1Value() { + return wxTagsMapper.findType1Value(); + } + + @Override + public List findType2Value(String type1) { + + return wxTagsMapper.findType2Value(type1); + } diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index b8fcbc396..4e847090b 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -66,9 +66,12 @@ - - - - + + +