cbx
/
Medical_Treatment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zmy03

jpz
zmyYYDS 2024-01-11 19:35:46 +08:00
parent e823462f26
commit 4a40a3f0ac
33 changed files with 231 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doctor-auth/src/main/resources/bootstrap.yml
View File

@ -1,9 +1,9 @@
# Tomcat
server:
server:
port: 9200
# Spring
spring:
spring:
application:
# 应用名称
name: doctor-auth
@ -15,21 +15,13 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# feign 配置
feign:
compression:
request:
enabled: true
min-request-size: 10000
response:
enabled: true

12
doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java
View File

@ -2,7 +2,7 @@ package doctor.common.core.constant;
/**
* 通用常量信息
*
*
* @author ruoyi
*/
public class Constants
@ -57,6 +57,16 @@ public class Constants
*/
public static final Integer FAIL = 500;
/**
* 成功标记
*/
public static final String SUCCESS_HEALTH = "0000";
/**
* 失败标记
*/
public static final String FAIL_HEALTH = "9001";
/**
* 登录成功状态
*/

57
doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java
View File

@ -1,7 +1,8 @@
package doctor.common.core.domain;
import doctor.common.core.constant.Constants;
import doctor.common.core.constant.HealthConstants;
import java.io.Serializable;
@ -15,25 +16,25 @@ public class HealthR<T> implements Serializable
private static final long serialVersionUID = 1L;
/** 成功 */
public static final String SUCCESS = HealthConstants.SUCCESS;
public static final String SUCCESS = Constants.SUCCESS_HEALTH;
/** 失败 */
public static final String FAIL = HealthConstants.FAIL;
private String message;
public static final String FAIL = Constants.FAIL_HEALTH;
private String status;
private String message;
private T result;
public static <T> HealthR<T> ok()
{
return restResult(null,SUCCESS, null);
return restResult(null, SUCCESS, null);
}
public static <T> HealthR<T> ok(T result)
{
return restResult(result,SUCCESS, null);
return restResult(result, SUCCESS, null);
}
public static <T> HealthR<T> ok(T result, String message)
@ -43,7 +44,7 @@ public class HealthR<T> implements Serializable
public static <T> HealthR<T> fail()
{
return restResult(null,FAIL, null);
return restResult(null, FAIL, null);
}
public static <T> HealthR<T> fail(String message)
@ -53,12 +54,12 @@ public class HealthR<T> implements Serializable
public static <T> HealthR<T> fail(T result)
{
return restResult(result,FAIL, null);
return restResult(result, FAIL, null);
}
public static <T> HealthR<T> fail(T result, String message)
{
return restResult(result,FAIL, message);
return restResult(result, FAIL, message);
}
public static <T> HealthR<T> fail(String status, String message)
@ -69,39 +70,33 @@ public class HealthR<T> implements Serializable
private static <T> HealthR<T> restResult(T result, String status, String message)
{
HealthR<T> apiResult = new HealthR<>();
apiResult.setStatus(status);
apiResult.setResult(result);
apiResult.setMessage(message);
apiResult.setStatus(status);
return apiResult;
}
public String getMessage()
{
return message;
}
public void setMessage(String message)
{
this.message = message;
}
public String getStatus()
{
public String getStatus() {
return status;
}
public void setStatus(String status)
{
public void setStatus(String status) {
this.status = status;
}
public T getResult()
{
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public T getResult() {
return result;
}
public void setResult(T result)
{
public void setResult(T result) {
this.result = result;
}
@ -112,6 +107,8 @@ public class HealthR<T> implements Serializable
public static <T> Boolean isSuccess(HealthR<T> ret)
{
return HealthR.SUCCESS .equals(ret.getStatus()) ;
return HealthR.SUCCESS == ret.getStatus();
}
}

10
doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java
View File

@ -16,7 +16,7 @@ import doctor.common.core.web.page.TableDataInfo;
/**
* web层通用数据处理
*
*
* @author ruoyi
*/
public class BaseController
@ -43,9 +43,9 @@ public class BaseController
/**
* 设置请求分页数据
*/
protected void startPage()
protected void startPage(Integer page, Integer count)
{
PageUtils.startPage();
PageUtils.startPage(page,count);
}
/**
@ -120,7 +120,7 @@ public class BaseController
/**
* 响应返回结果
*
*
* @param rows 影响行数
* @return 操作结果
*/
@ -131,7 +131,7 @@ public class BaseController
/**
* 响应返回结果
*
*
* @param result 结果
* @return 操作结果
*/

4
doctor-gateway/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置

4
doctor-modules/doctor-file/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置

6
doctor-modules/doctor-gen/src/main/java/doctor/gen/controller/GenController.java
View File

@ -30,7 +30,7 @@ import doctor.gen.service.IGenTableService;
/**
* 代码生成 操作处理
*
*
* @author ruoyi
*/
@RequestMapping("/gen")
@ -50,7 +50,7 @@ public class GenController extends BaseController
@GetMapping("/list")
public TableDataInfo genList(GenTable genTable)
{
startPage();
startPage(page, count);
List<GenTable> list = genTableService.selectGenTableList(genTable);
return getDataTable(list);
}
@ -79,7 +79,7 @@ public class GenController extends BaseController
@GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable)
{
startPage();
startPage(page, count);
List<GenTable> list = genTableService.selectDbTableList(genTable);
return getDataTable(list);
}

4
doctor-modules/doctor-gen/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置

5
doctor-modules/doctor-gen/src/main/resources/vm/java/controller.java.vm
View File

@ -1,7 +1,6 @@
package ${packageName}.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -27,7 +26,7 @@ import doctor.common.core.web.page.TableDataInfo;
/**
* ${functionName}Controller
*
*
* @author ${author}
* @date ${datetime}
*/
@ -46,7 +45,7 @@ public class ${ClassName}Controller extends BaseController
#if($table.crud || $table.sub)
public TableDataInfo list(${ClassName} ${className})
{
startPage();
startPage(page, count);
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return getDataTable(list);
}

29
doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java
View File

@ -1,37 +1,40 @@
package doctor.controller;
import doctor.common.core.domain.HealthR;
import doctor.common.core.web.controller.BaseController;
import doctor.common.core.web.page.TableDataInfo;
import doctor.domain.dto.VideoDto;
import doctor.domain.entity.VideoCategoryEntity;
import doctor.domain.entity.VideoEntity;
import doctor.domain.vo.VideoCategoryVo;
import doctor.domain.vo.VideoVo;
import doctor.service.HealthUserVideoService;
import doctor.util.ConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.github.pagehelper.page.PageMethod.startPage;
@RestController
@RequestMapping("/user/video/v1")
public class HealthUserVideoController extends BaseController {
public class HealthUserVideoController{
@Autowired
private HealthUserVideoService healthUserVideoService;
@GetMapping("/findVideoCategoryList")
public TableDataInfo findVideoCategoryList(){
startPage();
List<VideoCategoryEntity> List = healthUserVideoService.findVideoCategoryList();
return getDataTable(List);
public HealthR<List<VideoCategoryVo>> findVideoCategoryList(){
List<VideoCategoryVo> List = healthUserVideoService.findVideoCategoryList();
return HealthR.ok(List);
}
@GetMapping("/findVideoVoList")
public TableDataInfo findVideoVoList(@RequestParam("categoryId") Integer categoryId){
startPage();
List<VideoEntity> List = healthUserVideoService.findVideoVoList(categoryId);
return getDataTable(List);
public HealthR<List<VideoVo>> findVideoVoList(@RequestBody VideoDto videoDto){
startPage(videoDto.getPage(), videoDto.getCount());
List<VideoVo> List = healthUserVideoService.findVideoVoList(videoDto);
return HealthR.ok(List);
}
}

14
doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java 100644
View File

@ -0,0 +1,14 @@
package doctor.domain.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class VideoDto {
private Integer categoryId;
private Integer page=1;
private Integer count=1;
}

3
doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java
View File

@ -19,9 +19,6 @@ public class VideoEntity {
private String abstracts;
private String originalUrl;
private Integer duration;
private Integer whetherCollection;
private Integer whetherBuy;
private Integer buyNum;
private Integer price;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

13
doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoCategoryVo.java 100644
View File

@ -0,0 +1,13 @@
package doctor.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class VideoCategoryVo {
private Integer id;
private String name;
}

23
doctor-modules/doctor-health/src/main/java/doctor/domain/vo/VideoVo.java 100644
View File

@ -0,0 +1,23 @@
package doctor.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class VideoVo {
private Integer id;
private Integer categoryId;
private String title;
private String shearUrl;
private String abstracts;
private String originalUrl;
private Integer price;
private Integer duration;
private Integer whetherCollection;
private Integer whetherBuy;
private Integer buyNum;
}

4
doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthUserVideoMapper.java
View File

@ -1,8 +1,10 @@
package doctor.mapper;
import doctor.domain.dto.VideoDto;
import doctor.domain.entity.VideoCategoryEntity;
import doctor.domain.entity.VideoEntity;
import doctor.domain.vo.VideoCategoryVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -10,5 +12,5 @@ import java.util.List;
public interface HealthUserVideoMapper {
List<VideoCategoryEntity> findVideoCategoryList();
List<VideoEntity> findVideoVoList(@Param("categoryId") Integer categoryId);
List<VideoEntity> findVideoVoList(VideoDto videoDto);
}

7
doctor-modules/doctor-health/src/main/java/doctor/service/HealthUserVideoService.java
View File

@ -2,13 +2,16 @@ package doctor.service;
import doctor.domain.dto.VideoDto;
import doctor.domain.entity.VideoCategoryEntity;
import doctor.domain.entity.VideoEntity;
import doctor.domain.vo.VideoCategoryVo;
import doctor.domain.vo.VideoVo;
import java.util.List;
public interface HealthUserVideoService {
List<VideoCategoryEntity> findVideoCategoryList();
List<VideoCategoryVo> findVideoCategoryList();
List<VideoEntity> findVideoVoList(Integer categoryId);
List<VideoVo> findVideoVoList(VideoDto videoDto);
}

18
doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthUserVideoServiceImpl.java
View File

@ -1,10 +1,15 @@
package doctor.service.impl;
import doctor.domain.dto.VideoDto;
import doctor.domain.entity.VideoCategoryEntity;
import doctor.domain.entity.VideoEntity;
import doctor.domain.vo.VideoCategoryVo;
import doctor.domain.vo.VideoVo;
import doctor.mapper.HealthUserVideoMapper;
import doctor.service.HealthUserVideoService;
import doctor.util.ConvertUtil;
import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -16,12 +21,17 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
private HealthUserVideoMapper healthUserVideoMapper;
@Override
public List<VideoCategoryEntity> findVideoCategoryList() {
return healthUserVideoMapper.findVideoCategoryList();
public List<VideoCategoryVo> findVideoCategoryList() {
List<VideoCategoryEntity> videoCategoryList =healthUserVideoMapper.findVideoCategoryList();
List<VideoCategoryVo> videoCategoryVos = ConvertUtil.entityToVoList(videoCategoryList, VideoCategoryVo.class);
return videoCategoryVos;
}
@Override
public List<VideoEntity> findVideoVoList(Integer categoryId) {
return healthUserVideoMapper.findVideoVoList(categoryId);
public List<VideoVo> findVideoVoList(VideoDto videoDto) {
List<VideoEntity> videoVoList = healthUserVideoMapper.findVideoVoList(videoDto);
List<VideoVo> videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class);
return videoVos;
}
}

53
doctor-modules/doctor-health/src/main/java/doctor/util/ConvertUtil.java 100644
View File

@ -0,0 +1,53 @@
package doctor.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
* @Author ifredom
* @Description 类型转换: Entity - Vo转换
* @Date 2022/5/10 15:59
* @Param [params]
**/
public class ConvertUtil {
public static final Logger logger = LoggerFactory.getLogger(ConvertUtil.class);
public static <T> T entityToVo(Object source, Class<T> target) {
if (source == null) {
return null;
}
T targetObject = null;
try {
targetObject = target.newInstance();
BeanUtils.copyProperties(source, targetObject);
} catch (Exception e) {
e.printStackTrace();
}
return targetObject;
}
public static <T> List<T> entityToVoList(Collection<?> sourceList, Class<T> target) {
if (sourceList == null) {
return null;
}
List<T> targetList = new ArrayList<>(sourceList.size());
try {
for (Object source : sourceList) {
T targetObject = target.newInstance();
BeanUtils.copyProperties(source, targetObject);
targetList.add(targetObject);
}
} catch (Exception e) {
logger.error("convert error ", e);
}
return targetList;
}
}

12
doctor-modules/doctor-health/src/main/resources/bootstrap.yml
View File

@ -15,21 +15,13 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# feign 配置
feign:
compression:
request:
enabled: true
min-request-size: 10000
response:
enabled: true

4
doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobController.java
View File

@ -30,7 +30,7 @@ import doctor.job.util.ScheduleUtils;
/**
* 调度任务信息操作处理
*
*
* @author ruoyi
*/
@RestController
@ -47,7 +47,7 @@ public class SysJobController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysJob sysJob)
{
startPage();
startPage(page, count);
List<SysJob> list = jobService.selectJobList(sysJob);
return getDataTable(list);
}

4
doctor-modules/doctor-job/src/main/java/doctor/job/controller/SysJobLogController.java
View File

@ -21,7 +21,7 @@ import doctor.job.service.ISysJobLogService;
/**
* 调度日志操作处理
*
*
* @author ruoyi
*/
@RestController
@ -38,7 +38,7 @@ public class SysJobLogController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog)
{
startPage();
startPage(page, count);
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
return getDataTable(list);
}

4
doctor-modules/doctor-job/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysConfigController.java
View File

@ -25,7 +25,7 @@ import doctor.system.service.ISysConfigService;
/**
* 参数配置 信息操作处理
*
*
* @author ruoyi
*/
@RestController
@ -42,7 +42,7 @@ public class SysConfigController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
{
startPage();
startPage(page, count);
List<SysConfig> list = configService.selectConfigList(config);
return getDataTable(list);
}

6
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictDataController.java
View File

@ -28,7 +28,7 @@ import doctor.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
*
* @author ruoyi
*/
@RestController
@ -37,7 +37,7 @@ public class SysDictDataController extends BaseController
{
@Autowired
private ISysDictDataService dictDataService;
@Autowired
private ISysDictTypeService dictTypeService;
@ -45,7 +45,7 @@ public class SysDictDataController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
startPage();
startPage(page, count);
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysDictTypeController.java
View File

@ -25,7 +25,7 @@ import doctor.system.service.ISysDictTypeService;
/**
* 数据字典信息
*
*
* @author ruoyi
*/
@RestController
@ -39,7 +39,7 @@ public class SysDictTypeController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
startPage();
startPage(page, count);
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysLogininforController.java
View File

@ -25,7 +25,7 @@ import doctor.system.service.ISysLogininforService;
/**
* 系统访问记录
*
*
* @author ruoyi
*/
@RestController
@ -42,7 +42,7 @@ public class SysLogininforController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
{
startPage();
startPage(page, count);
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysNoticeController.java
View File

@ -23,7 +23,7 @@ import doctor.system.service.ISysNoticeService;
/**
* 公告 信息操作处理
*
*
* @author ruoyi
*/
@RestController
@ -40,7 +40,7 @@ public class SysNoticeController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
{
startPage();
startPage(page, count);
List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysOperlogController.java
View File

@ -23,7 +23,7 @@ import doctor.system.service.ISysOperLogService;
/**
* 操作日志记录
*
*
* @author ruoyi
*/
@RestController
@ -37,7 +37,7 @@ public class SysOperlogController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
startPage();
startPage(page, count);
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysPostController.java
View File

@ -25,7 +25,7 @@ import doctor.system.service.ISysPostService;
/**
* 岗位信息操作处理
*
*
* @author ruoyi
*/
@RestController
@ -42,7 +42,7 @@ public class SysPostController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
startPage();
startPage(page, count);
List<SysPost> list = postService.selectPostList(post);
return getDataTable(list);
}

8
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysRoleController.java
View File

@ -30,7 +30,7 @@ import doctor.system.service.ISysUserService;
/**
* 角色信息
*
*
* @author ruoyi
*/
@RestController
@ -50,7 +50,7 @@ public class SysRoleController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
startPage();
startPage(page, count);
List<SysRole> list = roleService.selectRoleList(role);
return getDataTable(list);
}
@ -173,7 +173,7 @@ public class SysRoleController extends BaseController
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
startPage();
startPage(page, count);
List<SysUser> list = userService.selectAllocatedList(user);
return getDataTable(list);
}
@ -185,7 +185,7 @@ public class SysRoleController extends BaseController
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
startPage();
startPage(page, count);
List<SysUser> list = userService.selectUnallocatedList(user);
return getDataTable(list);
}

2
doctor-modules/doctor-system/src/main/java/doctor/system/controller/SysUserController.java
View File

@ -68,7 +68,7 @@ public class SysUserController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SysUser user)
{
startPage();
startPage(page, count);
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
}

4
doctor-modules/doctor-system/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置

4
doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml
View File

@ -15,11 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
config:
# 配置中心地址
server-addr: 101.34.77.101:8848
namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
namespace: 7e34f104-f333-4828-b36a-02146e521c9a
# 配置文件格式
file-extension: yml
# 共享配置