Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 65cfbc27 by lzy
Options

Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

parents b4343074 60d6a1ae
Inline Side-by-side
Showing with 1295 additions and 264 deletions
saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseEvaluateReportController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasDiseaseEvaluateReportService;
import com.makeit.service.saas.SaasSleepEvaluateReportService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 呼吸心率慢性病模型评估结果 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/diseaseEvaluateReport")
public class SaasDiseaseEvaluateReportController {
@Autowired
private SaasDiseaseEvaluateReportService saasDiseaseEvaluateReportService;
@Action(module = "报告管理-呼吸心率慢性病模型评估结果", name = "详情", code = "saas:diseaseEvaluateReport:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasDiseaseEvaluateReport> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasDiseaseEvaluateReportService.view(dto.getId()));
}
@Action(module = "报告管理-呼吸心率慢性病模型评估结果", name = "新增", code = "saas:diseaseEvaluateReport:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasDiseaseEvaluateReportService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "报告管理-呼吸心率慢性病模型评估结果", name = "编辑", code = "saas:diseaseEvaluateReport:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasDiseaseEvaluateReportService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseModelController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasDiseaseModelDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseModel;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasDiseaseModelService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 呼吸心率慢性病模型 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-01
*/
@RestController
@RequestMapping("/saas/diseaseModel")
public class SaasDiseaseModelController {
@Autowired
private SaasDiseaseModelService saasDiseaseModelService;
@Action(module = "模型管理-呼吸心率慢性病模型", name = "详情", code = "saas:diseaseModel:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasDiseaseModel> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasDiseaseModelService.view(dto.getId()));
}
@Action(module = "模型管理-呼吸心率慢性病模型", name = "新增", code = "saas:diseaseModel:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasDiseaseModelDTO dto) {
;
saasDiseaseModelService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "模型管理-呼吸心率慢性病模型", name = "编辑", code = "saas:diseaseModel:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasDiseaseModelDTO dto) {
saasDiseaseModelService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasElderReportConfigController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
import com.makeit.entity.saas.analysis.SaasElderReportConfig;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasElderReportConfigService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 长者报告配置 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/elderReportConfig")
public class SaasElderReportConfigController {
@Autowired
private SaasElderReportConfigService saasElderReportConfigService;
@Action(module = "报告管理-长者报告", name = "详情", code = "saas:elderReportConfig:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasElderReportConfig> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasElderReportConfigService.view(dto.getId()));
}
@Action(module = "报告管理-长者报告", name = "新增", code = "saas:elderReportConfig:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasElderReportConfigDTO dto) {
saasElderReportConfigService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "报告管理-长者报告", name = "编辑", code = "saas:elderReportConfig:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasElderReportConfigDTO dto) {
saasElderReportConfigService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasModelManageController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.entity.saas.analysis.SaasModelManage;
import com.makeit.global.annotation.Action;
import com.makeit.module.admin.vo.plat.PlatTenantVO;
import com.makeit.service.saas.SaasModelManageService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 模型管理 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/modelManage")
public class SaasModelManageController {
@Autowired
private SaasModelManageService saasModelManageService;
@Action(module = "租户管理-租户", name = "分页列表", code = "saas:modelManage:page")
@ApiOperation("分页列表")
@PostMapping("list")
public ApiResponseEntity<List<SaasModelManage>> list(){
return ApiResponseUtils.success(saasModelManageService.list());
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasReportManageController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.entity.saas.analysis.SaasModelManage;
import com.makeit.entity.saas.analysis.SaasReportManage;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasModelManageService;
import com.makeit.service.saas.SaasReportManageService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 报告管理 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/reportManage")
public class SaasReportManageController {
@Autowired
private SaasReportManageService saasReportManageService;
@Action(module = "租户管理-租户", name = "分页列表", code = "saas:reportManage:page")
@ApiOperation("分页列表")
@PostMapping("list")
public ApiResponseEntity<List<SaasReportManage>> list(){
return ApiResponseUtils.success(saasReportManageService.list());
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepAnalysisModelController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasSleepAnalysisModelDTO;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
import com.makeit.service.saas.SaasSleepAnalysisModelService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 睡眠质量分析模型 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-01
*/
@RestController
@RequestMapping("/saas/sleepAnalysisModel")
public class SaasSleepAnalysisModelController {
@Autowired
private SaasSleepAnalysisModelService saasSleepAnalysisModelService;
@Action(module = "模型管理-睡眠质量分析模型", name = "详情", code = "saas:sleepAnalysisModel:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasSleepAnalysisModel> view(@RequestBody BaseIdDTO dto){
return ApiResponseUtils.success(saasSleepAnalysisModelService.view(dto.getId()));
}
@Action(module = "模型管理-睡眠质量分析模型", name = "新增", code = "saas:tenant:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepAnalysisModelDTO dto){ ;
saasSleepAnalysisModelService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "模型管理-睡眠质量分析模型", name = "编辑", code = "saas:tenant:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepAnalysisModelDTO dto){
saasSleepAnalysisModelService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateReportController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasSleepEvaluateReportService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 睡眠质量分析模型评估结果 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/sleepEvaluateReport")
public class SaasSleepEvaluateReportController {
@Autowired
private SaasSleepEvaluateReportService saasSleepEvaluateReportService;
@Action(module = "报告管理-睡眠质量分析模型评估结果", name = "详情", code = "saas:sleepEvaluateReport:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasSleepEvaluateReport> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasSleepEvaluateReportService.view(dto.getId()));
}
@Action(module = "报告管理-睡眠质量分析模型评估结果", name = "新增", code = "saas:sleepEvaluateReport:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasSleepEvaluateReportService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "报告管理-睡眠质量分析模型评估结果", name = "编辑", code = "saas:sleepEvaluateReport:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasSleepEvaluateReportService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateStandardReportController.java 0 → 100644
package com.makeit.controller.analysis;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateStandardReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasSleepEvaluateStandardReportService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 睡眠质量分析模型评估标准 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@RestController
@RequestMapping("/saas/sleepEvaluateStandardReport")
public class SaasSleepEvaluateStandardReportController {
@Autowired
private SaasSleepEvaluateStandardReportService saasSleepEvaluateStandardReportService;
@Action(module = "报告管理-睡眠质量分析模型评估标准", name = "详情", code = "saas:sleepEvaluateStandardReport:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasSleepEvaluateStandardReport> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasSleepEvaluateStandardReportService.view(dto.getId()));
}
@Action(module = "报告管理-睡眠质量分析模型评估标准", name = "新增", code = "saas:sleepEvaluateStandardReport:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepEvaluateStandardReportDTO dto) {
saasSleepEvaluateStandardReportService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "报告管理-睡眠质量分析模型评估标准", name = "编辑", code = "saas:sleepEvaluateStandardReport:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepEvaluateStandardReportDTO dto) {
saasSleepEvaluateStandardReportService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/plat/PlatOrgController.java
...@@ -55,19 +55,6 @@ public class PlatOrgController { ...@@ -55,19 +55,6 @@ public class PlatOrgController {
return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO)); return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
} }
@Action(module = "平台端-组织", name = "树形列表", code = "plat:org:tree")
@ApiOperation("树形列表")
@PostMapping("tree")
public ApiResponseEntity<List<PlatOrg>> tree(@RequestBody PlatOrgQueryDTO tntDept){
return ApiResponseUtils.success(platOrgService.tree(tntDept));
}
@ApiOperation("树形列表(AuthIgnore)")
@PostMapping("treeAuthIgnore")
public ApiResponseEntity<List<PlatOrg>> treeAuthIgnore(@RequestBody PlatOrgQueryDTO tntDept){
return ApiResponseUtils.success(platOrgService.tree(tntDept));
}
@Action(module = "平台端-组织", name = "新增", code = "plat:org:add") @Action(module = "平台端-组织", name = "新增", code = "plat:org:add")
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("add") @PostMapping("add")
...@@ -98,16 +85,10 @@ public class PlatOrgController { ...@@ -98,16 +85,10 @@ public class PlatOrgController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("左上方组织树")
@PostMapping("deptTree")
public ApiResponseEntity<List<PlatOrg>> tree(){
return ApiResponseUtils.success(platUserService.getDeptTreeList());
}
@ApiOperation("当前账号的权限级别树") @ApiOperation("当前账号的权限级别树")
@PostMapping("belongToScopeTree") @PostMapping("belongToScopeTree")
public ApiResponseEntity<List<PlatOrg>> belongToScopeTree(@RequestBody BaseIdDTO baseIdDTO){ public ApiResponseEntity<List<PlatOrg>> belongToScopeTree(@RequestBody PlatOrg param){
return ApiResponseUtils.success(platOrgService.belongToOrgTree()); return ApiResponseUtils.success(platOrgService.belongToOrgTree(param));
} }
@ApiOperation("启用|禁用") @ApiOperation("启用|禁用")
......
saas-module/src/main/java/com/makeit/controller/plat/PlatRoleController.java
...@@ -150,12 +150,6 @@ public class PlatRoleController { ...@@ -150,12 +150,6 @@ public class PlatRoleController {
return ApiResponseUtils.success(platUserService.getHotelList(deptDTO.getOrgId())); return ApiResponseUtils.success(platUserService.getHotelList(deptDTO.getOrgId()));
} }
@ApiOperation("管理范围可选值2")
@PostMapping("getCandidateDeptList2")
public ApiResponseEntity<List<PlatOrg>> getCandidateDeptList2(@RequestBody BaseOrgDTO deptDTO) {
return ApiResponseUtils.success(platUserService.getCandidateDeptList());
}
@Action(module = "平台端-角色", name = "分配管理权限", code = "tnt:role:assignDeptList") @Action(module = "平台端-角色", name = "分配管理权限", code = "tnt:role:assignDeptList")
@ApiOperation("分配管理权限") @ApiOperation("分配管理权限")
@PostMapping("assignDeptList") @PostMapping("assignDeptList")
......
server-common/src/main/java/com/makeit/module/system/dto/SysFileDTOVO.java
...@@ -28,5 +28,5 @@ public class SysFileDTOVO extends BaseIdDTO { ...@@ -28,5 +28,5 @@ public class SysFileDTOVO extends BaseIdDTO {
private String fullPdfUrl; private String fullPdfUrl;
@ApiModelProperty("上传key") @ApiModelProperty("上传key")
private String Key; private String key;
} }
server-generator/src/test/java/CodeGenerator.java
...@@ -106,7 +106,7 @@ public class CodeGenerator { ...@@ -106,7 +106,7 @@ public class CodeGenerator {
// 使用重点 下列字段填写表名 运行方法 // 使用重点 下列字段填写表名 运行方法
// strategy.setInclude("edu_teacher","..."); // 多表-逆向工程 // strategy.setInclude("edu_teacher","..."); // 多表-逆向工程
strategy.setInclude("plat_device","plat_device_other"); strategy.setInclude("saas_model_manage","saas_report_manage");
strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略 strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate
......
server-module/src/main/java/com/makeit/module/controller/workstation/WorkStationController.java 0 → 100644
package com.makeit.module.controller.workstation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "平台端-工作台")
@RestController
@RequestMapping("/plat/workstation")
public class WorkStationController {
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasDiseaseModelDTO.java 0 → 100644
package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 呼吸心率慢性病模型
* </p>
*
* @author eugene young
* @since 2023-09-01
*/
@Data
@ApiModel(value="SaasDiseaseModelDTO对象", description="呼吸心率慢性病模型")
public class SaasDiseaseModelDTO {
private String id;
@ApiModelProperty(value = "呼吸暂停 X（小时）呼吸暂停")
private String apneaTime;
@ApiModelProperty(value = "呼吸暂停 X（小时）呼吸暂停条件")
private String apneaComparison;
@ApiModelProperty(value = "呼吸暂停 X（小时）呼吸暂停多少X（次数）")
private String apneaThreshold;
@ApiModelProperty(value = "呼吸过速 X（小时）呼吸过速")
private String tachypneaTime;
@ApiModelProperty(value = "呼吸过速 X（小时）呼吸过速条件")
private String tachypneaComparison;
@ApiModelProperty(value = "呼吸过速 X（小时）呼吸过速X（次数）")
private String tachypneaThreshold;
@ApiModelProperty(value = "呼吸过缓 X（小时）呼吸过缓")
private String bradypneaTime;
@ApiModelProperty(value = "呼吸过缓 X（小时）呼吸过缓条件")
private String bradypneaComparison;
@ApiModelProperty(value = "呼吸过缓 X（小时）呼吸过缓X（次数）")
private String bradypneaThreshold;
@ApiModelProperty(value = "心率过缓 X（小时）心率过缓")
private String bradycardiaTime;
@ApiModelProperty(value = "心率过缓 X（小时）心率过缓条件")
private String bradycardiaComparison;
@ApiModelProperty(value = "心率过缓 X（小时）心率过缓X（次数）")
private String bradycardiaThreshold;
@ApiModelProperty(value = "心率过速 X（小时）心率过速")
private String tachycardiaTime;
@ApiModelProperty(value = "心率过速 X（小时）心率过速条件")
private String tachycardiaComparison;
@ApiModelProperty(value = "心率过速 X（小时）心率过速X（次数）")
private String tachycardiaThreshold;
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasElderReportConfigDTO.java 0 → 100644
package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者报告配置
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value="SaasElderReportConfigDTO对象", description="长者报告配置")
public class SaasElderReportConfigDTO {
private String id;
@ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condtion：\"\",\"score\":\"\",evaluate:\"\"\"}")
private String resultContent;
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasSleepAnalysisModelDTO.java 0 → 100644
package com.makeit.dto.saas.analysis;
import com.baomidou.mybatisplus.annotation.TableField;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 睡眠质量分析模型
* </p>
*
* @author eugene young
* @since 2023-09-01
*/
@Data
@ApiModel(value="SaasSleepAnalysisModel对象DTO", description="睡眠质量分析模型")
public class SaasSleepAnalysisModelDTO {
private String id;
@ApiModelProperty(value = "体动次数")
private String actionComparison;
@ApiModelProperty(value = "体动阈值记录 默认 1")
private String actionThreshold;
@ApiModelProperty(value = "翻身次数")
private String turnedComparison;
@ApiModelProperty(value = "翻身次数阈值 默认1")
private String turnedThreshold;
@ApiModelProperty(value = "呼吸率阈值 起始")
private String breatheThresholdMin;
@ApiModelProperty(value = "呼吸率阈值 结束")
private String breatheThresholdMax;
@ApiModelProperty(value = "呼吸持续时间")
private String breatheDuration;
@ApiModelProperty(value = "心率阈值 起始")
private String heartThresholdMin;
@ApiModelProperty(value = "心率阈值 结束")
private String heartThresholdMax;
@ApiModelProperty(value = "心率阈值持续时间")
private String heartDuration;
@ApiModelProperty(value = "起床时间：人离床条件")
@TableField("riseLeave_comparison")
private String riseleaveComparison;
@ApiModelProperty(value = "起床时间 人离床(小时)")
private String riseLeaveThreshold;
@ApiModelProperty(value = "起床时间 每分钟大于30秒体动值条件")
@TableField("riseAction_comparison")
private String riseactionComparison;
@ApiModelProperty(value = "起床时间 每分钟大于30秒体动值")
private String riseActionThreshold;
@ApiModelProperty(value = "起床时间 每分钟大于30秒体动值 持续时间")
private String riseActionDuration;
@ApiModelProperty(value = "起床时间 多久（小时）内无再次入睡")
private String riseRepeatThreshold;
@ApiModelProperty(value = "入睡时间：体动值条件")
private String sleepTimeActionComparison;
@ApiModelProperty(value = "入睡时间：体动值")
private String sleepTimeActionThreshold;
@ApiModelProperty(value = "入睡时间：体动值 持续时间")
private String sleepTimeActionDuration;
@ApiModelProperty(value = "每分钟体动值条件")
private String awakeComparison;
@ApiModelProperty(value = "每分钟体动值")
private String awakeThreshold;
@ApiModelProperty(value = "深度睡眠和浅度睡眠条件")
private String napComparison;
@ApiModelProperty(value = "深度睡眠和浅度睡眠(小时)")
private String napThreshold;
@ApiModelProperty(value = "深度睡眠和浅度睡眠 持续时间")
private String napDuration;
@ApiModelProperty(value = "深度睡眠和浅度睡眠条件")
private String sleepComparison;
@ApiModelProperty(value = "深度睡眠和浅度睡眠 (小时)")
private String sleepThreshold;
@ApiModelProperty(value = "深度睡眠：体动和翻身次数每X(分钟)")
private String sleepDeepActionTimeBegin;
@ApiModelProperty(value = "深度睡眠：体动和翻身次数每X(分钟)条件")
private String sleepDeepActionComparison;
@ApiModelProperty(value = "深度睡眠：在（分钟内）体动和翻身次数")
private String sleepDeepActionThreshold;
@ApiModelProperty(value = "深度睡眠：呼吸率 起始值")
private String sleepDeepBreatheMin;
@ApiModelProperty(value = "深度睡眠：呼吸率 最大值")
private String sleepDeepBreatheMax;
@ApiModelProperty(value = "中度睡眠： 体动和翻身次数每X(分钟)")
private String sleepModerateActionTimeBegin;
@ApiModelProperty(value = "中度睡眠： 体动和翻身次数每X(分钟)条件")
private String sleepModerateActionComparison;
@ApiModelProperty(value = "中度睡眠： 体动和翻身次数每X(分钟)次数")
private String sleepModerateActionThreshold;
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasSleepEvaluateReportDTO.java 0 → 100644
package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 睡眠质量分析模型评估结果
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value="SaasSleepEvaluateReportDTO对象", description="睡眠质量分析模型评估结果")
public class SaasSleepEvaluateReportDTO {
private String id;
@ApiModelProperty(value = "评估结果 json字符串 {\"number:\"1\",socreRange：\"\",\"result\":\"\",evaluate:\"\"\"}")
private String resultContent;
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasSleepEvaluateStandardReportDTO.java 0 → 100644
package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 睡眠质量分析模型评估标准
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value="SaasSleepEvaluateStandardReportDTO对象", description="睡眠质量分析模型评估标准")
public class SaasSleepEvaluateStandardReportDTO {
private String id;
@ApiModelProperty(value = "深度睡眠评估标准 json数组 [{hour:\"\",score:\"\"},{}]\"")
private String sleepDeepConfig;
@ApiModelProperty(value = "浅度睡眠评估标准 json字符串")
private String sleepLightnessConfig;
@ApiModelProperty(value = "清醒评估标准 json字符串")
private String soberConfig;
@ApiModelProperty(value = "睡眠时长 json字符串")
private String sleepTime;
}
server-service/src/main/java/com/makeit/entity/platform/auth/PlatOrg.java
...@@ -43,7 +43,7 @@ public class PlatOrg extends BaseBusEntity { ...@@ -43,7 +43,7 @@ public class PlatOrg extends BaseBusEntity {
private String status; private String status;
/** /**
* 类型 1-居家 2-机构 * 类型 1-居家 2-机构养老
*/ */
private String type; private String type;
...@@ -57,6 +57,9 @@ public class PlatOrg extends BaseBusEntity { ...@@ -57,6 +57,9 @@ public class PlatOrg extends BaseBusEntity {
private List<PlatOrg> children = new ArrayList<>(); private List<PlatOrg> children = new ArrayList<>();
@TableField(exist = false) @TableField(exist = false)
private String parentNodeId;
@TableField(exist = false)
private PlatOrg parent; private PlatOrg parent;
} }
\ No newline at end of file
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseModelEvaluateResult.java → server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseEvaluateReport.java
package com.makeit.entity.saas.analysis; package com.makeit.entity.saas.analysis;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode; ...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasDiseaseModelEvaluateResult对象", description="呼吸心率慢性病模型评估结果") @ApiModel(value="SaasDiseaseEvaluateReport对象", description="呼吸心率慢性病模型评估结果")
public class SaasDiseaseModelEvaluateResult extends BaseBusEntity { public class SaasDiseaseEvaluateReport extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasElderReportConfig.java 0 → 100644
package com.makeit.entity.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者报告配置
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasElderReportConfig对象", description="长者报告配置")
public class SaasElderReportConfig extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condtion：\"\",\"score\":\"\",evaluate:\"\"\"}")
private String resultContent;
}
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasModelManage.java 0 → 100644
package com.makeit.entity.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 模型管理
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasModelManage对象", description="模型管理")
public class SaasModelManage extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模型名称")
private String name;
@ApiModelProperty(value = "说明")
private String remark;
@ApiModelProperty(value = "模型id")
private String modelId;
@ApiModelProperty(value = "模型类型")
private String modelType;
}
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasReportManage.java 0 → 100644
package com.makeit.entity.saas.analysis;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 报告管理
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasReportManage对象", description="报告管理")
public class SaasReportManage extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "报告名称")
private String name;
@ApiModelProperty(value = "说明")
private String remark;
@ApiModelProperty(value = "报告id")
private String reportId;
@ApiModelProperty(value = "报告类型")
private String reportType;
}
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepAnalysisModelEvaluateResult.java → server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepEvaluateReport.java
package com.makeit.entity.saas.analysis; package com.makeit.entity.saas.analysis;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode; ...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasSleepAnalysisModelEvaluateResult对象", description="睡眠质量分析模型评估结果") @ApiModel(value="SaasSleepEvaluateReport对象", description="睡眠质量分析模型评估结果")
public class SaasSleepAnalysisModelEvaluateResult extends BaseBusEntity { public class SaasSleepEvaluateReport extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepAnalysisModelEvaluateStandard.java → server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepEvaluateStandardReport.java
package com.makeit.entity.saas.analysis; package com.makeit.entity.saas.analysis;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode; ...@@ -14,12 +12,12 @@ import lombok.EqualsAndHashCode;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="SaasSleepAnalysisModelEvaluateStandard对象", description="睡眠质量分析模型评估标准") @ApiModel(value="SaasSleepEvaluateStandardReport对象", description="睡眠质量分析模型评估标准")
public class SaasSleepAnalysisModelEvaluateStandard extends BaseBusEntity { public class SaasSleepEvaluateStandardReport extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasDiseaseModelEvaluateResultMapper.java → server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasDiseaseEvaluateReportMapper.java
package com.makeit.mapper.saas.analysis; package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasDiseaseModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
/** /**
* <p> * <p>
...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasDiseaseModelEvaluateResult; ...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasDiseaseModelEvaluateResult;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasDiseaseModelEvaluateResultMapper extends BaseMapper<SaasDiseaseModelEvaluateResult> { public interface SaasDiseaseEvaluateReportMapper extends BaseMapper<SaasDiseaseEvaluateReport> {
} }
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasElderReportConfigMapper.java 0 → 100644
package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasElderReportConfig;
/**
* <p>
* 长者报告配置 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasElderReportConfigMapper extends BaseMapper<SaasElderReportConfig> {
}
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasModelManageMapper.java 0 → 100644
package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasModelManage;
/**
* <p>
* 模型管理 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasModelManageMapper extends BaseMapper<SaasModelManage> {
}
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasReportManageMapper.java 0 → 100644
package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasReportManage;
/**
* <p>
* 报告管理 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasReportManageMapper extends BaseMapper<SaasReportManage> {
}
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasSleepAnalysisModelEvaluateResultMapper.java → server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasSleepEvaluateReportMapper.java
package com.makeit.mapper.saas.analysis; package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
/** /**
* <p> * <p>
...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateResult; ...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateResult;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasSleepAnalysisModelEvaluateResultMapper extends BaseMapper<SaasSleepAnalysisModelEvaluateResult> { public interface SaasSleepEvaluateReportMapper extends BaseMapper<SaasSleepEvaluateReport> {
} }
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasSleepAnalysisModelEvaluateStandardMapper.java → server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasSleepEvaluateStandardReportMapper.java
package com.makeit.mapper.saas.analysis; package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard; import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
/** /**
* <p> * <p>
...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard; ...@@ -9,8 +9,8 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasSleepAnalysisModelEvaluateStandardMapper extends BaseMapper<SaasSleepAnalysisModelEvaluateStandard> { public interface SaasSleepEvaluateStandardReportMapper extends BaseMapper<SaasSleepEvaluateStandardReport> {
} }
server-service/src/main/java/com/makeit/service/platform/auth/PlatOrgService.java
...@@ -22,30 +22,11 @@ public interface PlatOrgService extends IService<PlatOrg> { ...@@ -22,30 +22,11 @@ public interface PlatOrgService extends IService<PlatOrg> {
List<PlatOrg> list(PlatOrgQueryDTO dto); List<PlatOrg> list(PlatOrgQueryDTO dto);
List<PlatOrg> tree(PlatOrgQueryDTO dto);
List<PlatOrg> treeCount(PlatOrgQueryDTO dto);
List<PlatOrg> tree(List<PlatOrg> tntDeptList);
List<PlatOrg> treeTop(List<PlatOrg> tntDeptList); List<PlatOrg> treeTop(List<PlatOrg> tntDeptList);
Map<String, PlatOrg> treeParentAndChildren(List<PlatOrg> tntDeptList);
List<PlatOrg> findSelfAndAllChildren(String deptId); List<PlatOrg> findSelfAndAllChildren(String deptId);
/**
* 根据部门名称获取部门及部门一下部门的数据集合
* @param deptId
* @param deptName
* @return
*/
List<PlatOrg> getDeptSelfAndChildrenByDeptName(String deptId, String deptName);
List<PlatOrg> findSelfAndAllParent(String deptId); List<PlatOrg> findSelfAndAllParent(String deptId);
...@@ -89,7 +70,7 @@ public interface PlatOrgService extends IService<PlatOrg> { ...@@ -89,7 +70,7 @@ public interface PlatOrgService extends IService<PlatOrg> {
* 当前账号所属角色的权限级别，可查看某一级或者某一级及其下级 * 当前账号所属角色的权限级别，可查看某一级或者某一级及其下级
* @return * @return
*/ */
List<PlatOrg> belongToOrgTree(); List<PlatOrg> belongToOrgTree(PlatOrg param);
/** /**
* 启用|禁用 * 启用|禁用
......
server-service/src/main/java/com/makeit/service/platform/auth/PlatUserService.java
...@@ -88,11 +88,6 @@ public interface PlatUserService extends IService<PlatUser> { ...@@ -88,11 +88,6 @@ public interface PlatUserService extends IService<PlatUser> {
PlatRole getMaxRole(String userId); PlatRole getMaxRole(String userId);
List<PlatOrg> getDeptTreeList();
/** /**
* 根据部门名称获取部门列表 * 根据部门名称获取部门列表
* *
...@@ -106,8 +101,6 @@ public interface PlatUserService extends IService<PlatUser> { ...@@ -106,8 +101,6 @@ public interface PlatUserService extends IService<PlatUser> {
List<PlatOrg> getHotelList(String deptId); List<PlatOrg> getHotelList(String deptId);
List<PlatOrg> getCandidateDeptList();
List<PlatMenu> getMenuListByUserId(String userId); List<PlatMenu> getMenuListByUserId(String userId);
/** /**
......
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
...@@ -135,29 +135,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -135,29 +135,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
} }
@Override @Override
public List<PlatOrg> tree(List<PlatOrg> tntDeptList) {
Map<String, PlatOrg> map = StreamUtil.toMap(tntDeptList, PlatOrg::getId);
List<PlatOrg> topList = new ArrayList<>(10);
tntDeptList.forEach(e -> {
PlatOrg parent = map.get(e.getParentId());
if (parent != null) {
List<PlatOrg> children = parent.getChildren();
if (children == null) {
children = new ArrayList<>(10);
parent.setChildren(children);
}
children.add(e);
} else {
topList.add(e);
}
});
return topList;
}
@Override
public List<PlatOrg> treeTop(List<PlatOrg> tntDeptList) { public List<PlatOrg> treeTop(List<PlatOrg> tntDeptList) {
Map<String, PlatOrg> map = StreamUtil.toMap(tntDeptList, PlatOrg::getId); Map<String, PlatOrg> map = StreamUtil.toMap(tntDeptList, PlatOrg::getId);
...@@ -179,30 +156,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -179,30 +156,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
} }
@Override @Override
public Map<String, PlatOrg> treeParentAndChildren(List<PlatOrg> tntDeptList) {
Map<String, PlatOrg> map = StreamUtil.toMap(tntDeptList, PlatOrg::getId);
tntDeptList.forEach(e -> {
PlatOrg parent = map.get(e.getParentId());
if (parent != null) {
List<PlatOrg> children = parent.getChildren();
if (children == null) {
children = new ArrayList<>(10);
parent.setChildren(children);
}
children.add(e);
e.setParent(parent);
}
});
return map;
}
@Override
public List<PlatOrg> findSelfAndAllChildren(String deptId) {//只能从酒店或者部门开始 public List<PlatOrg> findSelfAndAllChildren(String deptId) {//只能从酒店或者部门开始
List<PlatOrg> deptList = list(new QueryWrapper<PlatOrg>().lambda() List<PlatOrg> deptList = list(new QueryWrapper<PlatOrg>().lambda()
...@@ -217,24 +170,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -217,24 +170,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
return list; return list;
} }
@Override
public List<PlatOrg> getDeptSelfAndChildrenByDeptName(String deptId, String deptName) {
//获取所有酒店层级的部门列表
List<PlatOrg> selfAndChildren = findSelfAndAllChildren(deptId);
if (CollectionUtils.isNotEmpty(selfAndChildren)) {
//获取对应部门名称的部门数据
List<PlatOrg> tntDepts = StreamUtil.filter(selfAndChildren, e -> deptName.equals(e.getName()));
if (CollectionUtils.isNotEmpty(tntDepts)) {
List<PlatOrg> platOrgFilterByName = tree(selfAndChildren, Arrays.asList(tntDepts.get(0).getId()));
List<PlatOrg> tntDeptArrayList = new ArrayList<>(10);
flat(platOrgFilterByName, tntDeptArrayList);
return tntDeptArrayList;
}
}
return new ArrayList<>();
}
@Override @Override
public List<PlatOrg> findSelfAndAllParent(String deptId) { public List<PlatOrg> findSelfAndAllParent(String deptId) {
...@@ -330,44 +265,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -330,44 +265,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
} }
@Override
public List<PlatOrg> tree(PlatOrgQueryDTO dto) {
List<PlatOrg> list = list(dto);
return tree(list);
}
@Override
public List<PlatOrg> treeCount(PlatOrgQueryDTO dto) {
List<PlatOrg> list = list(dto);
List<PlatOrg> tree = tree(list);
Map<PlatOrg, List<PlatOrg>> deptMap = new HashMap<>(16);
List<PlatOrg> deptList = new ArrayList<>(tree);
for (int i = 0; i < deptList.size(); i++) {
PlatOrg d = deptList.get(i);
List<PlatOrg> c = new ArrayList<>();
c.add(d);
for (int i1 = 0; i1 < c.size(); i1++) {
PlatOrg ctd = c.get(i1);
if (ctd.getChildren() != null) {
c.addAll(ctd.getChildren());
}
}
if (d.getChildren() != null) {
deptList.addAll(d.getChildren());
}
deptMap.put(d, c);
}
return tree;
}
@Transactional @Transactional
@Override @Override
...@@ -468,18 +365,22 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -468,18 +365,22 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
/** /**
* 获取权限范围树 * 获取权限范围树
* 当前账号所属角色的权限级别，可查看某一级或者某一级及其下级 * 当前账号所属角色的权限级别
* 越级树结构
*
* *
* @return * @return
*/ */
@Override @Override
public List<PlatOrg> belongToOrgTree() { public List<PlatOrg> belongToOrgTree(PlatOrg param) {
PlatUserVO userVO = PlatUserUtil.getUserVO(); PlatUserVO userVO = PlatUserUtil.getUserVO();
String isTenant = userVO.getIsTenant(); String isTenant = userVO.getIsTenant();
//如果是租户账号 则有所有权限 //如果是租户账号 则有所有权限
if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) { if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>().eq(PlatOrg::getStatus, CommonEnum.YES.getValue())); List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
return getOrgTree(orgList); .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
);
return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));
} }
//平台账号 //平台账号
...@@ -488,14 +389,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -488,14 +389,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
if (CollectionUtils.isEmpty(orgList)) { if (CollectionUtils.isEmpty(orgList)) {
return new ArrayList<>(); return new ArrayList<>();
} }
Set<String> allOrgIdSet = orgList.stream().flatMap(vo -> {
String path = vo.getPath(); return createOrgTree(orgList);
String[] split = StringUtils.split(path, ",");
return Stream.of(split);
}).collect(Collectors.toSet());
List<PlatOrg> allOrgList = this.list(new LambdaQueryWrapper<PlatOrg>().in(BaseEntity::getId, allOrgIdSet).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
orgList.addAll(allOrgList);
return getOrgTree(orgList);
} }
/** /**
...@@ -519,17 +414,55 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -519,17 +414,55 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
} }
/** /**
* 从租户开始的组织树 * 租户权限的组织树
* @param orgList * @param orgList
* @return * @return
*/ */
private List<PlatOrg> getOrgTree(List<PlatOrg> orgList) { private List<PlatOrg> getOrgTree(List<PlatOrg> orgList,List<String> dateScopeList) {
Map<String, List<PlatOrg>> parentIdMap = orgList.stream().collect(Collectors.groupingBy(PlatOrg::getParentId)); Map<String, List<PlatOrg>> parentIdMap = orgList.stream().collect(Collectors.groupingBy(PlatOrg::getParentId));
orgList.forEach(vo -> { orgList.forEach(vo -> {
List<PlatOrg> childList = parentIdMap.get(vo.getId()); List<PlatOrg> childList = parentIdMap.get(vo.getId());
vo.setChildren(childList); vo.setChildren(childList);
}); });
return orgList.stream().filter(vo -> StringUtils.equals(vo.getTenantId(), vo.getId())).collect(Collectors.toList()); return orgList.stream().filter(vo -> dateScopeList.contains(vo.getId())).collect(Collectors.toList());
}
/**
* 租户权限的组织树
* a,a1,d,d1,d2,e,(e2没权限),e3
* a->a1
* d->d1->d2
* e->e3
* @param orgList
* @return
*/
public List<PlatOrg> createOrgTree(List<PlatOrg> orgList) {
Map<String, PlatOrg> orgMap = orgList.stream().collect(Collectors.toMap(BaseEntity::getId, vo -> vo, (a, b) -> a));
for (PlatOrg platOrg : orgList) {
String[] split = platOrg.getPath().split(",");
findParent(orgMap,platOrg,split,split.length-1);
}
return orgList.stream().filter(vo->StringUtils.isBlank(vo.getParentNodeId())).collect(Collectors.toList());
}
/**
* 寻找最近的父节点
* @param orgMap 有权限的组织
* @param currOrg 当前组织
* @param orgArray 当前组织全路径
* @param index orgArray的下标
*/
private void findParent(Map<String,PlatOrg> orgMap,PlatOrg currOrg,String[] orgArray,int index){
PlatOrg platOrg = orgMap.get(orgArray[index]);
if(platOrg!=null){
platOrg.getChildren().add(currOrg);
currOrg.setParentNodeId(platOrg.getId());
return;
}
if(index==0){
return;
}
findParent(orgMap,currOrg,orgArray,--index);
} }
/** /**
......
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
...@@ -902,14 +902,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -902,14 +902,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
return newList; return newList;
} }
@Override
public List<PlatOrg> getDeptTreeList() {//给左上角用
List<PlatOrg> newList = getDeptList();
return platOrgService.tree(newList);
}
@Override @Override
public List<PlatOrg> getDeptSelfAndChildrenByDeptName(List<String> deptNames, Map<String, PlatOrg> selfAndChildren) { public List<PlatOrg> getDeptSelfAndChildrenByDeptName(List<String> deptNames, Map<String, PlatOrg> selfAndChildren) {
if (CollectionUtils.isEmpty(deptNames)) { if (CollectionUtils.isEmpty(deptNames)) {
...@@ -973,12 +965,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -973,12 +965,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
} }
@Override @Override
public List<PlatOrg> getCandidateDeptList() {//新增编辑角色 那边的管理范围 //不包含自己
List<PlatOrg> newList = getDeptList();
return platOrgService.tree(newList);
}
@Override
public List<PlatMenu> getMenuListByUserId(String userId) { public List<PlatMenu> getMenuListByUserId(String userId) {
return getBaseMapper().getMenuListByUserId(userId); return getBaseMapper().getMenuListByUserId(userId);
} }
......
server-service/src/main/java/com/makeit/service/saas/SaasDiseaseEvaluateReportService.java 0 → 100644
package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
/**
* <p>
* 呼吸心率慢性病模型评估结果 服务类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasDiseaseEvaluateReportService extends IService<SaasDiseaseEvaluateReport> {
SaasDiseaseEvaluateReport view(String id);
void add(SaasSleepEvaluateReportDTO dto);
void edit(SaasSleepEvaluateReportDTO dto);
}
server-service/src/main/java/com/makeit/service/saas/SaasDiseaseModelService.java
package com.makeit.service.saas; package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.saas.analysis.SaasDiseaseModelDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseModel; import com.makeit.entity.saas.analysis.SaasDiseaseModel;
/** /**
...@@ -13,4 +14,9 @@ import com.makeit.entity.saas.analysis.SaasDiseaseModel; ...@@ -13,4 +14,9 @@ import com.makeit.entity.saas.analysis.SaasDiseaseModel;
*/ */
public interface SaasDiseaseModelService extends IService<SaasDiseaseModel> { public interface SaasDiseaseModelService extends IService<SaasDiseaseModel> {
SaasDiseaseModel view(String id);
void add(SaasDiseaseModelDTO dto);
void edit(SaasDiseaseModelDTO dto);
} }
server-service/src/main/java/com/makeit/service/saas/SaasElderReportConfigService.java 0 → 100644
package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
import com.makeit.entity.saas.analysis.SaasElderReportConfig;
/**
* <p>
* 长者报告配置 服务类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasElderReportConfigService extends IService<SaasElderReportConfig> {
SaasElderReportConfig view(String id);
void add(SaasElderReportConfigDTO dto);
void edit(SaasElderReportConfigDTO dto);
}
server-service/src/main/java/com/makeit/service/saas/SaasDiseaseModelEvaluateResultService.java → server-service/src/main/java/com/makeit/service/saas/SaasModelManageService.java
package com.makeit.service.saas; package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.entity.saas.analysis.SaasDiseaseModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasModelManage;
/** /**
* <p> * <p>
* 呼吸心率慢性病模型评估结果 服务类 * 模型管理 服务类
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasDiseaseModelEvaluateResultService extends IService<SaasDiseaseModelEvaluateResult> { public interface SaasModelManageService extends IService<SaasModelManage> {
} }
server-service/src/main/java/com/makeit/service/saas/SaasSleepAnalysisModelEvaluateResultService.java → server-service/src/main/java/com/makeit/service/saas/SaasReportManageService.java
package com.makeit.service.saas; package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasReportManage;
/** /**
* <p> * <p>
* 睡眠质量分析模型评估结果 服务类 * 报告管理 服务类
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasSleepAnalysisModelEvaluateResultService extends IService<SaasSleepAnalysisModelEvaluateResult> { public interface SaasReportManageService extends IService<SaasReportManage> {
} }
server-service/src/main/java/com/makeit/service/saas/SaasSleepAnalysisModelService.java
package com.makeit.service.saas; package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.saas.analysis.SaasSleepAnalysisModelDTO;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel; import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
/** /**
...@@ -13,4 +14,9 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel; ...@@ -13,4 +14,9 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
*/ */
public interface SaasSleepAnalysisModelService extends IService<SaasSleepAnalysisModel> { public interface SaasSleepAnalysisModelService extends IService<SaasSleepAnalysisModel> {
SaasSleepAnalysisModel view(String id);
void add(SaasSleepAnalysisModelDTO dto);
void edit(SaasSleepAnalysisModelDTO dto);
} }
server-service/src/main/java/com/makeit/service/saas/SaasSleepEvaluateReportService.java 0 → 100644
package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
/**
* <p>
* 睡眠质量分析模型评估结果 服务类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasSleepEvaluateReportService extends IService<SaasSleepEvaluateReport> {
SaasSleepEvaluateReport view(String id);
void add(SaasSleepEvaluateReportDTO dto);
void edit(SaasSleepEvaluateReportDTO dto);
}
server-service/src/main/java/com/makeit/service/saas/SaasSleepAnalysisModelEvaluateStandardService.java → server-service/src/main/java/com/makeit/service/saas/SaasSleepEvaluateStandardReportService.java
package com.makeit.service.saas; package com.makeit.service.saas;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard; import com.makeit.dto.saas.analysis.SaasSleepEvaluateStandardReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
/** /**
* <p> * <p>
...@@ -9,8 +10,13 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard; ...@@ -9,8 +10,13 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard;
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
public interface SaasSleepAnalysisModelEvaluateStandardService extends IService<SaasSleepAnalysisModelEvaluateStandard> { public interface SaasSleepEvaluateStandardReportService extends IService<SaasSleepEvaluateStandardReport> {
SaasSleepEvaluateStandardReport view(String id);
void add(SaasSleepEvaluateStandardReportDTO dto);
void edit(SaasSleepEvaluateStandardReportDTO dto);
} }
server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java
...@@ -226,7 +226,7 @@ implements PlatTenantService { ...@@ -226,7 +226,7 @@ implements PlatTenantService {
//更新组织表 //更新组织表
platOrgService.edit(platOrg); platOrgService.edit(platOrg);
saasOperationLogService.add("平台端-租户账号-编辑", dto.getId()); saasOperationLogService.add("saas端-租户账号-编辑", dto.getId());
} }
...@@ -236,6 +236,7 @@ implements PlatTenantService { ...@@ -236,6 +236,7 @@ implements PlatTenantService {
platOrg.setName(platTenant.getName()); platOrg.setName(platTenant.getName());
platOrg.setStatus(platTenant.getStatus()); platOrg.setStatus(platTenant.getStatus());
platOrg.setId(platTenant.getId()); platOrg.setId(platTenant.getId());
platOrg.setPath("");
//租户没有父级 //租户没有父级
platOrg.setParentId("1"); platOrg.setParentId("1");
return platOrg; return platOrg;
...@@ -247,7 +248,7 @@ implements PlatTenantService { ...@@ -247,7 +248,7 @@ implements PlatTenantService {
TntUserJoinUtil.join(platUserService,Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId,(t,u)->t.setPlatUserVO(BeanDtoVoUtils.convert(u,PlatUserVO.class)) ,PlatUser::getId); TntUserJoinUtil.join(platUserService,Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId,(t,u)->t.setPlatUserVO(BeanDtoVoUtils.convert(u,PlatUserVO.class)) ,PlatUser::getId);
saasOperationLogService.add("平台端-租户账号-详情", id); saasOperationLogService.add("saas端-租户账号-详情", id);
return userVO; return userVO;
} }
...@@ -257,7 +258,7 @@ implements PlatTenantService { ...@@ -257,7 +258,7 @@ implements PlatTenantService {
public void del(String id) { public void del(String id) {
removeById(id); removeById(id);
saasOperationLogService.add("平台端-租户账号-删除", id); saasOperationLogService.add("saas端-租户账号-删除", id);
} }
...@@ -282,9 +283,9 @@ implements PlatTenantService { ...@@ -282,9 +283,9 @@ implements PlatTenantService {
updateById(tntTenant); updateById(tntTenant);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) { if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("平台端-租户账号-启用", dto.getId()); saasOperationLogService.add("saas端-租户账号-启用", dto.getId());
} else { } else {
saasOperationLogService.add("平台端-租户账号-禁用", dto.getId()); saasOperationLogService.add("saas端-租户账号-禁用", dto.getId());
} }
} }
......
server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseEvaluateReportServiceImpl.java 0 → 100644
package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
import com.makeit.mapper.saas.analysis.SaasDiseaseEvaluateReportMapper;
import com.makeit.service.saas.SaasDiseaseEvaluateReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
/**
* <p>
* 呼吸心率慢性病模型评估结果 服务实现类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Service
public class SaasDiseaseEvaluateReportServiceImpl extends ServiceImpl<SaasDiseaseEvaluateReportMapper, SaasDiseaseEvaluateReport> implements SaasDiseaseEvaluateReportService {
@Override
public SaasDiseaseEvaluateReport view(String id) {
return getById(id);
}
@Override
public void add(SaasSleepEvaluateReportDTO dto) {
SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport();
BeanUtils.copyProperties(dto,entity);
save(entity);
}
@Override
public void edit(SaasSleepEvaluateReportDTO dto) {
SaasDiseaseEvaluateReport entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity);
saveOrUpdate(entity);
}
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseModelServiceImpl.java
...@@ -2,9 +2,11 @@ package com.makeit.service.saas.impl; ...@@ -2,9 +2,11 @@ package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasDiseaseModelDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseModel; import com.makeit.entity.saas.analysis.SaasDiseaseModel;
import com.makeit.mapper.saas.analysis.SaasDiseaseModelMapper; import com.makeit.mapper.saas.analysis.SaasDiseaseModelMapper;
import com.makeit.service.saas.SaasDiseaseModelService; import com.makeit.service.saas.SaasDiseaseModelService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -18,4 +20,23 @@ import org.springframework.stereotype.Service; ...@@ -18,4 +20,23 @@ import org.springframework.stereotype.Service;
@Service @Service
public class SaasDiseaseModelServiceImpl extends ServiceImpl<SaasDiseaseModelMapper, SaasDiseaseModel> implements SaasDiseaseModelService { public class SaasDiseaseModelServiceImpl extends ServiceImpl<SaasDiseaseModelMapper, SaasDiseaseModel> implements SaasDiseaseModelService {
@Override
public SaasDiseaseModel view(String id) {
return getById(id);
}
@Override
public void add(SaasDiseaseModelDTO dto) {
SaasDiseaseModel entity = new SaasDiseaseModel();
BeanUtils.copyProperties(dto,entity);
save(entity);
}
@Override
public void edit(SaasDiseaseModelDTO dto) {
SaasDiseaseModel entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity);
saveOrUpdate(entity);
}
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasElderReportConfigServiceImpl.java 0 → 100644
package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
import com.makeit.entity.saas.analysis.SaasElderReportConfig;
import com.makeit.mapper.saas.analysis.SaasElderReportConfigMapper;
import com.makeit.service.saas.SaasElderReportConfigService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
/**
* <p>
* 长者报告配置 服务实现类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Service
public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderReportConfigMapper, SaasElderReportConfig> implements SaasElderReportConfigService {
@Override
public SaasElderReportConfig view(String id) {
return getById(id);
}
@Override
public void add(SaasElderReportConfigDTO dto) {
SaasElderReportConfig entity = new SaasElderReportConfig();
BeanUtils.copyProperties(dto,entity);
save(entity);
}
@Override
public void edit(SaasElderReportConfigDTO dto) {
SaasElderReportConfig entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity);
saveOrUpdate(entity);
}
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseModelEvaluateResultServiceImpl.java → server-service/src/main/java/com/makeit/service/saas/impl/SaasModelManageServiceImpl.java
package com.makeit.service.saas.impl; package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.saas.analysis.SaasDiseaseModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasModelManage;
import com.makeit.mapper.saas.analysis.SaasDiseaseModelEvaluateResultMapper; import com.makeit.mapper.saas.analysis.SaasModelManageMapper;
import com.makeit.service.saas.SaasDiseaseModelEvaluateResultService; import com.makeit.service.saas.SaasModelManageService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
* <p> * <p>
* 呼吸心率慢性病模型评估结果 服务实现类 * 模型管理 服务实现类
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
@Service @Service
public class SaasDiseaseModelEvaluateResultServiceImpl extends ServiceImpl<SaasDiseaseModelEvaluateResultMapper, SaasDiseaseModelEvaluateResult> implements SaasDiseaseModelEvaluateResultService { public class SaasModelManageServiceImpl extends ServiceImpl<SaasModelManageMapper, SaasModelManage> implements SaasModelManageService {
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepAnalysisModelEvaluateResultServiceImpl.java → server-service/src/main/java/com/makeit/service/saas/impl/SaasReportManageServiceImpl.java
package com.makeit.service.saas.impl; package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateResult; import com.makeit.entity.saas.analysis.SaasReportManage;
import com.makeit.mapper.saas.analysis.SaasSleepAnalysisModelEvaluateResultMapper; import com.makeit.mapper.saas.analysis.SaasReportManageMapper;
import com.makeit.service.saas.SaasSleepAnalysisModelEvaluateResultService; import com.makeit.service.saas.SaasReportManageService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
* <p> * <p>
* 睡眠质量分析模型评估结果 服务实现类 * 报告管理 服务实现类
* </p> * </p>
* *
* @author eugene young * @author eugene young
* @since 2023-09-01 * @since 2023-09-05
*/ */
@Service @Service
public class SaasSleepAnalysisModelEvaluateResultServiceImpl extends ServiceImpl<SaasSleepAnalysisModelEvaluateResultMapper, SaasSleepAnalysisModelEvaluateResult> implements SaasSleepAnalysisModelEvaluateResultService { public class SaasReportManageServiceImpl extends ServiceImpl<SaasReportManageMapper, SaasReportManage> implements SaasReportManageService {
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepAnalysisModelEvaluateStandardServiceImpl.java deleted 100644 → 0
package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModelEvaluateStandard;
import com.makeit.mapper.saas.analysis.SaasSleepAnalysisModelEvaluateStandardMapper;
import com.makeit.service.saas.SaasSleepAnalysisModelEvaluateStandardService;
import org.springframework.stereotype.Service;
/**
* <p>
* 睡眠质量分析模型评估标准 服务实现类
* </p>
*
* @author eugene young
* @since 2023-09-01
*/
@Service
public class SaasSleepAnalysisModelEvaluateStandardServiceImpl extends ServiceImpl<SaasSleepAnalysisModelEvaluateStandardMapper, SaasSleepAnalysisModelEvaluateStandard> implements SaasSleepAnalysisModelEvaluateStandardService {
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepAnalysisModelServiceImpl.java
...@@ -2,9 +2,11 @@ package com.makeit.service.saas.impl; ...@@ -2,9 +2,11 @@ package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasSleepAnalysisModelDTO;
import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel; import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
import com.makeit.mapper.saas.analysis.SaasSleepAnalysisModelMapper; import com.makeit.mapper.saas.analysis.SaasSleepAnalysisModelMapper;
import com.makeit.service.saas.SaasSleepAnalysisModelService; import com.makeit.service.saas.SaasSleepAnalysisModelService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -18,4 +20,23 @@ import org.springframework.stereotype.Service; ...@@ -18,4 +20,23 @@ import org.springframework.stereotype.Service;
@Service @Service
public class SaasSleepAnalysisModelServiceImpl extends ServiceImpl<SaasSleepAnalysisModelMapper, SaasSleepAnalysisModel> implements SaasSleepAnalysisModelService { public class SaasSleepAnalysisModelServiceImpl extends ServiceImpl<SaasSleepAnalysisModelMapper, SaasSleepAnalysisModel> implements SaasSleepAnalysisModelService {
@Override
public SaasSleepAnalysisModel view(String id) {
return getById(id);
}
@Override
public void add(SaasSleepAnalysisModelDTO dto) {
SaasSleepAnalysisModel entity = new SaasSleepAnalysisModel();
BeanUtils.copyProperties(dto,entity);
save(entity);
}
@Override
public void edit(SaasSleepAnalysisModelDTO dto) {
SaasSleepAnalysisModel entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity);
saveOrUpdate(entity);
}
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepEvaluateReportServiceImpl.java 0 → 100644
package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.mapper.saas.analysis.SaasSleepEvaluateReportMapper;
import com.makeit.service.saas.SaasSleepEvaluateReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
/**
* <p>
* 睡眠质量分析模型评估结果 服务实现类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Service
public class SaasSleepEvaluateReportServiceImpl extends ServiceImpl<SaasSleepEvaluateReportMapper, SaasSleepEvaluateReport> implements SaasSleepEvaluateReportService {
@Override
public SaasSleepEvaluateReport view(String id) {
return getById(id);
}
@Override
public void add(SaasSleepEvaluateReportDTO dto) {
SaasSleepEvaluateReport entity = new SaasSleepEvaluateReport();
BeanUtils.copyProperties(dto, entity);
save(entity);
}
@Override
public void edit(SaasSleepEvaluateReportDTO dto) {
SaasSleepEvaluateReport entity = getById(dto.getId());
BeanUtils.copyProperties(dto, entity);
saveOrUpdate(entity);
}
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepEvaluateStandardReportServiceImpl.java 0 → 100644
package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateStandardReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
import com.makeit.mapper.saas.analysis.SaasSleepEvaluateStandardReportMapper;
import com.makeit.service.saas.SaasSleepEvaluateStandardReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
/**
* <p>
* 睡眠质量分析模型评估标准 服务实现类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Service
public class SaasSleepEvaluateStandardReportServiceImpl extends ServiceImpl<SaasSleepEvaluateStandardReportMapper, SaasSleepEvaluateStandardReport> implements SaasSleepEvaluateStandardReportService {
@Override
public SaasSleepEvaluateStandardReport view(String id) {
return getById(id);
}
@Override
public void add(SaasSleepEvaluateStandardReportDTO dto) {
SaasSleepEvaluateStandardReport entity = new SaasSleepEvaluateStandardReport();
BeanUtils.copyProperties(dto,entity);
save(entity);
}
@Override
public void edit(SaasSleepEvaluateStandardReportDTO dto) {
SaasSleepEvaluateStandardReport entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity);
saveOrUpdate(entity);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment