From 88477b811b33e4f6a976ecd5be03bebd95aa17eb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 16:54:45 +0800
Subject: [PATCH] 添加 产品管理；合同管理；医院管理；医生管理；公司管理； 消费记录 的数据权限
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 21 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 9ab2466..7d046b5 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,27 +1,30 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
+import com.kidgrow.oprationcenter.model.ProductOrderDetail;
+import com.kidgrow.oprationcenter.model.SysProduct;
+import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
+import com.kidgrow.oprationcenter.service.ISysProductService;
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 com.kidgrow.oprationcenter.model.SysProduct;
-import com.kidgrow.oprationcenter.service.ISysProductService;
-import com.kidgrow.common.model.*;
-
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
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;
/**
@@ -34,11 +37,13 @@
*/
@Slf4j
@RestController
-@RequestMapping("/sysproduct")
+@RequestMapping("/product")
@Api(tags = "")
public class SysProductController extends BaseController{
@Autowired
private ISysProductService sysProductService;
+ @Autowired
+ private IProductOrderDetailService productOrderDetailService;
/**
* 列表
@@ -49,12 +54,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return ResultBody.ok().data(sysProductService.findList(params));
+ return sysProductService.findList(params,sysUser);
}
/**
@@ -82,10 +87,19 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult,@LoginUser SysUser sysUser) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ sysProduct.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+
boolean v= sysProductService.saveOrUpdate(sysProduct);
if(v) {
return ResultBody.ok().data(sysProduct).msg("保存成功");
@@ -102,12 +116,53 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v= sysProductService.removeById(id);
- if(v) {
- return ResultBody.ok().msg("删除成功");
+ if (!ProIsUseed(id)) {
+ return ResultBody.failed().msg("该产品已经被使用，无法删除！");
}
else {
- return ResultBody.failed().msg("删除失败");
+ boolean v = sysProductService.removeById(id);
+ if (v) {
+ return ResultBody.ok().msg("删除成功");
+ } else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+ }
+
+ /**
+ * 判断该产品id下有没有已经使用的订单明细
+ * @param id
+ * @return
+ */
+ private boolean ProIsUseed(Long id)
+ {
+ ProductOrderDetail productOrderDetail=new ProductOrderDetail();
+ productOrderDetail.setProId(id);
+ productOrderDetail=productOrderDetailService.findByObject(productOrderDetail);
+ return (productOrderDetail==null);
+ }
+ /**
+ * 修改状态
+ *
+ * @param params
+ * @return
+ */
+ @ApiOperation(value = "修改数据状态")
+ @GetMapping("/updateEnabled")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
+ })
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ if (params.size()==0)
+ {
+ return ResultBody.failed().msg("参数异常！");
+ }
+ else if (!ProIsUseed(Long.valueOf(MapUtils.getInteger(params, "id")))) {
+ return ResultBody.failed().msg("该产品已经被使用，无法删除！");
+ }
+ else{
+ return sysProductService.updateEnabled(params);
}
}
}
--
Gitblit v1.8.0