From 99f67e978ed5d73ef50172bafa8ed4d9e08c4099 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Fri, 05 Jun 2020 10:37:07 +0800 Subject: [PATCH] 1.新增和修改接口: (1)用户登录后返回信息接口 (2)用户注册 (3)诊断模版 (4)重置密码 修改密码 (5)设为超管 2.增加生成指定长度随机数common --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java index 4020c8d..4c2a3ed 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java @@ -10,6 +10,7 @@ import com.kidgrow.oprationcenter.service.IBusinessRecordsService; import com.kidgrow.oprationcenter.service.IProductOrderDetailService; import com.kidgrow.oprationcenter.service.IProductOrderService; +import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -82,6 +83,24 @@ params.put("limit", 10); } return productOrderDetailService.findAllList(params,sysUser); + } + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @PostMapping("/alldata") + public PageResult findAllDataList(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + if(params.get("diagnosticHospitalId")==null) + return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build(); + return productOrderDetailService.findAllDataList(params); } /** @@ -218,4 +237,15 @@ } return resultBody; } + + /** + * 获取 用户的状态 为试用状态还是 启用状态 + * + * @return + */ + @ApiOperation(value = "获取 用户的状态") + @GetMapping("/getTypeByUser") + public ResultBody getTypeByUser(@LoginUser SysUser sysUser) { + return productOrderDetailService.getTypeByUser(sysUser); + } } -- Gitblit v1.8.0