From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Fri, 03 Apr 2020 09:41:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
index d07fa2e..9ab2466 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
@@ -1,28 +1,34 @@
package com.kidgrow.oprationcenter.controller;
+import java.util.Map;
import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
-import com.kidgrow.oprationcenter.model.SysProduct;
-import com.kidgrow.oprationcenter.service.ISysProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.oprationcenter.model.SysProduct;
+import com.kidgrow.oprationcenter.service.ISysProductService;
+import com.kidgrow.common.model.*;
+
+import org.springframework.validation.BindingResult;
import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description:
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:05 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -43,12 +49,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return sysProductService.findList(params);
+ return ResultBody.ok().data(sysProductService.findList(params));
}
/**
@@ -80,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- sysProductService.saveOrUpdate(sysProduct);
- return ResultBody.ok().data(sysProduct).msg("保存成功");
+ boolean v= sysProductService.saveOrUpdate(sysProduct);
+ if(v) {
+ return ResultBody.ok().data(sysProduct).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -91,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysProductService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysProductService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
--
Gitblit v1.8.0