From 6e1055c1776b3ed64eba9196fa52af8322de6075 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 19 Aug 2018 15:11:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BD=A6=E6=B5=81-=E5=95=86=E6=88=B7-?= =?UTF-8?q?=E4=BC=98=E5=85=8D=E5=88=B8=E6=8E=A5=E5=8F=A3][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96ETCP=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 49 +++++++++++-------- .../com/simple/service/WxMerchantService.java | 14 +++++- .../service/impl/WxMerchantServiceImpl.java | 7 +++ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index cbd515257..5f53b334a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -12,27 +12,36 @@ import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("wxMerchant") -public class WxMerchantController extends BaseController -{ - @Autowired +public class WxMerchantController extends BaseController { + @Autowired private WxMerchantService wxMerchantService; private Logger logger = Logger.getLogger(WxMerchantController.class); - - @ApiOperation("分页列表接口") + + @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 WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { - if (null == wxMerchant) wxMerchant = new WxMerchant(); + @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 WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { + if (null == wxMerchant) wxMerchant = new WxMerchant(); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("ETCP商户列表") + @GetMapping("etcplist") + public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { + if (null == wxMerchant) wxMerchant = new WxMerchant(); + final List merchantList = wxMerchantService.etcpList(wxMerchant); + return new ResultData(merchantList); + } + + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchant wxMerchant) { //Assert.notNull(wxMerchant.getName(), "角色名不能为空"); @@ -51,25 +60,25 @@ public class WxMerchantController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxMerchantService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @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,"查询成功",wxMerchantService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getById(id)); } @ApiOperation("停用") @GetMapping("disable") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData disable(Long id) { wxMerchantService.disable(id); - return new ResultData(Result.SUCCESS,"停用成功"); + return new ResultData(Result.SUCCESS, "停用成功"); } - + } diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java index 34fe19f81..510859616 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java @@ -3,17 +3,27 @@ package com.simple.service; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxMerchant; +import java.util.List; + public interface WxMerchantService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List etcpList(WxMerchant record); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 3299b0813..b1f55f880 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -9,6 +9,7 @@ import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.po.WxMerchantShop; import com.simple.domain.po.WxShop; +import com.simple.enums.EnumCarVendor; import com.simple.mapper.WxMerchantBUserMapper; import com.simple.mapper.WxMerchantMapper; import com.simple.mapper.WxMerchantShopMapper; @@ -44,6 +45,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); } + @Override + public List etcpList(WxMerchant record) { + record.setCarVendorType(EnumCarVendor.CAR_ETCP.getCode()); + return wxMerchantMapper.findList(record); + } + @Override public WxMerchant getById(Long id) { WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id);