diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 73a77364b..efc2cbcad 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/car") +@RequestMapping("/api/car") public class WxCarController extends BaseController { private Logger logger = Logger.getLogger(WxCarController.class); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java index 2f7309c99..0027a352f 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java @@ -1,71 +1,40 @@ package com.simple.controller; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; +import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; - +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxPark; +import com.simple.pay.WxPay; import com.simple.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("wxPark") -public class WxParkController extends BaseController -{ - @Autowired - private WxParkService wxParkService; - +@RequestMapping("/api/wxPark") +public class WxParkController extends BaseController { private Logger logger = Logger.getLogger(WxParkController.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 WxPark wxPark,Integer pageNum, Integer pageSize) { - if (null == wxPark) wxPark = new WxPark(); - final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); - return new ResultData(page); - } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxPark wxPark) { - //Assert.notNull(wxPark.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); - } + @Autowired + private WxParkService wxParkService; - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxPark wxPark) { - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); + @ApiOperation("查找用户车场信息") + @GetMapping("/info") + public ResultData findById() { + WxCUser user = getUser(); + WxPark parkQ = new WxPark(); + parkQ.setTenantId(user.getTenantId()); + WxPark park = wxParkService.getByObj(parkQ); + if (park == null) { + logger.error("车场未取到"); + return new ResultData(ErrorCode.CAR_PARK_NOT_FOUND); + } + return new ResultData(Result.SUCCESS, "查询成功", park); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxParkService.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,"查询成功",wxParkService.getById(id)); - } - - - }