From 0ca16900f2e1b7375e34964eee13197106c11700 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 02 Apr 2020 19:26:53 +0800
Subject: [PATCH] 将生成的代码更新到项目（user_center opration_center）
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml | 49
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 28
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml | 65 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java | 46
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java | 113 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java | 26
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml | 71 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 116 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java | 26
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml | 113 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 26
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java | 46
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 26
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java | 46
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java | 26
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserLogsService.java | 10
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml | 86 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml | 74 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java | 26
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml | 61
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 46
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java | 26
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java | 9
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java | 26
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 113 +++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java | 107 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserLogsServiceImpl.java | 27
/dev/null | 97 ---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml | 58 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 113 +++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java | 52 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java | 26
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java | 113 +++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml | 2
45 files changed, 1,558 insertions(+), 359 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
index b056ced..e0c6d5a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
index e496315..cbfa097 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.departmentId != null and p.departmentId !=''">
and department_id = #{p.departmentId}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
index 6bda2a5..081453b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.createTime != null and p.createTime !=''">
and create_time = #{p.createTime}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
index c00ed0b..ad6d873 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.isAnswer != null and p.isAnswer !=''">
and is_answer = #{p.isAnswer}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
index d16dcce..9979ed9 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.createTime != null and p.createTime !=''">
and create_time = #{p.createTime}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
index d151483..a0af4f6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index a17426a..045182d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.hospitalId != null and p.hospitalId !=''">
and hospital_id = #{p.hospitalId}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 6a0222c..3f96fa3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index df12aa3..21ed839 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
index 3931088..49891e0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
index 29e4dc1..d78538b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.applicationName != null and p.applicationName !=''">
and application_name = #{p.applicationName}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 1bc902e..5121e1e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -11,7 +11,7 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
index 44f6f69..d8d407e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
@@ -1,34 +1,28 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
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.oprationcenter.model.BusinessRecords;
+import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
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.BusinessRecords;
-import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+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;
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,12 +43,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 businessRecordsService.findList(params);
+ return ResultBody.ok().data(businessRecordsService.findList(params));
}
/**
@@ -86,8 +80,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- businessRecordsService.saveOrUpdate(businessRecords);
- return ResultBody.ok().data(businessRecords).msg("保存成功");
+ boolean v= businessRecordsService.saveOrUpdate(businessRecords);
+ if(v) {
+ return ResultBody.ok().data(businessRecords).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +96,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- businessRecordsService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= businessRecordsService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
index 822953b..a4948bc 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessServerController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 医院服务信息表
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:04 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -49,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 businessServerService.findList(params);
+ return ResultBody.ok().data(businessServerService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- businessServerService.saveOrUpdate(businessServer);
- return ResultBody.ok().data(businessServer).msg("保存成功");
+ boolean v= businessServerService.saveOrUpdate(businessServer);
+ if(v) {
+ return ResultBody.ok().data(businessServer).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- businessServerService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= businessServerService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index 5ec8aaf..56e0e11 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.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.DataNeed;
-import com.kidgrow.oprationcenter.service.IDataNeedService;
+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.DataNeed;
+import com.kidgrow.oprationcenter.service.IDataNeedService;
+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:04 <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 dataNeedService.findList(params);
+ return ResultBody.ok().data(dataNeedService.findList(params));
}
/**
@@ -80,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- dataNeedService.saveOrUpdate(dataNeed);
- return ResultBody.ok().data(dataNeed).msg("保存成功");
+ boolean v= dataNeedService.saveOrUpdate(dataNeed);
+ if(v) {
+ return ResultBody.ok().data(dataNeed).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -91,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- dataNeedService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= dataNeedService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
index 5ec97f5..5d290e6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorAnswerController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 doctorAnswerService.findList(params);
+ return ResultBody.ok().data(doctorAnswerService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- doctorAnswerService.saveOrUpdate(doctorAnswer);
- return ResultBody.ok().data(doctorAnswer).msg("保存成功");
+ boolean v= doctorAnswerService.saveOrUpdate(doctorAnswer);
+ if(v) {
+ return ResultBody.ok().data(doctorAnswer).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- doctorAnswerService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= doctorAnswerService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
index 5c55f65..9bd1765 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 doctorServerService.findList(params);
+ return ResultBody.ok().data(doctorServerService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- doctorServerService.saveOrUpdate(doctorServer);
- return ResultBody.ok().data(doctorServer).msg("保存成功");
+ boolean v= doctorServerService.saveOrUpdate(doctorServer);
+ if(v) {
+ return ResultBody.ok().data(doctorServer).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- doctorServerService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= doctorServerService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
index c4fa5d1..ccd31cc 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorSigningController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 doctorSigningService.findList(params);
+ return ResultBody.ok().data(doctorSigningService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- doctorSigningService.saveOrUpdate(doctorSigning);
- return ResultBody.ok().data(doctorSigning).msg("保存成功");
+ boolean v= doctorSigningService.saveOrUpdate(doctorSigning);
+ if(v) {
+ return ResultBody.ok().data(doctorSigning).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- doctorSigningService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= doctorSigningService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
index 9eddb20..bfe29d1 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 doctorTempleteService.findList(params);
+ return ResultBody.ok().data(doctorTempleteService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- doctorTempleteService.saveOrUpdate(doctorTemplete);
- return ResultBody.ok().data(doctorTemplete).msg("保存成功");
+ boolean v= doctorTempleteService.saveOrUpdate(doctorTemplete);
+ if(v) {
+ return ResultBody.ok().data(doctorTemplete).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- doctorTempleteService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= doctorTempleteService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
index afcc45e..ee98548 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 hospitalScreeningService.findList(params);
+ return ResultBody.ok().data(hospitalScreeningService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- hospitalScreeningService.saveOrUpdate(hospitalScreening);
- return ResultBody.ok().data(hospitalScreening).msg("保存成功");
+ boolean v= hospitalScreeningService.saveOrUpdate(hospitalScreening);
+ if(v) {
+ return ResultBody.ok().data(hospitalScreening).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- hospitalScreeningService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= hospitalScreeningService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index 2edf84d..33628fa 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 productOrderService.findList(params);
+ return ResultBody.ok().data(productOrderService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- productOrderService.saveOrUpdate(productOrder);
- return ResultBody.ok().data(productOrder).msg("保存成功");
+ boolean v= productOrderService.saveOrUpdate(productOrder);
+ if(v) {
+ return ResultBody.ok().data(productOrder).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- productOrderService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= productOrderService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
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 1dbd74d..ca48f4a 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
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © 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
*/
@@ -49,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 productOrderDetailService.findList(params);
+ return ResultBody.ok().data(productOrderDetailService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- productOrderDetailService.saveOrUpdate(productOrderDetail);
- return ResultBody.ok().data(productOrderDetail).msg("保存成功");
+ boolean v= productOrderDetailService.saveOrUpdate(productOrderDetail);
+ if(v) {
+ return ResultBody.ok().data(productOrderDetail).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- productOrderDetailService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= productOrderDetailService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
index ca40227..3bead1d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
@@ -27,8 +27,8 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description:
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:04 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -49,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 sysFeedbackService.findList(params);
+ return ResultBody.ok().data(sysFeedbackService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- sysFeedbackService.saveOrUpdate(sysFeedback);
- return ResultBody.ok().data(sysFeedback).msg("保存成功");
+ boolean v= sysFeedbackService.saveOrUpdate(sysFeedback);
+ if(v) {
+ return ResultBody.ok().data(sysFeedback).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysFeedbackService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysFeedbackService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java
index 93dae33..c0c6375 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysLoggerController.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.SysLogger;
-import com.kidgrow.oprationcenter.service.ISysLoggerService;
+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.SysLogger;
+import com.kidgrow.oprationcenter.service.ISysLoggerService;
+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:04 <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 sysLoggerService.findList(params);
+ return ResultBody.ok().data(sysLoggerService.findList(params));
}
/**
@@ -80,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- sysLoggerService.saveOrUpdate(sysLogger);
- return ResultBody.ok().data(sysLogger).msg("保存成功");
+ boolean v= sysLoggerService.saveOrUpdate(sysLogger);
+ if(v) {
+ return ResultBody.ok().data(sysLogger).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -91,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysLoggerService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysLoggerService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
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("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java
index b2aec72..e4a04b5 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java
@@ -12,7 +12,7 @@
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 系统用户登录日志表<br>
* @Project: 用户中心<br>
- * @CreateDate: Created in 2020-03-09 10:13:23 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version 1.0
*/
@@ -24,4 +24,11 @@
* @return
*/
List<SysUserLogs> findList(Page<SysUserLogs> page, @Param("p") Map<String, Object> params);
+
+ /**
+ * 根据SysUserLogs对象当做查询条件进行查询
+ * @param
+ * @return SysUserLogs对象
+ */
+ SysUserLogs findByObject(SysUserLogs sysUserLogs);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserLogsService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserLogsService.java
index ad92fc4..433ba40 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserLogsService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserLogsService.java
@@ -10,7 +10,7 @@
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 系统用户登录日志表<br>
* @Project: 用户中心<br>
- * @CreateDate: Created in 2020-03-09 10:13:23 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version 1.0
*/
@@ -21,5 +21,13 @@
* @return
*/
PageResult<SysUserLogs> findList(Map<String, Object> params);
+
+
+ /**
+ * 根据SysUserLogs对象当做查询条件进行查询
+ * @param sysUserLogs
+ * @return SysUserLogs对象
+ */
+ SysUserLogs findByObject(SysUserLogs sysUserLogs);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserLogsServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserLogsServiceImpl.java
index 80af120..891c2dc 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserLogsServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserLogsServiceImpl.java
@@ -1,24 +1,23 @@
package com.kidgrow.usercenter.service.impl;
-import org.springframework.stereotype.Service;
-import com.kidgrow.common.model.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.usercenter.mapper.SysUserLogsMapper;
+import com.kidgrow.usercenter.model.SysUserLogs;
+import com.kidgrow.usercenter.service.ISysUserLogsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysUserLogs;
-import com.kidgrow.usercenter.mapper.SysUserLogsMapper;
-import com.kidgrow.usercenter.service.ISysUserLogsService;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 系统用户登录日志表<br>
* @Project: 用户中心<br>
- * @CreateDate: Created in 2020-03-09 10:13:23 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version 1.0
*/
@@ -36,4 +35,14 @@
List<SysUserLogs> list = baseMapper.findList(page, params);
return PageResult.<SysUserLogs>builder().data(list).code(0).count(page.getTotal()).build();
}
+
+ /**
+ * 根据SysUserLogs对象当做查询条件进行查询
+ * @param sysUserLogs
+ * @return SysUserLogs
+ */
+ @Override
+ public SysUserLogs findByObject(SysUserLogs sysUserLogs){
+ return baseMapper.findByObject(sysUserLogs);
+ }
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml
new file mode 100644
index 0000000..eabadef
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--省市区数据表-->
+<mapper namespace="com.kidgrow.usercenter.mapper.SysAreaMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.areaName != null and p.areaName !=''">
+ and area_name = #{p.areaName}
+ </if>
+ <if test="p.areaParentId != null and p.areaParentId !=''">
+ and area_parent_id = #{p.areaParentId}
+ </if>
+ <if test="p.areaShortname != null and p.areaShortname !=''">
+ and area_shortname = #{p.areaShortname}
+ </if>
+ <if test="p.areaLeveltype != null and p.areaLeveltype !=''">
+ and area_leveltype = #{p.areaLeveltype}
+ </if>
+ <if test="p.areaCitycode != null and p.areaCitycode !=''">
+ and area_citycode = #{p.areaCitycode}
+ </if>
+ <if test="p.areaZipcode != null and p.areaZipcode !=''">
+ and area_zipcode = #{p.areaZipcode}
+ </if>
+ <if test="p.areaLng != null and p.areaLng !=''">
+ and area_lng = #{p.areaLng}
+ </if>
+ <if test="p.areaLat != null and p.areaLat !=''">
+ and area_Lat = #{p.areaLat}
+ </if>
+ <if test="p.areaCh != null and p.areaCh !=''">
+ and area_ch = #{p.areaCh}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysArea当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysArea">
+ select
+ <include refid="Column_List"/>
+ from sys_area
+ <include refid="where"/>
+ order by id desc
+ </select>
+
+ <!--定义根据-SysArea当作查询条件返回对象集合-->
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysArea">
+ select
+ <include refid="Column_List"/>
+ from sys_area
+ <include refid="where"/>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
new file mode 100644
index 0000000..e79f1e0
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--公司信息表-->
+<mapper namespace="com.kidgrow.usercenter.mapper.SysCompanyMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.orgId != null and p.orgId !=''">
+ and org_id = #{p.orgId}
+ </if>
+ <if test="p.companyName != null and p.companyName !=''">
+ and company_name = #{p.companyName}
+ </if>
+ <if test="p.companyArea != null and p.companyArea !=''">
+ and company_area = #{p.companyArea}
+ </if>
+ <if test="p.companyTel != null and p.companyTel !=''">
+ and company_tel = #{p.companyTel}
+ </if>
+ <if test="p.companyAdress != null and p.companyAdress !=''">
+ and company_adress = #{p.companyAdress}
+ </if>
+ <if test="p.companyLogo != null and p.companyLogo !=''">
+ and company_logo = #{p.companyLogo}
+ </if>
+ <if test="p.companyAbout != null and p.companyAbout !=''">
+ and company_about = #{p.companyAbout}
+ </if>
+ <if test="p.tenantId != null and p.tenantId !=''">
+ and tenant_id = #{p.tenantId}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
+ </if>
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
+ </if>
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
+ </if>
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
+ </if>
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
+ </if>
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
+ </if>
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysCompany当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysCompany">
+ select
+ <include refid="Column_List"/>
+ from sys_company
+ <include refid="where"/>
+ order by id desc
+ </select>
+
+ <!--定义根据-SysCompany当作查询条件返回对象集合-->
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysCompany">
+ select
+ <include refid="Column_List"/>
+ from sys_company
+ <include refid="where"/>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml
new file mode 100644
index 0000000..e18fa69
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--科室表-->
+<mapper namespace="com.kidgrow.usercenter.mapper.SysDepartmentMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
+ </if>
+ <if test="p.orgId != null and p.orgId !=''">
+ and org_id = #{p.orgId}
+ </if>
+ <if test="p.serverUserId != null and p.serverUserId !=''">
+ and server_user_id = #{p.serverUserId}
+ </if>
+ <if test="p.serverUserName != null and p.serverUserName !=''">
+ and server_user_name = #{p.serverUserName}
+ </if>
+ <if test="p.departmentAbout != null and p.departmentAbout !=''">
+ and department_about = #{p.departmentAbout}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
+ </if>
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
+ </if>
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
+ </if>
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
+ </if>
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
+ </if>
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysDepartment当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysDepartment">
+ select
+ <include refid="Column_List"/>
+ from sys_department
+ <include refid="where"/>
+ order by id desc
+ </select>
+
+ <!--定义根据-SysDepartment当作查询条件返回对象集合-->
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysDepartment">
+ select
+ <include refid="Column_List"/>
+ from sys_department
+ <include refid="where"/>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
new file mode 100644
index 0000000..39cd3a1
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--系统字典表-->
+<mapper namespace="com.kidgrow.usercenter.mapper.SysDictionariesMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.dictionariesName != null and p.dictionariesName !=''">
+ and dictionaries_name = #{p.dictionariesName}
+ </if>
+ <if test="p.dictionariesClassId != null and p.dictionariesClassId !=''">
+ and dictionaries_class_id = #{p.dictionariesClassId}
+ </if>
+ <if test="p.dictionariesOrder != null and p.dictionariesOrder !=''">
+ and dictionaries_order = #{p.dictionariesOrder}
+ </if>
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
+ </if>
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
+ </if>
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
+ </if>
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
+ </if>
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
+ </if>
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysDictionaries当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysDictionaries">
+ select
+ <include refid="Column_List"/>
+ from sys_dictionaries
+ <include refid="where"/>
+ order by id desc
+ </select>
+
+ <!--定义根据-SysDictionaries当作查询条件返回对象集合-->
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysDictionaries">
+ select
+ <include refid="Column_List"/>
+ from sys_dictionaries
+ <include refid="where"/>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
new file mode 100644
index 0000000..b3da14e
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!---->
+<mapper namespace="com.kidgrow.usercenter.mapper.SysDoctorMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.userId != null and p.userId !=''">
+ and user_id = #{p.userId}
+ </if>
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
+ </if>
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
+ </if>
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
+ </if>
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
+ </if>
+ <if test="p.doctorName != null and p.doctorName !=''">
+ and doctor_name = #{p.doctorName}
+ </if>
+ <if test="p.doctorLogo != null and p.doctorLogo !=''">
+ and doctor_logo = #{p.doctorLogo}
+ </if>
+ <if test="p.doctorTel != null and p.doctorTel !=''">
+ and doctor_tel = #{p.doctorTel}
+ </if>
+ <if test="p.doctorRankId != null and p.doctorRankId !=''">
+ and doctor_rank_id = #{p.doctorRankId}
+ </if>
+ <if test="p.doctorRank != null and p.doctorRank !=''">
+ and doctor_rank = #{p.doctorRank}
+ </if>
+ <if test="p.doctorOtherLink != null and p.doctorOtherLink !=''">
+ and doctor_other_link = #{p.doctorOtherLink}
+ </if>
+ <if test="p.doctorEmail != null and p.doctorEmail !=''">
+ and doctor_email = #{p.doctorEmail}
+ </if>
+ <if test="p.doctorAbout != null and p.doctorAbout !=''">
+ and doctor_about = #{p.doctorAbout}
+ </if>
+ <if test="p.isAnswer != null and p.isAnswer !=''">
+ and is_answer = #{p.isAnswer}
+ </if>
+ <if test="p.isSigning != null and p.isSigning !=''">
+ and is_signing = #{p.isSigning}
+ </if>
+ <if test="p.isTop != null and p.isTop !=''">
+ and is_top = #{p.isTop}
+ </if>
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
+ </if>
+ <if test="p.doctorState != null and p.doctorState !=''">
+ and doctor_state = #{p.doctorState}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
+ </if>
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
+ </if>
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
+ </if>
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
+ </if>
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
+ </if>
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysDoctor当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysDoctor">
+ select
+ <include refid="Column_List"/>
+ from sys_doctor
+ <include refid="where"/>
+ order by id desc
+ </select>
+
+ <!--定义根据-SysDoctor当作查询条件返回对象集合-->
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysDoctor">
+ select
+ <include refid="Column_List"/>
+ from sys_doctor
+ <include refid="where"/>
+ order by id desc
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
index 90980cc..17d30d1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!---->
+<!--医院基础信息表-->
<mapper namespace="com.kidgrow.usercenter.mapper.SysHospitalMapper">
<!--定义查询列-->
<sql id="Column_List">
@@ -12,48 +12,112 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="hospitalName != null and hospitalName !=''">
- and hospital_name = #{hospitalName}
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
</if>
- <if test="createUserId != null and createUserId != ''">
- and create_user_id = #{createUserId}
+ <if test="p.orgId != null and p.orgId !=''">
+ and org_id = #{p.orgId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.hospitalShortName != null and p.hospitalShortName !=''">
+ and hospital_short_name = #{p.hospitalShortName}
</if>
- <if test="updateUserId != null and updateUserId != ''">
- and update_user_id = #{updateUserId}
+ <if test="p.hospitalCode != null and p.hospitalCode !=''">
+ and hospital_code = #{p.hospitalCode}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.hospitalTypeId != null and p.hospitalTypeId !=''">
+ and hospital_type_id = #{p.hospitalTypeId}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.hospitalTypeName != null and p.hospitalTypeName !=''">
+ and hospital_type_name = #{p.hospitalTypeName}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.hospitalTel != null and p.hospitalTel !=''">
+ and hospital_tel = #{p.hospitalTel}
</if>
- <if test="isDel != null">
- and is_del = #{isDel}
+ <if test="p.hospitalArea != null and p.hospitalArea !=''">
+ and hospital_area = #{p.hospitalArea}
</if>
- <if test="tenantId != null">
- and tenant_id = #{tenantId}
+ <if test="p.areaCode != null and p.areaCode !=''">
+ and area_code = #{p.areaCode}
</if>
- <if test="enabled != null">
- and enabled = #{enabled}
+ <if test="p.hospitalAdress != null and p.hospitalAdress !=''">
+ and hospital_adress = #{p.hospitalAdress}
+ </if>
+ <if test="p.latitude != null and p.latitude !=''">
+ and latitude = #{p.latitude}
+ </if>
+ <if test="p.longitude != null and p.longitude !=''">
+ and longitude = #{p.longitude}
+ </if>
+ <if test="p.hospitalQualifiedId != null and p.hospitalQualifiedId !=''">
+ and hospital_qualified_id = #{p.hospitalQualifiedId}
+ </if>
+ <if test="p.hospitalQualifiedName != null and p.hospitalQualifiedName !=''">
+ and hospital_qualified_name = #{p.hospitalQualifiedName}
+ </if>
+ <if test="p.hospitalLitLogo != null and p.hospitalLitLogo !=''">
+ and hospital_lit_logo = #{p.hospitalLitLogo}
+ </if>
+ <if test="p.hospitalLogo != null and p.hospitalLogo !=''">
+ and hospital_logo = #{p.hospitalLogo}
+ </if>
+ <if test="p.hospitalAdimage != null and p.hospitalAdimage !=''">
+ and hospital_adimage = #{p.hospitalAdimage}
+ </if>
+ <if test="p.hospitalAbout != null and p.hospitalAbout !=''">
+ and hospital_about = #{p.hospitalAbout}
+ </if>
+ <if test="p.isScreen != null and p.isScreen !=''">
+ and is_screen = #{p.isScreen}
+ </if>
+ <if test="p.serverUserId != null and p.serverUserId !=''">
+ and server_user_id = #{p.serverUserId}
+ </if>
+ <if test="p.serverUserName != null and p.serverUserName !=''">
+ and server_user_name = #{p.serverUserName}
+ </if>
+ <if test="p.hospitalState != null and p.hospitalState !=''">
+ and hospital_state = #{p.hospitalState}
+ </if>
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
+ </if>
+ <if test="p.tenantId != null and p.tenantId !=''">
+ and tenant_id = #{p.tenantId}
+ </if>
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
+ </if>
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
+ </if>
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
+ </if>
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
+ </if>
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
+ </if>
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
+ </if>
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
</where>
</sql>
<!--定义根据-SysHospital当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysHospital">
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysHospital">
select
<include refid="Column_List"/>
from sys_hospital
- <include refid="where"></include>
+ <include refid="where"/>
+ order by id desc
</select>
<!--定义根据-SysHospital当作查询条件返回对象集合-->
@@ -61,7 +125,7 @@
select
<include refid="Column_List"/>
from sys_hospital
-
+ <include refid="where"/>
order by id desc
</select>
</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
index 993f92c..4be2b96 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
@@ -12,61 +12,62 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="orgLevel != null and orgLevel !=''">
- and org_level = #{orgLevel}
+ <if test="p.orgLevel != null and p.orgLevel !=''">
+ and org_level = #{p.orgLevel}
</if>
- <if test="orgAttr != null and orgAttr !=''">
- and org_attr = #{orgAttr}
+ <if test="p.orgAttr != null and p.orgAttr !=''">
+ and org_attr = #{p.orgAttr}
</if>
- <if test="orgParentId != null and orgParentId !=''">
- and org_parent_id = #{orgParentId}
+ <if test="p.orgParentId != null and p.orgParentId !=''">
+ and org_parent_id = #{p.orgParentId}
</if>
- <if test="orgName != null and orgName !=''">
- and org_name = #{orgName}
+ <if test="p.orgName != null and p.orgName !=''">
+ and org_name = #{p.orgName}
</if>
- <if test="orgOrder != null and orgOrder !=''">
- and org_order = #{orgOrder}
+ <if test="p.orgOrder != null and p.orgOrder !=''">
+ and org_order = #{p.orgOrder}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
</where>
</sql>
<!--定义根据-SysOrganization当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.common.model.SysOrganization">
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysOrganization">
select
<include refid="Column_List"/>
from sys_organization
<include refid="where"/>
+ order by id desc
</select>
<!--定义根据-SysOrganization当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.common.model.SysOrganization">
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysOrganization">
select
<include refid="Column_List"/>
from sys_organization
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml
index f941c96..d7aa78c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml
@@ -2,8 +2,64 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!--系统用户登录日志表-->
<mapper namespace="com.kidgrow.usercenter.mapper.SysUserLogsMapper">
+ <!--定义查询列-->
+ <sql id="Column_List">
+ *
+ </sql>
+
+ <!--sql查询片段-->
+ <sql id="where">
+ <where>
+ <!--查询条件自行添加-->
+ is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
+ </if>
+ <if test="p.loginTime != null and p.loginTime !=''">
+ and login_time = #{p.loginTime}
+ </if>
+ <if test="p.loginIp != null and p.loginIp !=''">
+ and login_ip = #{p.loginIp}
+ </if>
+ <if test="p.loginAgentBrowser != null and p.loginAgentBrowser !=''">
+ and login_agent_browser = #{p.loginAgentBrowser}
+ </if>
+ <if test="p.loginAgentSystem != null and p.loginAgentSystem !=''">
+ and login_agent_system = #{p.loginAgentSystem}
+ </if>
+ <if test="p.loginNums != null and p.loginNums !=''">
+ and login_nums = #{p.loginNums}
+ </if>
+ <if test="p.loginType != null and p.loginType !=''">
+ and login_type = #{p.loginType}
+ </if>
+ <if test="p.userid != null and p.userid !=''">
+ and userid = #{p.userid}
+ </if>
+ <if test="p.username != null and p.username !=''">
+ and username = #{p.username}
+ </if>
+ <if test="p.clientId != null and p.clientId !=''">
+ and client_id = #{p.clientId}
+ </if>
+ </where>
+ </sql>
+
+ <!--定义根据-SysUserLogs当作查询条件返回对象-->
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysUserLogs">
+ select
+ <include refid="Column_List"/>
+ from sys_user_logs
+ <include refid="where"/>
+ order by id desc
+ </select>
+
<!--定义根据-SysUserLogs当作查询条件返回对象集合-->
<select id="findList" resultType="com.kidgrow.usercenter.model.SysUserLogs">
- select * from sys_user_logs t
+ select
+ <include refid="Column_List"/>
+ from sys_user_logs
+ <include refid="where"/>
+ order by id desc
</select>
</mapper>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml
index 4c3650d..587d8ec 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml
@@ -12,52 +12,53 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="userId != null and userId !=''">
- and user_id = #{userId}
+ <if test="p.userId != null and p.userId !=''">
+ and user_id = #{p.userId}
</if>
- <if test="orgId != null and orgId !=''">
- and org_id = #{orgId}
+ <if test="p.orgId != null and p.orgId !=''">
+ and org_id = #{p.orgId}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
</where>
</sql>
<!--定义根据-SysUserOrg当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.common.model.SysUserOrg">
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysUserOrg">
select
<include refid="Column_List"/>
from sys_user_org
<include refid="where"/>
+ order by id desc
</select>
<!--定义根据-SysUserOrg当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.common.model.SysUserOrg">
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysUserOrg">
select
<include refid="Column_List"/>
from sys_user_org
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
new file mode 100644
index 0000000..d0be6a6
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysAreaController.java
@@ -0,0 +1,107 @@
+package com.kidgrow.usercenter.controller;
+
+import com.kidgrow.common.controller.BaseController;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.usercenter.model.SysArea;
+import com.kidgrow.usercenter.service.ISysAreaService;
+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 javax.validation.Valid;
+import java.util.Map;
+
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ * @Description: 省市区数据表
+ * @Project: 用户中心
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysarea")
+@Api(tags = "省市区数据表")
+public class SysAreaController extends BaseController{
+ @Autowired
+ private ISysAreaService sysAreaService;
+
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysAreaService.findList(params));
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/{id}")
+ public ResultBody findById(@PathVariable Long id) {
+ SysArea model = sysAreaService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysArea当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysArea当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysArea sysArea) {
+ SysArea model = sysAreaService.findByObject(sysArea);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping
+ public ResultBody save(@Valid @RequestBody SysArea sysArea, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysAreaService.saveOrUpdate(sysArea);
+ if(v) {
+ return ResultBody.ok().data(sysArea).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation(value = "删除")
+ @DeleteMapping("/{id}")
+ public ResultBody delete(@PathVariable Long id) {
+ boolean v= sysAreaService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
new file mode 100644
index 0000000..fecf4da
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
@@ -0,0 +1,113 @@
+package com.kidgrow.usercenter.controller;
+
+import java.util.Map;
+import com.kidgrow.common.controller.BaseController;
+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 com.kidgrow.usercenter.model.SysCompany;
+import com.kidgrow.usercenter.service.ISysCompanyService;
+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-02 18:32:36 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/syscompany")
+@Api(tags = "公司信息表")
+public class SysCompanyController extends BaseController{
+ @Autowired
+ private ISysCompanyService sysCompanyService;
+
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysCompanyService.findList(params));
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/{id}")
+ public ResultBody findById(@PathVariable Long id) {
+ SysCompany model = sysCompanyService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysCompany当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysCompany当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysCompany sysCompany) {
+ SysCompany model = sysCompanyService.findByObject(sysCompany);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping
+ public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysCompanyService.saveOrUpdate(sysCompany);
+ if(v) {
+ return ResultBody.ok().data(sysCompany).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation(value = "删除")
+ @DeleteMapping("/{id}")
+ public ResultBody delete(@PathVariable Long id) {
+ boolean v= sysCompanyService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
new file mode 100644
index 0000000..df65704
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
@@ -0,0 +1,113 @@
+package com.kidgrow.usercenter.controller;
+
+import java.util.Map;
+import com.kidgrow.common.controller.BaseController;
+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 com.kidgrow.usercenter.model.SysDepartment;
+import com.kidgrow.usercenter.service.ISysDepartmentService;
+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-02 18:32:36 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysdepartment")
+@Api(tags = "科室表")
+public class SysDepartmentController extends BaseController{
+ @Autowired
+ private ISysDepartmentService sysDepartmentService;
+
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysDepartmentService.findList(params));
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/{id}")
+ public ResultBody findById(@PathVariable Long id) {
+ SysDepartment model = sysDepartmentService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysDepartment当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysDepartment当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysDepartment sysDepartment) {
+ SysDepartment model = sysDepartmentService.findByObject(sysDepartment);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping
+ public ResultBody save(@Valid @RequestBody SysDepartment sysDepartment, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysDepartmentService.saveOrUpdate(sysDepartment);
+ if(v) {
+ return ResultBody.ok().data(sysDepartment).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation(value = "删除")
+ @DeleteMapping("/{id}")
+ public ResultBody delete(@PathVariable Long id) {
+ boolean v= sysDepartmentService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java
new file mode 100644
index 0000000..5dd2d71
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDictionariesController.java
@@ -0,0 +1,113 @@
+package com.kidgrow.usercenter.controller;
+
+import java.util.Map;
+import com.kidgrow.common.controller.BaseController;
+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 com.kidgrow.usercenter.model.SysDictionaries;
+import com.kidgrow.usercenter.service.ISysDictionariesService;
+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-02 18:32:36 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysdictionaries")
+@Api(tags = "系统字典表")
+public class SysDictionariesController extends BaseController{
+ @Autowired
+ private ISysDictionariesService sysDictionariesService;
+
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysDictionariesService.findList(params));
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/{id}")
+ public ResultBody findById(@PathVariable Long id) {
+ SysDictionaries model = sysDictionariesService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysDictionaries当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysDictionaries当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysDictionaries sysDictionaries) {
+ SysDictionaries model = sysDictionariesService.findByObject(sysDictionaries);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping
+ public ResultBody save(@Valid @RequestBody SysDictionaries sysDictionaries, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysDictionariesService.saveOrUpdate(sysDictionaries);
+ if(v) {
+ return ResultBody.ok().data(sysDictionaries).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation(value = "删除")
+ @DeleteMapping("/{id}")
+ public ResultBody delete(@PathVariable Long id) {
+ boolean v= sysDictionariesService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+}
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
new file mode 100644
index 0000000..e7d520d
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -0,0 +1,113 @@
+package com.kidgrow.usercenter.controller;
+
+import java.util.Map;
+import com.kidgrow.common.controller.BaseController;
+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 com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.service.ISysDoctorService;
+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-02 18:32:36 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ * @version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sysdoctor")
+@Api(tags = "")
+public class SysDoctorController extends BaseController{
+ @Autowired
+ private ISysDoctorService sysDoctorService;
+
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysDoctorService.findList(params));
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/{id}")
+ public ResultBody findById(@PathVariable Long id) {
+ SysDoctor model = sysDoctorService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysDoctor当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysDoctor当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysDoctor sysDoctor) {
+ SysDoctor model = sysDoctorService.findByObject(sysDoctor);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 新增or更新
+ */
+ @ApiOperation(value = "保存")
+ @PostMapping
+ public ResultBody save(@Valid @RequestBody SysDoctor sysDoctor, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysDoctorService.saveOrUpdate(sysDoctor);
+ if(v) {
+ return ResultBody.ok().data(sysDoctor).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
+ }
+
+ /**
+ * 删除
+ */
+ @ApiOperation(value = "删除")
+ @DeleteMapping("/{id}")
+ public ResultBody delete(@PathVariable Long id) {
+ boolean v= sysDoctorService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index 00e3687..b34f9a7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -26,16 +26,16 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description:
+ * @Description: 医院基础信息表
* @Project: 用户中心
- * @CreateDate: Created in 2020-03-11 16:15:31 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@Slf4j
@RestController
@RequestMapping("/syshospital")
-@Api(tags = "")
+@Api(tags = "医院基础信息表")
public class SysHospitalController extends BaseController{
@Autowired
private ISysHospitalService sysHospitalService;
@@ -49,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 sysHospitalService.findList(params);
+ return ResultBody.ok().data(sysHospitalService.findList(params));
}
/**
@@ -86,8 +86,13 @@
if (bindingResult.hasErrors()) {
return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
} else {
- sysHospitalService.saveOrUpdate(sysHospital);
- return ResultBody.ok().data(sysHospital).msg("保存成功");
+ boolean v= sysHospitalService.saveOrUpdate(sysHospital);
+ if(v) {
+ return ResultBody.ok().data(sysHospital).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysHospitalService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysHospitalService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
deleted file mode 100644
index a63e640..0000000
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.kidgrow.usercenter.controller;
-
-import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
-import com.kidgrow.common.model.SysOrganization;
-import com.kidgrow.usercenter.service.ISysOrganizationService;
-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 javax.validation.Valid;
-import java.util.Map;
-
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description: 组织架构表
- * @Project: 用户中心
- * @CreateDate: Created in 2020-03-31 11:01:35 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version: 1.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/sysorganization")
-@Api(tags = "组织架构表")
-public class SysOrganizationController extends BaseController{
- @Autowired
- private ISysOrganizationService sysOrganizationService;
-
- /**
- * 列表
- */
- @ApiOperation(value = "查询列表")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
- @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
- })
- @GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
- }
- return sysOrganizationService.findList(params);
- }
-
- /**
- * 查询
- */
- @ApiOperation(value = "查询")
- @GetMapping("/{id}")
- public ResultBody findById(@PathVariable Long id) {
- SysOrganization model = sysOrganizationService.getById(id);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 根据SysOrganization当做查询条件进行查询
- */
- @ApiOperation(value = "根据SysOrganization当做查询条件进行查询")
- @PostMapping("/query")
- public ResultBody findByObject(@RequestBody SysOrganization sysOrganization) {
- SysOrganization model = sysOrganizationService.findByObject(sysOrganization);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 新增or更新
- */
- @ApiOperation(value = "保存")
- @PostMapping
- public ResultBody save(@Valid @RequestBody SysOrganization sysOrganization, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
- sysOrganizationService.saveOrUpdate(sysOrganization);
- return ResultBody.ok().data(sysOrganization).msg("保存成功");
- }
- }
-
- /**
- * 删除
- */
- @ApiOperation(value = "删除")
- @DeleteMapping("/{id}")
- public ResultBody delete(@PathVariable Long id) {
- sysOrganizationService.removeById(id);
- return ResultBody.ok().msg("删除成功");
- }
-}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
index 4bee7c6..c0ad40f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserLogsController.java
@@ -1,7 +1,7 @@
package com.kidgrow.usercenter.controller;
import java.util.Map;
-
+import com.kidgrow.common.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
@@ -14,6 +14,8 @@
import com.kidgrow.usercenter.service.ISysUserLogsService;
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;
@@ -26,7 +28,7 @@
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
* @Description: 系统用户登录日志表
* @Project: 用户中心
- * @CreateDate: Created in 2020-03-09 10:13:23 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -34,7 +36,7 @@
@RestController
@RequestMapping("/sysuserlogs")
@Api(tags = "系统用户登录日志表")
-public class SysUserLogsController {
+public class SysUserLogsController extends BaseController{
@Autowired
private ISysUserLogsService sysUserLogsService;
@@ -47,8 +49,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
- return sysUserLogsService.findList(params);
+ public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
+ if(params.size()==0){
+ params.put("page",1);
+ params.put("limit",10);
+ }
+ return ResultBody.ok().data(sysUserLogsService.findList(params));
}
/**
@@ -56,8 +62,18 @@
*/
@ApiOperation(value = "查询")
@GetMapping("/{id}")
- public ResultBody findUserById(@PathVariable Long id) {
+ public ResultBody findById(@PathVariable Long id) {
SysUserLogs model = sysUserLogsService.getById(id);
+ return ResultBody.ok().data(model).msg("查询成功");
+ }
+
+ /**
+ * 根据SysUserLogs当做查询条件进行查询
+ */
+ @ApiOperation(value = "根据SysUserLogs当做查询条件进行查询")
+ @PostMapping("/query")
+ public ResultBody findByObject(@RequestBody SysUserLogs sysUserLogs) {
+ SysUserLogs model = sysUserLogsService.findByObject(sysUserLogs);
return ResultBody.ok().data(model).msg("查询成功");
}
@@ -66,9 +82,18 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@RequestBody SysUserLogs sysUserLogs) {
- sysUserLogsService.saveOrUpdate(sysUserLogs);
- return ResultBody.ok().msg("保存成功");
+ public ResultBody save(@Valid @RequestBody SysUserLogs sysUserLogs, BindingResult bindingResult) {
+ if (bindingResult.hasErrors()) {
+ return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ } else {
+ boolean v= sysUserLogsService.saveOrUpdate(sysUserLogs);
+ if(v) {
+ return ResultBody.ok().data(sysUserLogs).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
}
/**
@@ -77,7 +102,12 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- sysUserLogsService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= sysUserLogsService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
deleted file mode 100644
index fb9520f..0000000
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.kidgrow.usercenter.controller;
-
-import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.common.model.PageResult;
-import com.kidgrow.common.model.ResultBody;
-import com.kidgrow.common.model.SysUserOrg;
-import com.kidgrow.usercenter.service.ISysUserOrgService;
-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 javax.validation.Valid;
-import java.util.Map;
-
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description: 用户和组织关系表
- * @Project: 用户中心
- * @CreateDate: Created in 2020-03-31 11:01:35 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version: 1.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/sysuserorg")
-@Api(tags = "用户和组织关系表")
-public class SysUserOrgController extends BaseController{
- @Autowired
- private ISysUserOrgService sysUserOrgService;
-
- /**
- * 列表
- */
- @ApiOperation(value = "查询列表")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
- @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
- })
- @GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
- if(params.size()==0){
- params.put("page",1);
- params.put("limit",10);
- }
- return sysUserOrgService.findList(params);
- }
-
- /**
- * 查询
- */
- @ApiOperation(value = "查询")
- @GetMapping("/{id}")
- public ResultBody findById(@PathVariable Long id) {
- SysUserOrg model = sysUserOrgService.getById(id);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 根据SysUserOrg当做查询条件进行查询
- */
- @ApiOperation(value = "根据SysUserOrg当做查询条件进行查询")
- @PostMapping("/query")
- public ResultBody findByObject(@RequestBody SysUserOrg sysUserOrg) {
- SysUserOrg model = sysUserOrgService.findByObject(sysUserOrg);
- return ResultBody.ok().data(model).msg("查询成功");
- }
-
- /**
- * 新增or更新
- */
- @ApiOperation(value = "保存")
- @PostMapping
- public ResultBody save(@Valid @RequestBody SysUserOrg sysUserOrg, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
- sysUserOrgService.saveOrUpdate(sysUserOrg);
- return ResultBody.ok().data(sysUserOrg).msg("保存成功");
- }
- }
-
- /**
- * 删除
- */
- @ApiOperation(value = "删除")
- @DeleteMapping("/{id}")
- public ResultBody delete(@PathVariable Long id) {
- sysUserOrgService.removeById(id);
- return ResultBody.ok().msg("删除成功");
- }
-}
--
Gitblit v1.8.0