From 47b5873a74e9b6e2f2bea57ef4b215c492994e8a Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 15:14:13 +0800
Subject: [PATCH] 修改比对套餐id变化的判断条件，直接每次都更新预扣记录的套餐id，并且更新数据的修改时间。
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 104 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
index e7d520d..728e7e6 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -1,27 +1,30 @@
package com.kidgrow.usercenter.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.SysUser;
+import com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.service.ISysDoctorService;
+import com.kidgrow.usercenter.vo.SysDoctorDto;
+import com.kidgrow.usercenter.vo.SysDoctorVo;
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.usercenter.model.SysDoctor;
-import com.kidgrow.usercenter.service.ISysDoctorService;
-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.servlet.http.HttpServletRequest;
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;
/**
@@ -35,7 +38,7 @@
@Slf4j
@RestController
@RequestMapping("/sysdoctor")
-@Api(tags = "")
+@Api(tags = "医生表")
public class SysDoctorController extends BaseController{
@Autowired
private ISysDoctorService sysDoctorService;
@@ -49,12 +52,13 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ public PageResult<SysDoctorDto> list(@RequestParam Map<String, Object> params,@LoginUser SysUser user) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return ResultBody.ok().data(sysDoctorService.findList(params));
+
+ return sysDoctorService.findList(params,user);
}
/**
@@ -66,7 +70,23 @@
SysDoctor model = sysDoctorService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
-
+ /**
+ * 判断用户名是否管理员
+ */
+ @ApiOperation(value = "判断用户名是否管理员")
+ @GetMapping("/userName")
+ public ResultBody findById(@RequestParam String userName) {
+ return sysDoctorService.userIsAdmin(userName);
+ }
+ /**
+ * 根据 Map 查询
+ */
+ @ApiOperation(value = "查询")
+ @PostMapping("/findByMap")
+ public ResultBody findByMap(@RequestBody Map<String,Object> map) {
+ List<SysDoctor> models = sysDoctorService.findByMap(map);
+ return ResultBody.ok().data(models).msg("查询成功");
+ }
/**
* 根据SysDoctor当做查询条件进行查询
*/
@@ -82,17 +102,15 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysDoctor sysDoctor, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysDoctorDto sysDoctor, BindingResult bindingResult, HttpServletRequest request,@LoginUser SysUser user) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysDoctorService.saveOrUpdate(sysDoctor);
- if(v) {
- return ResultBody.ok().data(sysDoctor).msg("保存成功");
- }
- else {
- return ResultBody.failed().msg("保存失败");
- }
+ return sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
}
}
@@ -102,7 +120,7 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v= sysDoctorService.removeById(id);
+ boolean v= sysDoctorService.delete(id);
if(v) {
return ResultBody.ok().msg("删除成功");
}
@@ -110,4 +128,40 @@
return ResultBody.failed().msg("删除失败");
}
}
+ /**
+ * 状态
+ */
+ @ApiOperation(value = "修改状态")
+ @PostMapping("enable")
+ public ResultBody enable(@RequestBody Map<String, Object> params) {
+ Long id = MapUtils.getLong(params, "id");
+ if (id==null) {
+ return ResultBody.failed("请选择一条数据");
+ }
+ return sysDoctorService.enable(params);
+ }
+ /**
+ * 设为管理
+ */
+ @ApiOperation(value = "设为管理员")
+ @PostMapping("setadmin")
+ public ResultBody setAdmin(@RequestBody Map<String, Object> params) {
+ return sysDoctorService.setAdminDoctor(params);
+ }
+ /**
+ * 统计医生的数量
+ * @param datatype 业务类型
+ * 0 自注册医生
+ * 1 签约医生
+ * 2 医答医生
+ * 3 C端医生
+ * 4 H端医生
+ * @return
+ */
+ @ApiOperation(value = "统计医生的数量")
+ @GetMapping("chartDoctor")
+ public ResultBody chartDoctor(int datatype) {
+ int counts= sysDoctorService.chartDoctor(datatype);
+ return ResultBody.ok().data(counts).msg("数据获取成功");
+ }
}
--
Gitblit v1.8.0