|
@@ -1,10 +1,14 @@
|
|
package com.hwrj.cloud.admin.controller;
|
|
package com.hwrj.cloud.admin.controller;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.excel.EasyExcel;
|
|
import com.hwrj.cloud.admin.common.PmsProductOutput;
|
|
import com.hwrj.cloud.admin.common.PmsProductOutput;
|
|
|
|
+import com.hwrj.cloud.admin.dao.PmsProductExcelDao;
|
|
|
|
+import com.hwrj.cloud.admin.dto.param.PmsProductExcel;
|
|
|
|
+import com.hwrj.cloud.admin.dto.param.PmsProductParam;
|
|
|
|
+import com.hwrj.cloud.admin.listener.PmsProductExcelListener;
|
|
import com.hwrj.cloud.common.api.CommonPage;
|
|
import com.hwrj.cloud.common.api.CommonPage;
|
|
import com.hwrj.cloud.common.api.CommonResult;
|
|
import com.hwrj.cloud.common.api.CommonResult;
|
|
-import com.hwrj.cloud.admin.dto.PmsProductParam;
|
|
|
|
import com.hwrj.cloud.admin.dto.PmsProductQueryParam;
|
|
import com.hwrj.cloud.admin.dto.PmsProductQueryParam;
|
|
import com.hwrj.cloud.admin.dto.PmsProductResult;
|
|
import com.hwrj.cloud.admin.dto.PmsProductResult;
|
|
import com.hwrj.cloud.admin.model.PmsProduct;
|
|
import com.hwrj.cloud.admin.model.PmsProduct;
|
|
@@ -15,14 +19,16 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.validation.BindingResult;
|
|
import org.springframework.validation.BindingResult;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
+import java.io.IOException;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 商品管理Controller
|
|
* 商品管理Controller
|
|
* Created by macro on 2018/4/26.
|
|
* Created by macro on 2018/4/26.
|
|
*/
|
|
*/
|
|
-@Controller
|
|
|
|
|
|
+@RestController
|
|
@Api(tags = "PmsProductController", description = "商品管理")
|
|
@Api(tags = "PmsProductController", description = "商品管理")
|
|
@RequestMapping("/product")
|
|
@RequestMapping("/product")
|
|
public class PmsProductController {
|
|
public class PmsProductController {
|
|
@@ -32,7 +38,7 @@ public class PmsProductController {
|
|
@ApiOperation("创建商品")
|
|
@ApiOperation("创建商品")
|
|
@RequestMapping(value = "/create", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/create", method = RequestMethod.POST)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public CommonResult create(@RequestBody PmsProductParam productParam, BindingResult bindingResult) {
|
|
|
|
|
|
+ public CommonResult create(@RequestBody com.hwrj.cloud.admin.dto.PmsProductParam productParam, BindingResult bindingResult) {
|
|
int count = productService.create(productParam);
|
|
int count = productService.create(productParam);
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
return CommonResult.success(count);
|
|
return CommonResult.success(count);
|
|
@@ -52,7 +58,7 @@ public class PmsProductController {
|
|
@ApiOperation("更新商品")
|
|
@ApiOperation("更新商品")
|
|
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
|
|
@ResponseBody
|
|
@ResponseBody
|
|
- public CommonResult update(@PathVariable Long id, @RequestBody PmsProductParam productParam, BindingResult bindingResult) {
|
|
|
|
|
|
+ public CommonResult update(@PathVariable Long id, @RequestBody com.hwrj.cloud.admin.dto.PmsProductParam productParam, BindingResult bindingResult) {
|
|
int count = productService.update(id, productParam);
|
|
int count = productService.update(id, productParam);
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
return CommonResult.success(count);
|
|
return CommonResult.success(count);
|
|
@@ -154,5 +160,15 @@ public class PmsProductController {
|
|
return CommonResult.success(pmsProduct);
|
|
return CommonResult.success(pmsProduct);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private PmsProductExcelDao productExcelDao;
|
|
|
|
+
|
|
|
|
+ @PostMapping(value = "/import")
|
|
|
|
+ public CommonResult importBasic(MultipartFile file) throws IOException {
|
|
|
|
+ PmsProductExcelListener basicExcelListener = new PmsProductExcelListener(productExcelDao);
|
|
|
|
+ EasyExcel.read(file.getInputStream(), PmsProductExcel.class, basicExcelListener).headRowNumber(1).sheet().doRead();
|
|
|
|
+ return CommonResult.success();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|