lostecho/mall-swarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结构调整

Browse Source
This commit is contained in:
zhh
2018-04-16 13:23:07 +08:00
parent 6c918f208a
commit 109a95d3de
6 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mall-admin/src/main/java/com/macro/mall/controller/PmsBrandController.java
View File

@@ -1,8 +1,9 @@
package com.macro.mall.controller;
import com.macro.mall.dto.CommonResult;
import com.macro.mall.dto.PmsBrandDto;
import com.macro.mall.dto.PmsBrandParam;
import com.macro.mall.service.PmsBrandService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
* 品牌功能Controller
*/
@Controller
@RequestMapping("/brand")
public class PmsBrandController {
@Autowired
private PmsBrandService brandService;
@@ -23,16 +25,16 @@ public class PmsBrandController {
private static final Logger LOGGER = LoggerFactory.getLogger(PmsBrandController.class);
@ApiOperation(value = "获取全部品牌列表")
@RequestMapping(value = "/brand/listAll", method = RequestMethod.GET)
@RequestMapping(value = "/listAll", method = RequestMethod.GET)
@ResponseBody
public Object getBrandList() {
return new CommonResult().success(brandService.listAllBrand());
}
@ApiOperation(value = "添加品牌")
@RequestMapping(value = "/brand/create", method = RequestMethod.POST)
@RequestMapping(value = "/create", method = RequestMethod.POST)
@ResponseBody
public Object createBrand(@Validated @RequestBody PmsBrandDto pmsBrand, BindingResult result) {
public Object createBrand(@Validated @RequestBody PmsBrandParam pmsBrand, BindingResult result) {
if (result.hasErrors()) {
return new CommonResult().validateFailed(result.getFieldError().getDefaultMessage());
}
@@ -49,26 +51,26 @@ public class PmsBrandController {
}
@ApiOperation(value = "更新品牌")
@RequestMapping(value = "/brand/update/{id}", method = RequestMethod.POST)
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
public Object updateBrand(@PathVariable("id") Long id, @Validated @RequestBody PmsBrandDto pmsBrandDto, BindingResult result) {
public Object updateBrand(@PathVariable("id") Long id, @Validated @RequestBody PmsBrandParam pmsBrandParam, BindingResult result) {
if(result.hasErrors()){
return new CommonResult().validateFailed(result.getFieldError().getDefaultMessage());
}
CommonResult commonResult;
int count = brandService.updateBrand(id, pmsBrandDto);
int count = brandService.updateBrand(id, pmsBrandParam);
if (count == 1) {
commonResult = new CommonResult().success(pmsBrandDto);
LOGGER.debug("updateBrand success:{}", pmsBrandDto);
commonResult = new CommonResult().success(pmsBrandParam);
LOGGER.debug("updateBrand success:{}", pmsBrandParam);
} else {
commonResult = new CommonResult().failed();
LOGGER.debug("updateBrand failed:{}", pmsBrandDto);
LOGGER.debug("updateBrand failed:{}", pmsBrandParam);
}
return commonResult;
}
@ApiOperation(value = "删除品牌")
@RequestMapping(value = "/brand/delete/{id}", method = RequestMethod.GET)
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
@ResponseBody
public Object deleteBrand(@PathVariable("id") Long id) {
int count = brandService.deleteBrand(id);
@@ -82,7 +84,7 @@ public class PmsBrandController {
}
@ApiOperation(value = "分页获取品牌列表")
@RequestMapping(value = "/brand/list", method = RequestMethod.GET)
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
public Object listBrand(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize) {
@@ -90,7 +92,7 @@ public class PmsBrandController {
}
@ApiOperation(value = "根据编号查询品牌信息")
@RequestMapping(value = "/brand/{id}", method = RequestMethod.GET)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody
public Object getBrand(@PathVariable("id") Long id) {
return new CommonResult().success(brandService.getBrand(id));