Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 3e229647 by lzy
Options

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

parents f1d06d47 1cf257af
Inline Side-by-side
Showing with 854 additions and 93 deletions
db/inti-elder.sql
...@@ -329,6 +329,42 @@ CREATE TABLE `plat_elder_sleep_analysis` ...@@ -329,6 +329,42 @@ CREATE TABLE `plat_elder_sleep_analysis`
DEFAULT CHARSET = utf8mb4 DEFAULT CHARSET = utf8mb4
ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析'; ROW_FORMAT = COMPACT COMMENT = '长者每天睡觉分析';
CREATE TABLE `plat_elder_breathe_abnormal` (
`id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(64) NOT NULL COMMENT '长者id',
`breathe_analysis_id` varchar(64) NOT NULL COMMENT '呼吸分析id',
`happen_time` datetime NOT NULL COMMENT '发生时间',
`type` varchar(32) DEFAULT NULL COMMENT '异常类型',
`value` varchar(64) DEFAULT NULL COMMENT '值',
`create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`create_by` varchar(64) NOT NULL COMMENT '创建人',
`update_by` varchar(64) NOT NULL COMMENT '更新人',
`tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='长者每天呼吸异常';
CREATE TABLE `plat_elder_breathe_analysis` (
`id` varchar(64) NOT NULL COMMENT 'id',
`elder_id` varchar(64) NOT NULL COMMENT '长者id',
`breathe_score` varchar(64) DEFAULT NULL COMMENT '睡眠评分',
`breathe_result` varchar(64) DEFAULT NULL COMMENT '睡眠结果',
`breathe_evaluate` varchar(64) DEFAULT NULL COMMENT '评价',
`avg_heart_rate` varchar(64) DEFAULT NULL COMMENT '平均心率',
`avg_breathe_rate` varchar(64) DEFAULT NULL COMMENT '平均呼吸率',
`current_date` varchar(64) DEFAULT NULL COMMENT '当前日期 yyyy-mm-dd',
`create_date` datetime NOT NULL COMMENT '创建时间',
`update_date` datetime NOT NULL COMMENT '更新时间',
`del_flag` char(1) DEFAULT NULL COMMENT '删除标识',
`create_by` varchar(64) NOT NULL COMMENT '创建人',
`update_by` varchar(64) NOT NULL COMMENT '更新人',
`tenant_id` varchar(64) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`),
KEY `index_elder_id` (`elder_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='长者每天呼吸分析';
CREATE TABLE `plat_elder_report_month` CREATE TABLE `plat_elder_report_month`
( (
`id` varchar(64) NOT NULL COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
......
db/saas-analysis.sql
...@@ -137,4 +137,28 @@ CREATE TABLE `saas_disease_evaluate_report` ( ...@@ -137,4 +137,28 @@ CREATE TABLE `saas_disease_evaluate_report` (
`del_flag` char(1) NOT NULL COMMENT ' 删除标志 0否 1是 ', `del_flag` char(1) NOT NULL COMMENT ' 删除标志 0否 1是 ',
`tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ', `tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='呼吸心率慢性病模型评估结果'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='呼吸心率慢性病模型评估结果';
\ No newline at end of file
CREATE TABLE `saas_disease_report` (
`id` varchar(64) NOT NULL COMMENT 'id',
`result_content` text COMMENT '评估内容 json数组 {"number:"1""scoreRange":"",evaluate:""}',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` char(1) NOT NULL COMMENT ' 删除标志 0否 1是 ',
`tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='呼吸心率慢性病报告';
CREATE TABLE `saas_elder_report_config` (
`id` varchar(64) NOT NULL COMMENT 'id',
`result_content` text COMMENT '评估内容 json字符串 {"number:"1",condtion："","score":"",evaluate:"""}',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`del_flag` char(1) NOT NULL COMMENT ' 删除标志 0否 1是 ',
`tenant_id` varchar(64) DEFAULT NULL COMMENT ' 租户id ',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='长者报告配置';
\ No newline at end of file
db/space.sql
...@@ -83,8 +83,8 @@ CREATE TABLE `plat_bed` ...@@ -83,8 +83,8 @@ CREATE TABLE `plat_bed`
CREATE TABLE `plat_region_setting` CREATE TABLE `plat_region_setting`
( (
`id` varchar(64) NOT NULL COMMENT 'id', `id` varchar(64) NOT NULL COMMENT 'id',
`install_type` char(1) NOT NULL COMMENT '安装方式 0-顶装 1-侧装', `install_type` char(1) DEFAULT NULL COMMENT '安装方式 0-顶装 1-侧装',
`toward` char(1) NOT NULL COMMENT '设备朝向 0-上 1-下 2-左 3-右', `toward` char(1) DEFAULT NULL COMMENT '设备朝向 0-上 1-下 2-左 3-右',
`region_name` varchar(64) DEFAULT NULL COMMENT '区域名称', `region_name` varchar(64) DEFAULT NULL COMMENT '区域名称',
`region_range` varchar(128) DEFAULT NULL COMMENT '区域定位', `region_range` varchar(128) DEFAULT NULL COMMENT '区域定位',
`room_range` varchar(128) DEFAULT NULL COMMENT '房间门定位', `room_range` varchar(128) DEFAULT NULL COMMENT '房间门定位',
......
saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseReportController.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.SaasDiseaseReport;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasDiseaseReportService;
import com.makeit.service.saas.SaasSleepEvaluateReportService;
import io.swagger.annotations.Api;
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/diseaseReport")
@Api(tags = "saas端-报告管理-呼吸心率慢性病报告")
public class SaasDiseaseReportController {
@Autowired
private SaasDiseaseReportService saasDiseaseReportService;
@Action(module = "报告管理-呼吸心率慢性病报告", name = "详情", code = "saas:diseaseReport:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<SaasDiseaseReport> view(@RequestBody BaseIdDTO dto) {
return ApiResponseUtils.success(saasDiseaseReportService.view(dto.getId()));
}
@Action(module = "报告管理-呼吸心率慢性病报告", name = "新增", code = "saas:diseaseReport:add")
@ApiOperation("新增")
@PostMapping("add")
public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasDiseaseReportService.add(dto);
return ApiResponseUtils.success();
}
@Action(module = "报告管理-呼吸心率慢性病报告", name = "编辑", code = "saas:diseaseReport:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
saasDiseaseReportService.edit(dto);
return ApiResponseUtils.success();
}
}
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
...@@ -10,6 +10,7 @@ import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO; ...@@ -10,6 +10,7 @@ import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.global.aspect.tenant.TenantIdIgnore; import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -24,11 +25,14 @@ import org.springframework.web.bind.annotation.RestController;
public class SaasDeviceController { public class SaasDeviceController {
@Autowired @Autowired
private PlatDeviceService platDeviceService; private PlatDeviceService platDeviceService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@ApiOperation("列表") @ApiOperation("列表")
@PostMapping("page") @PostMapping("page")
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<PageVO<PlatDevice>> page(@RequestBody PageReqDTO<PlatDevice> pageReqDTO) { public ApiResponseEntity<PageVO<PlatDevice>> page(@RequestBody PageReqDTO<PlatDevice> pageReqDTO) {
return ApiResponseUtils.success(platDeviceService.pageSaas(pageReqDTO)); return ApiResponseUtils.success(platDeviceService.pageSaas(pageReqDTO));
} }
...@@ -36,6 +40,7 @@ public class SaasDeviceController { ...@@ -36,6 +40,7 @@ public class SaasDeviceController {
@PostMapping("detail") @PostMapping("detail")
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<PlatDeviceDetailDTO> detail(@RequestBody BaseIdDTO baseIdDTO) { public ApiResponseEntity<PlatDeviceDetailDTO> detail(@RequestBody BaseIdDTO baseIdDTO) {
saasOperationLogService.add("saas端-租户设备管理-设备信息", null);
return ApiResponseUtils.success(platDeviceService.getDetailDTO(baseIdDTO.getId())); return ApiResponseUtils.success(platDeviceService.getDetailDTO(baseIdDTO.getId()));
} }
...@@ -44,6 +49,8 @@ public class SaasDeviceController { ...@@ -44,6 +49,8 @@ public class SaasDeviceController {
@TenantIdIgnore @TenantIdIgnore
public ApiResponseEntity<Void> edit(@RequestBody PlatDeviceEditSaasDTO dto) { public ApiResponseEntity<Void> edit(@RequestBody PlatDeviceEditSaasDTO dto) {
platDeviceService.saasEdit(dto); platDeviceService.saasEdit(dto);
saasOperationLogService.add("saas端-租户设备管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/PlatTenantController.java
...@@ -7,12 +7,14 @@ import com.makeit.common.page.PageVO; ...@@ -7,12 +7,14 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.entity.saas.PlatTenant; import com.makeit.entity.saas.PlatTenant;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatTenantDTOVO; import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
import com.makeit.module.admin.dto.plat.PlatTenantMenuDTO; import com.makeit.module.admin.dto.plat.PlatTenantMenuDTO;
import com.makeit.module.admin.dto.plat.PlatTenantStatusDTO; import com.makeit.module.admin.dto.plat.PlatTenantStatusDTO;
import com.makeit.module.admin.vo.plat.PlatTenantVO; import com.makeit.module.admin.vo.plat.PlatTenantVO;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -39,6 +41,8 @@ public class PlatTenantController { ...@@ -39,6 +41,8 @@ public class PlatTenantController {
@Autowired @Autowired
private PlatTenantService platTenantService; private PlatTenantService platTenantService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "租户管理-租户", name = "分页列表", code = "saas:tenant:page") @Action(module = "租户管理-租户", name = "分页列表", code = "saas:tenant:page")
@ApiOperation("分页列表") @ApiOperation("分页列表")
...@@ -76,8 +80,11 @@ public class PlatTenantController { ...@@ -76,8 +80,11 @@ public class PlatTenantController {
@Action(module = "租户管理-租户", name = "新增", code = "saas:tenant:add") @Action(module = "租户管理-租户", name = "新增", code = "saas:tenant:add")
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatTenantDTOVO dto){ ; public ApiResponseEntity<String> add(@Validated @RequestBody PlatTenantDTOVO dto){
return ApiResponseUtils.success(platTenantService.add(dto)); String add = platTenantService.add(dto);
saasOperationLogService.add("saas端-租户管理-新增", add);
return ApiResponseUtils.success(add);
} }
@Action(module = "租户管理-租户", name = "编辑", code = "saas:tenant:edit") @Action(module = "租户管理-租户", name = "编辑", code = "saas:tenant:edit")
...@@ -85,6 +92,8 @@ public class PlatTenantController { ...@@ -85,6 +92,8 @@ public class PlatTenantController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatTenantDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatTenantDTOVO dto){
platTenantService.edit(dto); platTenantService.edit(dto);
saasOperationLogService.add("saas端-租户管理-编辑", dto.getId());
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -92,6 +101,8 @@ public class PlatTenantController { ...@@ -92,6 +101,8 @@ public class PlatTenantController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-租户管理-详情", dto.getId());
return ApiResponseUtils.success(platTenantService.view(dto.getId())); return ApiResponseUtils.success(platTenantService.view(dto.getId()));
} }
...@@ -106,6 +117,8 @@ public class PlatTenantController { ...@@ -106,6 +117,8 @@ public class PlatTenantController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platTenantService.del(dto.getId()); platTenantService.del(dto.getId());
saasOperationLogService.add("saas端-租户管理-删除", dto.getId());
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -114,6 +127,11 @@ public class PlatTenantController { ...@@ -114,6 +127,11 @@ public class PlatTenantController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody PlatTenantStatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody PlatTenantStatusDTO dto){
platTenantService.changeStatus(dto); platTenantService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户管理-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户管理-禁用", dto.getId());
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -123,6 +141,8 @@ public class PlatTenantController { ...@@ -123,6 +141,8 @@ public class PlatTenantController {
@Deprecated @Deprecated
public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){ public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){
platTenantService.assignMenuList(tntTenantMenuDTO); platTenantService.assignMenuList(tntTenantMenuDTO);
saasOperationLogService.add("saas端-租户管理-分配菜单", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasLoginController.java
...@@ -3,8 +3,10 @@ package com.makeit.controller.saas; ...@@ -3,8 +3,10 @@ package com.makeit.controller.saas;
import com.makeit.common.dto.LoginDTO; import com.makeit.common.dto.LoginDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.service.saas.SaasUserService;
import com.makeit.module.admin.vo.saas.SaasUserLoginVO; import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.request.RequestUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,17 +22,23 @@ public class SaasLoginController { ...@@ -20,17 +22,23 @@ public class SaasLoginController {
@Autowired @Autowired
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@ApiOperation("登录") @ApiOperation("登录")
@PostMapping("login") @PostMapping("login")
public ApiResponseEntity<SaasUserLoginVO> login(@RequestBody LoginDTO loginDTO) { public ApiResponseEntity<SaasUserLoginVO> login(@RequestBody LoginDTO loginDTO) {
return ApiResponseUtils.success(saasUserService.login(loginDTO)); SaasUserLoginVO login = saasUserService.login(loginDTO);
RequestUtil.setHeader("token",login.getToken());
saasOperationLogService.add("saas端-用户-登录", null);
return ApiResponseUtils.success(login);
} }
@ApiOperation("退出登录") @ApiOperation("退出登录")
@PostMapping("logout") @PostMapping("logout")
public ApiResponseEntity<?> logout() { public ApiResponseEntity<?> logout() {
saasUserService.logout(); saasUserService.logout();
saasOperationLogService.add("saas端-用户-退出", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
} }
saas-module/src/main/java/com/makeit/controller/saas/SaasMenuController.java
...@@ -5,10 +5,12 @@ import com.makeit.common.dto.BaseIdDTO; ...@@ -5,10 +5,12 @@ import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.dto.StatusDTO; import com.makeit.common.dto.StatusDTO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.saas.SaasMenuDTOVO; import com.makeit.module.admin.dto.saas.SaasMenuDTOVO;
import com.makeit.module.admin.dto.saas.SaasMenuQueryDTO; import com.makeit.module.admin.dto.saas.SaasMenuQueryDTO;
import com.makeit.service.saas.SaasMenuService; import com.makeit.service.saas.SaasMenuService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -35,6 +37,8 @@ public class SaasMenuController { ...@@ -35,6 +37,8 @@ public class SaasMenuController {
@Autowired @Autowired
private SaasMenuService saasMenuService; private SaasMenuService saasMenuService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-菜单", name = "列表", code = "saas:menu:list") @Action(module = "saas端-菜单", name = "列表", code = "saas:menu:list")
@ApiOperation("列表") @ApiOperation("列表")
...@@ -67,6 +71,8 @@ public class SaasMenuController { ...@@ -67,6 +71,8 @@ public class SaasMenuController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) { public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) {
String id = saasMenuService.add(dto); String id = saasMenuService.add(dto);
saasOperationLogService.add("saas端-菜单-新增", null);
return ApiResponseUtils.success(id); return ApiResponseUtils.success(id);
} }
...@@ -75,6 +81,8 @@ public class SaasMenuController { ...@@ -75,6 +81,8 @@ public class SaasMenuController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasMenuDTOVO dto) { public ApiResponseEntity<?> edit(@Validated @RequestBody SaasMenuDTOVO dto) {
saasMenuService.edit(dto); saasMenuService.edit(dto);
saasOperationLogService.add("saas端-菜单-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -90,6 +98,8 @@ public class SaasMenuController { ...@@ -90,6 +98,8 @@ public class SaasMenuController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) { public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) {
saasMenuService.del(dto.getId()); saasMenuService.del(dto.getId());
saasOperationLogService.add("saas端-菜单-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -98,6 +108,11 @@ public class SaasMenuController { ...@@ -98,6 +108,11 @@ public class SaasMenuController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) { public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) {
saasMenuService.changeStatus(dto); saasMenuService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-菜单-启用", null);
} else {
saasOperationLogService.add("saas端-菜单-禁用", null);
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java
...@@ -9,6 +9,7 @@ import com.makeit.global.annotation.Action; ...@@ -9,6 +9,7 @@ import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatMenuDTOVO; import com.makeit.module.admin.dto.plat.PlatMenuDTOVO;
import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO; import com.makeit.module.admin.dto.plat.PlatMenuQueryDTO;
import com.makeit.service.saas.PlatMenuService; import com.makeit.service.saas.PlatMenuService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -35,6 +36,8 @@ public class SaasPlatMenuController { ...@@ -35,6 +36,8 @@ public class SaasPlatMenuController {
@Autowired @Autowired
private PlatMenuService platMenuService; private PlatMenuService platMenuService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-租户资源管理(菜单)", name = "列表", code = "saas:plat:menu:list") @Action(module = "saas端-租户资源管理(菜单)", name = "列表", code = "saas:plat:menu:list")
@ApiOperation("列表") @ApiOperation("列表")
...@@ -67,6 +70,8 @@ public class SaasPlatMenuController { ...@@ -67,6 +70,8 @@ public class SaasPlatMenuController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatMenuDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody PlatMenuDTOVO dto){
String add = platMenuService.add(dto); String add = platMenuService.add(dto);
saasOperationLogService.add("saas端-租户资源管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -75,6 +80,8 @@ public class SaasPlatMenuController { ...@@ -75,6 +80,8 @@ public class SaasPlatMenuController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){
platMenuService.edit(dto); platMenuService.edit(dto);
saasOperationLogService.add("saas端-租户资源管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -90,6 +97,8 @@ public class SaasPlatMenuController { ...@@ -90,6 +97,8 @@ public class SaasPlatMenuController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platMenuService.del(dto.getId()); platMenuService.del(dto.getId());
saasOperationLogService.add("saas端-租户资源管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPlatUserController.java
...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO; ...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.plat.PlatUserDTOVO; import com.makeit.module.admin.dto.plat.PlatUserDTOVO;
import com.makeit.module.admin.dto.plat.PlatUserQueryDTO; import com.makeit.module.admin.dto.plat.PlatUserQueryDTO;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -37,6 +39,8 @@ public class SaasPlatUserController { ...@@ -37,6 +39,8 @@ public class SaasPlatUserController {
@Autowired @Autowired
private PlatUserService platUserService; private PlatUserService platUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-租户账号", name = "分页列表", code = "saas.plat.user.pageTenant") @Action(module = "saas端-租户账号", name = "分页列表", code = "saas.plat.user.pageTenant")
//@PlatOperationLogger //@PlatOperationLogger
...@@ -70,6 +74,8 @@ public class SaasPlatUserController { ...@@ -70,6 +74,8 @@ public class SaasPlatUserController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody PlatUserDTOVO dto){
String add = platUserService.add(dto); String add = platUserService.add(dto);
saasOperationLogService.add("saas端-租户账号管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -78,6 +84,8 @@ public class SaasPlatUserController { ...@@ -78,6 +84,8 @@ public class SaasPlatUserController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody PlatUserDTOVO dto){
platUserService.edit(dto); platUserService.edit(dto);
saasOperationLogService.add("saas端-租户账号管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -87,6 +95,8 @@ public class SaasPlatUserController { ...@@ -87,6 +95,8 @@ public class SaasPlatUserController {
@PostMapping("changePasword") @PostMapping("changePasword")
public ApiResponseEntity<?> changePassword(@RequestBody PlatUserDTOVO dto){ public ApiResponseEntity<?> changePassword(@RequestBody PlatUserDTOVO dto){
platUserService.changePassword(dto); platUserService.changePassword(dto);
saasOperationLogService.add("saas端-租户账号管理-修改密码", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -94,6 +104,8 @@ public class SaasPlatUserController { ...@@ -94,6 +104,8 @@ public class SaasPlatUserController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<PlatUserDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<PlatUserDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-租户账号管理-详情", null);
return ApiResponseUtils.success(platUserService.view(dto.getId())); return ApiResponseUtils.success(platUserService.view(dto.getId()));
} }
...@@ -102,6 +114,8 @@ public class SaasPlatUserController { ...@@ -102,6 +114,8 @@ public class SaasPlatUserController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
platUserService.del(dto.getId()); platUserService.del(dto.getId());
saasOperationLogService.add("saas端-租户账号管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -110,6 +124,11 @@ public class SaasPlatUserController { ...@@ -110,6 +124,11 @@ public class SaasPlatUserController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
platUserService.changeStatus(dto); platUserService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户账号管理-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户账号管理-禁用", dto.getId());
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasPrivacyConfigController.java
...@@ -4,6 +4,7 @@ import com.makeit.common.response.ApiResponseEntity; ...@@ -4,6 +4,7 @@ import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.saas.SaasPrivacyConfigDTO; import com.makeit.dto.saas.SaasPrivacyConfigDTO;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasPrivacyConfigService; import com.makeit.service.saas.SaasPrivacyConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -28,6 +29,8 @@ public class SaasPrivacyConfigController { ...@@ -28,6 +29,8 @@ public class SaasPrivacyConfigController {
@Autowired @Autowired
private SaasPrivacyConfigService saasPrivacyConfigService; private SaasPrivacyConfigService saasPrivacyConfigService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-隐私政策-关于我们", name = "新增", code = "saas.sys.privacyConfig.add") @Action(module = "saas端-隐私政策-关于我们", name = "新增", code = "saas.sys.privacyConfig.add")
//@PlatOperationLogger //@PlatOperationLogger
...@@ -35,6 +38,7 @@ public class SaasPrivacyConfigController { ...@@ -35,6 +38,7 @@ public class SaasPrivacyConfigController {
@PostMapping("/add") @PostMapping("/add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
String add = saasPrivacyConfigService.add(saasPrivacyConfigDTO); String add = saasPrivacyConfigService.add(saasPrivacyConfigDTO);
saasOperationLogService.add("saas端-隐私政策-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -42,6 +46,7 @@ public class SaasPrivacyConfigController { ...@@ -42,6 +46,7 @@ public class SaasPrivacyConfigController {
@ApiOperation(value = "获取隐私政策-关于我们", notes = "") @ApiOperation(value = "获取隐私政策-关于我们", notes = "")
@PostMapping("/view") @PostMapping("/view")
public ApiResponseEntity<SaasPrivacyConfigDTO> view(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<SaasPrivacyConfigDTO> view(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasOperationLogService.add("saas端-隐私政策-详情", null);
return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory())); return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory()));
} }
...@@ -51,6 +56,8 @@ public class SaasPrivacyConfigController { ...@@ -51,6 +56,8 @@ public class SaasPrivacyConfigController {
@PostMapping("/addAbout") @PostMapping("/addAbout")
public ApiResponseEntity<?> addAbout(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<?> addAbout(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasPrivacyConfigService.add(saasPrivacyConfigDTO); saasPrivacyConfigService.add(saasPrivacyConfigDTO);
saasOperationLogService.add("saas端-关于我们-新增", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -58,6 +65,8 @@ public class SaasPrivacyConfigController { ...@@ -58,6 +65,8 @@ public class SaasPrivacyConfigController {
@ApiOperation(value = "获取关于我们", notes = "") @ApiOperation(value = "获取关于我们", notes = "")
@PostMapping("/viewAbout") @PostMapping("/viewAbout")
public ApiResponseEntity<SaasPrivacyConfigDTO> viewAbout(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){ public ApiResponseEntity<SaasPrivacyConfigDTO> viewAbout(@RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
saasOperationLogService.add("saas端-关于我们-详情", null);
return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory())); return ApiResponseUtils.success(saasPrivacyConfigService.view(saasPrivacyConfigDTO.getCategory()));
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasRoleController.java
...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO; ...@@ -7,10 +7,12 @@ import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.enums.CommonEnum;
import com.makeit.global.annotation.Action; import com.makeit.global.annotation.Action;
import com.makeit.module.admin.dto.saas.SaasRoleDTOVO; import com.makeit.module.admin.dto.saas.SaasRoleDTOVO;
import com.makeit.module.admin.dto.saas.SaasRoleMenuDTO; import com.makeit.module.admin.dto.saas.SaasRoleMenuDTO;
import com.makeit.module.admin.dto.saas.SaasUserRoleDTO; import com.makeit.module.admin.dto.saas.SaasUserRoleDTO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasRoleService; import com.makeit.service.saas.SaasRoleService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -38,6 +40,8 @@ public class SaasRoleController { ...@@ -38,6 +40,8 @@ public class SaasRoleController {
@Autowired @Autowired
private SaasRoleService saasRoleService; private SaasRoleService saasRoleService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-角色", name = "列表", code = "saas:role:list") @Action(module = "saas端-角色", name = "列表", code = "saas:role:list")
@ApiOperation("列表不分页") @ApiOperation("列表不分页")
...@@ -65,6 +69,7 @@ public class SaasRoleController { ...@@ -65,6 +69,7 @@ public class SaasRoleController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasRoleDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasRoleDTOVO dto){
String add = saasRoleService.add(dto); String add = saasRoleService.add(dto);
saasOperationLogService.add("saas端-角色管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -73,6 +78,7 @@ public class SaasRoleController { ...@@ -73,6 +78,7 @@ public class SaasRoleController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasRoleDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody SaasRoleDTOVO dto){
saasRoleService.edit(dto); saasRoleService.edit(dto);
saasOperationLogService.add("saas端-角色管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -80,6 +86,7 @@ public class SaasRoleController { ...@@ -80,6 +86,7 @@ public class SaasRoleController {
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<SaasRoleDTOVO> view(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<SaasRoleDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-角色管理-详情", null);
return ApiResponseUtils.success(saasRoleService.view(dto.getId())); return ApiResponseUtils.success(saasRoleService.view(dto.getId()));
} }
...@@ -88,6 +95,7 @@ public class SaasRoleController { ...@@ -88,6 +95,7 @@ public class SaasRoleController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
saasRoleService.del(dto.getId()); saasRoleService.del(dto.getId());
saasOperationLogService.add("saas端-角色管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -96,6 +104,11 @@ public class SaasRoleController { ...@@ -96,6 +104,11 @@ public class SaasRoleController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
saasRoleService.changeStatus(dto); saasRoleService.changeStatus(dto);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-角色管理-启用", null);
} else {
saasOperationLogService.add("saas端-角色管理-禁用", null);
}
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -104,6 +117,7 @@ public class SaasRoleController { ...@@ -104,6 +117,7 @@ public class SaasRoleController {
@PostMapping("assignUserList") @PostMapping("assignUserList")
public ApiResponseEntity<?> assignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){//参数要不要是一个对象里 有一个数组 public ApiResponseEntity<?> assignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){//参数要不要是一个对象里 有一个数组
saasRoleService.assignUserList(userRoleDTOList); saasRoleService.assignUserList(userRoleDTOList);
saasOperationLogService.add("saas端-角色管理-分配用户", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -112,6 +126,7 @@ public class SaasRoleController { ...@@ -112,6 +126,7 @@ public class SaasRoleController {
@PostMapping("removeAssignUserList") @PostMapping("removeAssignUserList")
public ApiResponseEntity<?> removeAssignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){ public ApiResponseEntity<?> removeAssignUserList(@RequestBody List<SaasUserRoleDTO> userRoleDTOList){
saasRoleService.removeAssignUserList(userRoleDTOList); saasRoleService.removeAssignUserList(userRoleDTOList);
saasOperationLogService.add("saas端-角色管理-删除分配用户", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -121,6 +136,7 @@ public class SaasRoleController { ...@@ -121,6 +136,7 @@ public class SaasRoleController {
@Deprecated @Deprecated
public ApiResponseEntity<?> assignMenuList(@RequestBody SaasRoleMenuDTO roleMenuDTO){ public ApiResponseEntity<?> assignMenuList(@RequestBody SaasRoleMenuDTO roleMenuDTO){
saasRoleService.assignMenuList(roleMenuDTO); saasRoleService.assignMenuList(roleMenuDTO);
saasOperationLogService.add("saas端-角色管理-分配菜单", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java
...@@ -13,6 +13,7 @@ import com.makeit.module.admin.dto.saas.SaasUserDTOVO; ...@@ -13,6 +13,7 @@ import com.makeit.module.admin.dto.saas.SaasUserDTOVO;
import com.makeit.module.admin.dto.saas.SaasUserQueryDTO; import com.makeit.module.admin.dto.saas.SaasUserQueryDTO;
import com.makeit.module.admin.vo.plat.PlatUserLoginVO; import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
import com.makeit.module.admin.vo.saas.SaasUserLoginVO; import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService; import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.user.ThreadLocalUserUtil; import com.makeit.utils.user.ThreadLocalUserUtil;
import com.makeit.utils.user.wechat.WechatUserInfo; import com.makeit.utils.user.wechat.WechatUserInfo;
...@@ -42,6 +43,8 @@ public class SaasUserController { ...@@ -42,6 +43,8 @@ public class SaasUserController {
@Autowired @Autowired
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@Action(module = "saas端-用户", name = "分页列表", code = "saas:user:page") @Action(module = "saas端-用户", name = "分页列表", code = "saas:user:page")
@ApiOperation("分页列表") @ApiOperation("分页列表")
...@@ -80,6 +83,7 @@ public class SaasUserController { ...@@ -80,6 +83,7 @@ public class SaasUserController {
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<String> add(@Validated @RequestBody SaasUserDTOVO dto){
String add = saasUserService.add(dto); String add = saasUserService.add(dto);
saasOperationLogService.add("saas端-用户管理-新增", null);
return ApiResponseUtils.success(add); return ApiResponseUtils.success(add);
} }
...@@ -88,6 +92,7 @@ public class SaasUserController { ...@@ -88,6 +92,7 @@ public class SaasUserController {
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<?> edit(@Validated @RequestBody SaasUserDTOVO dto){
saasUserService.edit(dto); saasUserService.edit(dto);
saasOperationLogService.add("saas端-用户管理-编辑", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -96,13 +101,15 @@ public class SaasUserController { ...@@ -96,13 +101,15 @@ public class SaasUserController {
@PostMapping("changePassword") @PostMapping("changePassword")
public ApiResponseEntity<?> changePassword(@RequestBody SaasUserDTOVO dto){ public ApiResponseEntity<?> changePassword(@RequestBody SaasUserDTOVO dto){
saasUserService.changePassword(dto); saasUserService.changePassword(dto);
saasOperationLogService.add("saas端-用户管理-修改密码", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@Action(module = "saas端-用户", name = "详情", code = "saas:user:view") @Action(module = "saas端-用户", name = "详情", code = "saas:user:view")
@ApiOperation("详情") @ApiOperation("详情")
@PostMapping("view") @PostMapping("view")
public ApiResponseEntity<SaasUserDTOVO> view(@RequestBody BaseIdDTO dto){; public ApiResponseEntity<SaasUserDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-用户管理-详情", null);
return ApiResponseUtils.success(saasUserService.view(dto.getId())); return ApiResponseUtils.success(saasUserService.view(dto.getId()));
} }
...@@ -111,6 +118,7 @@ public class SaasUserController { ...@@ -111,6 +118,7 @@ public class SaasUserController {
@PostMapping("del") @PostMapping("del")
public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){ public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
saasUserService.del(dto.getId()); saasUserService.del(dto.getId());
saasOperationLogService.add("saas端-用户管理-删除", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
...@@ -119,6 +127,7 @@ public class SaasUserController { ...@@ -119,6 +127,7 @@ public class SaasUserController {
@PostMapping("changeStatus") @PostMapping("changeStatus")
public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){ public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto){
saasUserService.changeStatus(dto); saasUserService.changeStatus(dto);
saasOperationLogService.add("saas端-用户管理-改变状态", null);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
......
server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatMenuDTOVO.java
...@@ -83,4 +83,6 @@ public class PlatMenuDTOVO extends BaseIdDTO { ...@@ -83,4 +83,6 @@ public class PlatMenuDTOVO extends BaseIdDTO {
* 跳转参数 * 跳转参数
*/ */
private String pageQuery; private String pageQuery;
private boolean show = false;
} }
server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
...@@ -128,7 +128,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -128,7 +128,7 @@ public class IotProductDeviceService extends IotCommonService {
public List<DeviceInfoContentBreathe> getDeviceLogByTimeRangeBreathe(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) { public List<DeviceInfoContentBreathe> getDeviceLogByTimeRangeBreathe(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "event", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime)); List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "reportProperty", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
List<DeviceInfoContentBreathe> deviceInfoContentBreatheList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentBreathe.class)); List<DeviceInfoContentBreathe> deviceInfoContentBreatheList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentBreathe.class));
...@@ -138,7 +138,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -138,7 +138,7 @@ public class IotProductDeviceService extends IotCommonService {
public List<DeviceInfoContentSpace> getDeviceLogByTimeRangeSpace(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) { public List<DeviceInfoContentSpace> getDeviceLogByTimeRangeSpace(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "event", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime)); List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "reportProperty", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
List<DeviceInfoContentSpace> deviceInfoContentSpaceList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentSpace.class)); List<DeviceInfoContentSpace> deviceInfoContentSpaceList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentSpace.class));
...@@ -148,7 +148,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -148,7 +148,7 @@ public class IotProductDeviceService extends IotCommonService {
public List<DeviceInfoContentFall> getDeviceLogByTimeRangeFall(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) { public List<DeviceInfoContentFall> getDeviceLogByTimeRangeFall(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "event", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime)); List<DeviceOperationLogEntity> deviceOperationLogEntityList = getDeviceLogByTimeRange(deviceId, "reportProperty", pageSize, dateTimeFormatter.format(startTime), dateTimeFormatter.format(endTime));
List<DeviceInfoContentFall> deviceInfoContentSpaceList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentFall.class)); List<DeviceInfoContentFall> deviceInfoContentSpaceList = StreamUtil.map(deviceOperationLogEntityList, e -> JsonUtil.toObj((String) e.getContent(), DeviceInfoContentFall.class));
...@@ -261,8 +261,7 @@ public class IotProductDeviceService extends IotCommonService { ...@@ -261,8 +261,7 @@ public class IotProductDeviceService extends IotCommonService {
if (responseMessage.getStatus() == 200) { if (responseMessage.getStatus() == 200) {
IotPagerResult pagerResult = JSON.parseObject(responseMessage.getResult().toString(), IotPagerResult.class); IotPagerResult pagerResult = JSON.parseObject(responseMessage.getResult().toString(), IotPagerResult.class);
List<DeviceOperationLogEntity> deviceOperationLogEntities = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceOperationLogEntity.class); List<DeviceOperationLogEntity> deviceOperationLogEntities = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceOperationLogEntity.class);
return deviceOperationLogEntities.stream().filter(deviceOperationLogEntity -> deviceOperationLogEntity.getType().contains("reportProperty")) return deviceOperationLogEntities;
.collect(Collectors.toList());
//Map maps = (Map) JSON.parse(datum.getContent().toString()); //Map maps = (Map) JSON.parse(datum.getContent().toString());
} }
log.error("获取设备接口失败:{}", responseMessage.getMessage()); log.error("获取设备接口失败:{}", responseMessage.getMessage());
......
server-common/src/main/java/com/makeit/module/iot/vo/analysis/AnalysisVO.java 0 → 100644
package com.makeit.module.iot.vo.analysis;
import lombok.Data;
@Data
public class AnalysisVO {
private Integer br;
private Integer actionCount = 0; // 体动次数
private Integer turnedCount = 0; // 翻身次数
private Boolean isAction; // 每分钟是否动过
private Boolean isMoveBed; // 是否离开床
private Boolean isMinuteActionFlag; // 每分钟体动值是否大于阈值
private Boolean awakeMinuteActionFlag; // 清醒每分钟体动是否满足要求
private int brStopThreshold; // 每分钟呼吸阈值
private int brFastThreshold; // 每分钟呼吸阈值
private int brSlowThreshold; // 每分钟呼吸阈值
private int hrFastThreshold; // 每分钟心率阈值
private int hrSlowThreshold; // 每分钟心率阈值
// private Integer sleepDeepMinuteCount; // 深睡每分钟体动和翻身次数
// private Integer sleepModerateAMinuteCount; // 中度睡每分钟体动和翻身次数
}
server-common/src/main/java/com/makeit/module/iot/vo/analysis/DiseaseReportVO.java 0 → 100644
package com.makeit.module.iot.vo.analysis;
import lombok.Data;
import java.util.List;
@Data
public class DiseaseReportVO {
private Integer number;
private List<Condition> condition;
private String score;
private String evaluate;
@Data
public static class Condition {
private String resultRelational;
private String resultCondition;
}
}
server-common/src/main/java/com/makeit/module/iot/vo/analysis/EvaluateReportVO.java 0 → 100644
package com.makeit.module.iot.vo.analysis;
import lombok.Data;
@Data
public class EvaluateReportVO {
private Integer number;
private String scoreRange;
private String result;
private String evaluate;
}
server-common/src/main/java/com/makeit/module/iot/vo/analysis/SaasSleepEvaluateStandardReportVO.java 0 → 100644
package com.makeit.module.iot.vo.analysis;
import lombok.Data;
@Data
public class SaasSleepEvaluateStandardReportVO {
private Long deepScore;
private Long lightScore;
private Long soberScore;
private Long sleepScore;
private Long totalScore;
}
server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepConfigVO.java 0 → 100644
package com.makeit.module.iot.vo.analysis;
import lombok.Data;
@Data
public class SleepConfigVO {
private String hour;
private String score;
}
server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepTimeAnalysisVO.java
...@@ -2,10 +2,28 @@ package com.makeit.module.iot.vo.analysis; ...@@ -2,10 +2,28 @@ package com.makeit.module.iot.vo.analysis;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class SleepTimeAnalysisVO { public class SleepTimeAnalysisVO {
private String startSleepTime; // 入睡时间开始 private String startTime;
private String endSleepTime; // 入睡时间结束
private String endTime;
// 间隔时间
private Long interval;
// SleepTypeEnum
private String type;
private List<SleepTimeAnalysisVO> deepList;
private List<SleepTimeAnalysisVO> midList;
private List<SleepTimeAnalysisVO> lightList;
private List<SleepTimeAnalysisVO> soberList;
} }
server-module/src/main/java/com/makeit/module/controller/children/org/PlatOrgChildrenController.java
...@@ -29,28 +29,28 @@ public class PlatOrgChildrenController { ...@@ -29,28 +29,28 @@ public class PlatOrgChildrenController {
@Autowired @Autowired
private PlatOrgService platOrgService; private PlatOrgService platOrgService;
@Action(module = "平台端-组织", name = "分页列表", code = "plat:org:page") @Action(module = "子女端小程序-组织", name = "分页列表", code = "plat:org:page")
@ApiOperation("树形列表") @ApiOperation("树形列表")
@PostMapping("page") @PostMapping("page")
public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){ public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){
return ApiResponseUtils.success(platOrgService.page(pageReqDTO)); return ApiResponseUtils.success(platOrgService.page(pageReqDTO));
} }
@Action(module = "平台端-组织", name = "不分页列表", code = "plat:org:list") @Action(module = "子女端小程序-组织", name = "不分页列表", code = "plat:org:list")
@ApiOperation("树形列表") @ApiOperation("树形列表")
@PostMapping("list") @PostMapping("list")
public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){ public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){
return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO)); return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
} }
@Action(module = "平台端-组织", name = "新增", code = "plat:org:add") @Action(module = "子女端小程序-组织", name = "新增", code = "plat:org:add")
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("add") @PostMapping("add")
public ApiResponseEntity<String> add(@Validated @RequestBody PlatOrg tntDept){ public ApiResponseEntity<String> add(@Validated @RequestBody PlatOrg tntDept){
return ApiResponseUtils.success(platOrgService.add(tntDept)); return ApiResponseUtils.success(platOrgService.add(tntDept));
} }
@Action(module = "平台端-组织", name = "编辑", code = "plat:org:edit") @Action(module = "子女端小程序-组织", name = "编辑", code = "plat:org:edit")
@ApiOperation("编辑") @ApiOperation("编辑")
@PostMapping("edit") @PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatOrg tntDept){ public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatOrg tntDept){
......
server-module/src/main/java/com/makeit/module/controller/children/tenant/PlatTenantChildrenController.java 0 → 100644
package com.makeit.module.controller.children.tenant;
import com.makeit.common.dto.BaseIdDTO;
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.PlatTenant;
import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
import com.makeit.module.admin.vo.plat.PlatTenantVO;
import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasOperationLogService;
import io.swagger.annotations.Api;
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 2022-05-10
*/
@Api(tags = "子女端-租户")
@RestController
@RequestMapping("/children/tenant")
public class PlatTenantChildrenController {
@Autowired
private PlatTenantService platTenantService;
@Autowired
private SaasOperationLogService saasOperationLogService;
@ApiOperation("分页列表")
@PostMapping("page")
public ApiResponseEntity<PageVO<PlatTenantVO>> page(@RequestBody PageReqDTO<PlatTenantVO> page){
return ApiResponseUtils.success(platTenantService.page(page));
}
@ApiOperation("列表")
@PostMapping("list")
public ApiResponseEntity<List<PlatTenant>> list(@RequestBody PlatTenantVO dto){
return ApiResponseUtils.success(platTenantService.list(dto));
}
@ApiOperation("分页列表(AuthIgnore)")
@PostMapping("pageAuthIgnore")
public ApiResponseEntity<PageVO<PlatTenantVO>> pageAuthIgnore(@RequestBody PageReqDTO<PlatTenantVO> page){
return ApiResponseUtils.success(platTenantService.page(page));
}
@ApiOperation("列表(AuthIgnore)")
@PostMapping("listAuthIgnore")
public ApiResponseEntity<List<PlatTenant>> listAuthIgnore(@RequestBody PlatTenantVO dto){
return ApiResponseUtils.success(platTenantService.list(dto));
}
@ApiOperation("列表 根据账号精确查询")
@PostMapping("listByUserIdAndAccount")
public ApiResponseEntity<List<PlatTenant>> listByUserIdAndAccount(@RequestBody PlatTenantVO dto){
return ApiResponseUtils.success(platTenantService.listByUserIdAndAccount(dto));
}
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){
saasOperationLogService.add("saas端-租户管理-详情", dto.getId());
return ApiResponseUtils.success(platTenantService.view(dto.getId()));
}
@ApiOperation("详情(AuthIgnore)")
@PostMapping("viewIgnore")
public ApiResponseEntity<PlatTenantDTOVO> viewIgnore(@RequestBody BaseIdDTO dto){
return ApiResponseUtils.success(platTenantService.view(dto.getId()));
}
}
server-module/src/main/java/com/makeit/module/controller/wechat/org/PlatOrgWechatController.java 0 → 100644
package com.makeit.module.controller.wechat.org;
import com.makeit.common.dto.BaseIdDTO;
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.platform.auth.PlatOrg;
import com.makeit.global.annotation.Action;
import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
import io.swagger.annotations.Api;
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;
import java.util.List;
@Api(tags = "平台端小程序-组织")
@RestController
@RequestMapping("/wechat/plat/org")
public class PlatOrgWechatController {
@Autowired
private PlatOrgService platOrgService;
@Action(module = "子女端小程序-组织", name = "分页列表", code = "plat:org:page")
@ApiOperation("树形列表")
@PostMapping("page")
public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){
return ApiResponseUtils.success(platOrgService.page(pageReqDTO));
}
@Action(module = "子女端小程序-组织", name = "不分页列表", code = "plat:org:list")
@ApiOperation("树形列表")
@PostMapping("list")
public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){
return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
}
@Action(module = "子女端小程序-组织", name = "编辑", code = "plat:org:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatOrg tntDept){
platOrgService.edit(tntDept);
return ApiResponseUtils.success();
}
@Action(module = "平台端-组织", name = "详情", code = "plat:org:view")
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<PlatOrg> view(@RequestBody BaseIdDTO baseIdDTO){
return ApiResponseUtils.success(platOrgService.view(baseIdDTO.getId()));
}
@ApiOperation("当前账号的权限级别树")
@PostMapping("belongToScopeTree")
public ApiResponseEntity<List<PlatOrg>> belongToScopeTree(@RequestBody PlatOrg param){
return ApiResponseUtils.success(platOrgService.belongToOrgTree(param));
}
}
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasDiseaseEvaluateReportDTO.java
package com.makeit.dto.saas.analysis; package com.makeit.dto.saas.analysis;
import com.makeit.module.iot.vo.analysis.DiseaseReportVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* <p> * <p>
* 呼吸心率慢性病模型评估结果 * 呼吸心率慢性病模型评估结果
...@@ -19,7 +22,8 @@ public class SaasDiseaseEvaluateReportDTO { ...@@ -19,7 +22,8 @@ public class SaasDiseaseEvaluateReportDTO {
private String id; private String id;
@ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}") @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}")
private String resultContent; private List<DiseaseReportVO> resultContent;
} }
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasElderReportConfigDTO.java
package com.makeit.dto.saas.analysis; package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* <p> * <p>
* 长者报告配置 * 长者报告配置
...@@ -21,7 +24,7 @@ public class SaasElderReportConfigDTO { ...@@ -21,7 +24,7 @@ public class SaasElderReportConfigDTO {
private String id; private String id;
@ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}") @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}")
private String resultContent; private List<EvaluateReportVO> resultContent;
} }
server-service/src/main/java/com/makeit/dto/saas/analysis/SaasSleepEvaluateReportDTO.java
package com.makeit.dto.saas.analysis; package com.makeit.dto.saas.analysis;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* <p> * <p>
* 睡眠质量分析模型评估结果 * 睡眠质量分析模型评估结果
...@@ -21,7 +24,9 @@ public class SaasSleepEvaluateReportDTO { ...@@ -21,7 +24,9 @@ public class SaasSleepEvaluateReportDTO {
private String id; private String id;
@ApiModelProperty(value = "评估结果 json字符串 {\"number:\"1\",scoreRange：\"~隔开\",\"result\":\"\",evaluate:\"\"\"}") @ApiModelProperty(value = "评估结果 json字符串 {\"number:\"1\",scoreRange：\"~隔开\",\"result\":\"\",evaluate:\"\"\"}")
private String resultContent; private List<EvaluateReportVO> resultContent;
} }
server-service/src/main/java/com/makeit/entity/platform/alarm/PlatDayDurationRecord.java
package com.makeit.entity.platform.alarm; package com.makeit.entity.platform.alarm;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity { ...@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity {
private String oriDeviceId; private String oriDeviceId;
/** /**
* 日期 yyyyMMdd * 日期
*/ */
private String day; @JsonFormat(pattern = "yyyy-MM-dd")
private Date day;
/** /**
* 本次进入时间 * 本次进入时间
......
server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseReport.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="SaasDiseaseReport对象", description="呼吸心率慢性病报告")
public class SaasDiseaseReport extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "评估结果 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}")
private String resultContent;
}
server-service/src/main/java/com/makeit/enums/report/SleepTypeEnum.java
...@@ -11,7 +11,9 @@ public enum SleepTypeEnum { ...@@ -11,7 +11,9 @@ public enum SleepTypeEnum {
SLEEP_DEEP("sleepDeep","深度睡眠"), SLEEP_DEEP("sleepDeep","深度睡眠"),
SLEEP_MODERATE("sleepModerate","中度睡眠"), SLEEP_MODERATE("sleepModerate","中度睡眠"),
SLEEP_LIGHTNESS("sleepLightness","浅度睡眠"), SLEEP_LIGHTNESS("sleepLightness","浅度睡眠"),
SOBER("sober","清醒"); SOBER("sober","清醒"),
GETUP("getup","起床"),
SLEEP("sleep","睡觉");
private String code; private String code;
private String value; private String value;
......
server-service/src/main/java/com/makeit/mapper/saas/analysis/SaasDiseaseReportMapper.java 0 → 100644
package com.makeit.mapper.saas.analysis;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.saas.analysis.SaasDiseaseReport;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
/**
* <p>
* 呼吸心率慢性病报告 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasDiseaseReportMapper extends BaseMapper<SaasDiseaseReport> {
}
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
...@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
...@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm { ...@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm {
PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting(); PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
Date now = new Date(); Date now = new Date();
long endLong = now.getTime(); long endLong = now.getTime();
Long startLong = alarmRedisDTO.getStartLong();
long count = endLong - alarmRedisDTO.getStartLong(); long count = endLong - alarmRedisDTO.getStartLong();
//save db //save db
platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO); platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
...@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm { ...@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm {
durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(","))); durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
durationRecord.setDuration(count); durationRecord.setDuration(count);
durationRecord.setOriDeviceId(platDevice.getOriDeviceId()); durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd"); durationRecord.setDay(alarmRedisDTO.getStart());
durationRecord.setDay(dateTimeFormatter.format(LocalDateTime.ofEpochSecond(startLong / 1000, 0, ZoneOffset.ofHours(8))));
durationRecord.setStartDate(alarmRedisDTO.getStart()); durationRecord.setStartDate(alarmRedisDTO.getStart());
durationRecord.setEndDate(now); durationRecord.setEndDate(now);
durationRecord.setTenantId(config.getTenantId()); durationRecord.setTenantId(config.getTenantId());
......
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
...@@ -84,6 +84,7 @@ import java.util.LinkedHashSet; ...@@ -84,6 +84,7 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -244,7 +245,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -244,7 +245,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_NOT_BLANK); throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_PASSWORD_NOT_BLANK);
} }
setPassword(user); setPassword(user);
user.setAccount(dto.getMobile());
save(user); save(user);
dto.setId(user.getId()); dto.setId(user.getId());
return user.getId(); return user.getId();
...@@ -324,6 +324,11 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -324,6 +324,11 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_TENANT_NOT_EXIST); throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_TENANT_NOT_EXIST);
} }
}else {
PlatTenant platTenant = platTenantService.getById(tntUserLoginVO.getTenantId());
PlatTenantVO vo = BeanDtoVoUtils.convert(platTenant, PlatTenantVO.class);
//没有值的情况：登陆后无法跳转
tntUserLoginVO.setTenantList(Arrays.asList(vo));
} }
} }
...@@ -785,8 +790,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -785,8 +790,6 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
user.setStatus(CommonEnum.YES.getValue()); user.setStatus(CommonEnum.YES.getValue());
user.setAccount(dto.getMobile());
fillOrgPath(dto, user); fillOrgPath(dto, user);
save(user); save(user);
...@@ -1012,6 +1015,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -1012,6 +1015,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
public void updatePlatUserTenantId(String tenantId, String platUserId) { public void updatePlatUserTenantId(String tenantId, String platUserId) {
LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class) LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
.set(PlatUser::getTenantId, tenantId) .set(PlatUser::getTenantId, tenantId)
.set(PlatUser::getOrgId,tenantId)
.set(PlatUser::getOrgPath,tenantId)
.eq(BaseEntity::getId, platUserId); .eq(BaseEntity::getId, platUserId);
this.update(updateWrapper); this.update(updateWrapper);
} }
...@@ -1036,7 +1041,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -1036,7 +1041,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlatRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
roleLambdaQueryWrapper.select(BaseEntity::getId,PlatRole::getName); roleLambdaQueryWrapper.select(BaseEntity::getId,PlatRole::getName);
List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper); List<PlatRole> roleList = platRoleService.list(roleLambdaQueryWrapper);
Map<String, String> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, BaseEntity::getId, (a, b) -> a)); Map<String, PlatOrg> orgNameMap = orgList.stream().collect(Collectors.toMap(PlatOrg::getName, vo->vo, (a, b) -> a));
Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(PlatRole::getName, BaseEntity::getId, (a, b) -> a)); Map<String, String> roleNameMap = roleList.stream().collect(Collectors.toMap(PlatRole::getName, BaseEntity::getId, (a, b) -> a));
LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlatUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
...@@ -1054,8 +1059,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -1054,8 +1059,8 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
ExcelErrorVo.isNotNull(dto.getMobile(),errorVoList,start+i,"手机号*"); ExcelErrorVo.isNotNull(dto.getMobile(),errorVoList,start+i,"手机号*");
ExcelErrorVo.isNotNull(dto.getRoleName(),errorVoList,start+i,"*角色"); ExcelErrorVo.isNotNull(dto.getRoleName(),errorVoList,start+i,"*角色");
ExcelErrorVo.isNotNull(dto.getOrgName(),errorVoList,start+i,"*所属组织"); ExcelErrorVo.isNotNull(dto.getOrgName(),errorVoList,start+i,"*所属组织");
PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(dto.getOrgName())).orElse(new PlatOrg());
ExcelErrorVo.notExists(orgNameMap.get(dto.getOrgName()),errorVoList,start+i,"*所属组织"); ExcelErrorVo.notExists( platOrg.getId(),errorVoList,start+i,"*所属组织");
ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"*角色"); ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"*角色");
ExcelErrorVo.exists(mobileMap,mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*"); ExcelErrorVo.exists(mobileMap,mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*");
ExcelErrorVo.exists(emailMap,emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱"); ExcelErrorVo.exists(emailMap,emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱");
...@@ -1069,6 +1074,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser> ...@@ -1069,6 +1074,9 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
platUser.setTenantId(TenantIdUtil.getTenantId()); platUser.setTenantId(TenantIdUtil.getTenantId());
platUser.setAccount(platUser.getMobile()); platUser.setAccount(platUser.getMobile());
platUser.setIsTenant(CommonEnum.NO.getValue()); platUser.setIsTenant(CommonEnum.NO.getValue());
PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(vo.getOrgName())).orElse(new PlatOrg());
platUser.setOrgId(platOrg.getId());
platUser.setOrgPath(platOrg.getPath()+","+platOrg.getId());
platUsers.add(platUser); platUsers.add(platUser);
}); });
......
server-service/src/main/java/com/makeit/service/platform/dataScreen/impl/DataScreenServiceImpl.java
...@@ -397,13 +397,14 @@ public class DataScreenServiceImpl implements DataScreenService { ...@@ -397,13 +397,14 @@ public class DataScreenServiceImpl implements DataScreenService {
private List<PlatAlarmRecordStatisticsVo> coverToVoList(List<PlatAlarmRecord> alarmRecords, Map<String,PlatElder> platElderMap) { private List<PlatAlarmRecordStatisticsVo> coverToVoList(List<PlatAlarmRecord> alarmRecords, Map<String,PlatElder> platElderMap) {
List<PlatAlarmRecordStatisticsVo> statisticsVos = new ArrayList<>(); List<PlatAlarmRecordStatisticsVo> statisticsVos = new ArrayList<>();
alarmRecords.forEach(record->{ alarmRecords.forEach(record->{
List<String> elderIds = Arrays.asList(record.getElderIds().split(",")); if(StringUtil.isNotEmpty(record.getElderIds())) {
if(StringUtil.isNotEmpty(record.getElderIds()) List<String> elderIds = Arrays.asList(record.getElderIds().split(","));
&& elderIds.size()>0){ if (elderIds.size() > 0) {
if(platElderMap.get(elderIds.get(0))!=null){ if (platElderMap.get(elderIds.get(0)) != null) {
PlatAlarmRecordStatisticsVo statisticsVo = BeanDtoVoUtils.convert(record, PlatAlarmRecordStatisticsVo.class); PlatAlarmRecordStatisticsVo statisticsVo = BeanDtoVoUtils.convert(record, PlatAlarmRecordStatisticsVo.class);
statisticsVo.setSpaceId(platElderMap.get(elderIds.get(0)).getSpaceId()); statisticsVo.setSpaceId(platElderMap.get(elderIds.get(0)).getSpaceId());
statisticsVos.add(statisticsVo); statisticsVos.add(statisticsVo);
}
} }
} }
}); });
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
package com.makeit.service.platform.space.impl; package com.makeit.service.platform.space.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.platform.space.PlatRegionSettingDTO; import com.makeit.dto.platform.space.PlatRegionSettingDTO;
import com.makeit.dto.platform.space.PlatRegionSettingQueryDTO; import com.makeit.dto.platform.space.PlatRegionSettingQueryDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.entity.platform.device.PlatDeviceOther;
import com.makeit.entity.platform.space.PlatRegionSetting; import com.makeit.entity.platform.space.PlatRegionSetting;
import com.makeit.enums.platform.device.PlatDeviceEnum; import com.makeit.enums.platform.device.PlatDeviceEnum;
import com.makeit.mapper.platform.space.PlatRegionSettingMapper; import com.makeit.mapper.platform.space.PlatRegionSettingMapper;
import com.makeit.service.platform.device.PlatDeviceOtherService;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.platform.space.PlatRegionSettingService; import com.makeit.service.platform.space.PlatRegionSettingService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
...@@ -16,6 +19,7 @@ import org.springframework.stereotype.Service; ...@@ -16,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -30,6 +34,8 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM ...@@ -30,6 +34,8 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
@Autowired @Autowired
private PlatDeviceService platDeviceService; private PlatDeviceService platDeviceService;
@Autowired
private PlatDeviceOtherService platDeviceOtherService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
...@@ -43,13 +49,23 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM ...@@ -43,13 +49,23 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
queryWrapper1.ne(PlatDevice::getCategory, PlatDeviceEnum.CategoryEnum.HEART); queryWrapper1.ne(PlatDevice::getCategory, PlatDeviceEnum.CategoryEnum.HEART);
List<PlatDevice> devices = platDeviceService.list(queryWrapper1); List<PlatDevice> devices = platDeviceService.list(queryWrapper1);
listDeviceId = devices.stream().map(item->item.getId()).collect(Collectors.toList()); listDeviceId = devices.stream().map(item->item.getId()).collect(Collectors.toList());
List<PlatDeviceOther> platDeviceOthers = new ArrayList<>();
if(!listDeviceId.isEmpty()){
//获取设备安装方式
platDeviceOthers = platDeviceOtherService.list(new QueryWrapper<PlatDeviceOther>().lambda()
.in(PlatDeviceOther::getDeviceId,listDeviceId));
}
Map<String,String> map = platDeviceOthers.stream().collect(Collectors.toMap(PlatDeviceOther::getDeviceId,PlatDeviceOther::getInstallation));
List<PlatRegionSetting> list = new ArrayList<>(); List<PlatRegionSetting> list = new ArrayList<>();
listDeviceId.forEach(item->{ listDeviceId.forEach(item->{
PlatRegionSetting platRegionSetting = new PlatRegionSetting(); PlatRegionSetting platRegionSetting = new PlatRegionSetting();
platRegionSetting.setDeviceId(item); platRegionSetting.setDeviceId(item);
platRegionSetting.setRoomId(roomId); platRegionSetting.setRoomId(roomId);
if(map.get(item)!=null){
platRegionSetting.setInstallType(map.get(item));
}
list.add(platRegionSetting); list.add(platRegionSetting);
}); });
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
...@@ -75,12 +75,20 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -75,12 +75,20 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
public void add(PlatSpaceAddDTO dto) { public void add(PlatSpaceAddDTO dto) {
check(dto); check(dto);
PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class); PlatSpace space = BeanDtoVoUtils.convert(dto, PlatSpace.class);
PlatUserVO userVO = PlatUserUtil.getUserVO(); if(StringUtil.isEmpty(dto.getParentId())){
space.setOrgId(userVO.getOrgId()); PlatUserVO userVO = PlatUserUtil.getUserVO();
PlatOrg org = platOrgService.getById(userVO.getOrgId()); space.setOrgId(userVO.getOrgId());
if(org!=null){ PlatOrg org = platOrgService.getById(space.getOrgId());
space.setAttribute(org.getType()); if(org!=null){
space.setAttribute(org.getType());
}
}else {
//上级空间
PlatSpace parentSpace = getById(dto.getParentId());
space.setOrgId(parentSpace.getOrgId());
space.setAttribute(parentSpace.getAttribute());
} }
save(space); save(space);
} }
...@@ -260,7 +268,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -260,7 +268,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
PlatSpaceVO vo = new PlatSpaceVO(); PlatSpaceVO vo = new PlatSpaceVO();
vo.setName(space.getName()); vo.setName(space.getName());
vo.setParentId(space.getId()); vo.setParentId(space.getParentId());
vo.setId(space.getId()); vo.setId(space.getId());
return vo; return vo;
} }
......
server-service/src/main/java/com/makeit/service/saas/SaasDiseaseReportService.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.SaasDiseaseReport;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
/**
* <p>
* 睡眠质量分析模型评估结果 服务类
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
public interface SaasDiseaseReportService extends IService<SaasDiseaseReport> {
SaasDiseaseReport view(String id);
void add(SaasSleepEvaluateReportDTO dto);
void edit(SaasSleepEvaluateReportDTO dto);
EvaluateReportVO getByScore(long totalScore);
}
server-service/src/main/java/com/makeit/service/saas/SaasElderReportConfigService.java
...@@ -3,6 +3,7 @@ package com.makeit.service.saas; ...@@ -3,6 +3,7 @@ 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.SaasElderReportConfigDTO; import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
import com.makeit.entity.saas.analysis.SaasElderReportConfig; import com.makeit.entity.saas.analysis.SaasElderReportConfig;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
/** /**
* <p> * <p>
...@@ -19,4 +20,6 @@ public interface SaasElderReportConfigService extends IService<SaasElderReportCo ...@@ -19,4 +20,6 @@ public interface SaasElderReportConfigService extends IService<SaasElderReportCo
void add(SaasElderReportConfigDTO dto); void add(SaasElderReportConfigDTO dto);
void edit(SaasElderReportConfigDTO dto); void edit(SaasElderReportConfigDTO dto);
EvaluateReportVO getByScore(long totalScore);
} }
server-service/src/main/java/com/makeit/service/saas/SaasSleepEvaluateReportService.java
...@@ -3,6 +3,7 @@ package com.makeit.service.saas; ...@@ -3,6 +3,7 @@ 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.SaasSleepEvaluateReportDTO; import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport; import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
/** /**
* <p> * <p>
...@@ -19,4 +20,6 @@ public interface SaasSleepEvaluateReportService extends IService<SaasSleepEvalua ...@@ -19,4 +20,6 @@ public interface SaasSleepEvaluateReportService extends IService<SaasSleepEvalua
void add(SaasSleepEvaluateReportDTO dto); void add(SaasSleepEvaluateReportDTO dto);
void edit(SaasSleepEvaluateReportDTO dto); void edit(SaasSleepEvaluateReportDTO dto);
EvaluateReportVO getByScore(long totalScore);
} }
server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java
...@@ -2,6 +2,7 @@ package com.makeit.service.saas.impl; ...@@ -2,6 +2,7 @@ package com.makeit.service.saas.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.entity.saas.PlatMenu; import com.makeit.entity.saas.PlatMenu;
import com.makeit.entity.saas.PlatTenantMenu; import com.makeit.entity.saas.PlatTenantMenu;
import com.makeit.enums.CodeMessageEnum; import com.makeit.enums.CodeMessageEnum;
...@@ -18,6 +19,7 @@ import com.makeit.service.saas.PlatTenantMenuService; ...@@ -18,6 +19,7 @@ import com.makeit.service.saas.PlatTenantMenuService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.StreamUtil; import com.makeit.utils.data.convert.StreamUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -39,13 +41,13 @@ import java.util.regex.Pattern; ...@@ -39,13 +41,13 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author lixl * @author lixl
* @description 针对表【tnt_auth_menu(租户端资源管理)】的数据库操作Service实现 * @description 针对表【tnt_auth_menu(租户端资源管理)】的数据库操作Service实现
* @createDate 2023-08-29 14:29:10 * @createDate 2023-08-29 14:29:10
*/ */
@Service @Service
public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu> public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
implements PlatMenuService { implements PlatMenuService {
@Autowired @Autowired
private PlatTenantMenuService platTenantMenuService; private PlatTenantMenuService platTenantMenuService;
...@@ -96,23 +98,74 @@ implements PlatMenuService { ...@@ -96,23 +98,74 @@ implements PlatMenuService {
return topList; return topList;
} }
private List<PlatMenuDTOVO> tree(List<PlatMenuDTOVO> orgList, Set<String> filterSet) {
if (CollectionUtils.isEmpty(orgList)) {
return new ArrayList<>();
}
Map<String, List<PlatMenuDTOVO>> parentMap = orgList.stream()
.collect(Collectors.groupingBy(PlatMenuDTOVO::getParentId));
orgList.forEach(vo -> {
vo.setChildren(parentMap.get(vo.getId()));
});
List<PlatMenuDTOVO> collect = orgList.stream().filter(vo ->
StringUtils.equals(vo.getParentId(), TreeConst.TOP_LEVEL)).collect(Collectors.toList());
for (PlatMenuDTOVO platMenuDTOVO : collect) {
cutLeaves(platMenuDTOVO, filterSet);
}
return collect.stream().filter(vo -> vo.isShow()).collect(Collectors.toList());
}
/**
* 去掉filterSet后的子节点
* @param parent
* @param filterSet
* @return
*/
public boolean cutLeaves(PlatMenuDTOVO parent, Set<String> filterSet) {
List<PlatMenuDTOVO> children = parent.getChildren();
boolean childShow = false;
if (CollectionUtils.isNotEmpty(children)) {
for (PlatMenuDTOVO platMenuDTOVO : children) {
boolean test = cutLeaves(platMenuDTOVO, filterSet);
if (!test) {
platMenuDTOVO.setChildren(null);
} else {
platMenuDTOVO.setShow(true);
childShow = true;
}
if (filterSet.contains(platMenuDTOVO.getId())) {
platMenuDTOVO.setShow(true);
childShow = true;
}
}
children.removeIf(vo->!vo.isShow());
}
if(!childShow){
parent.setChildren(null);
}
if (filterSet.contains(parent.getId())) {
childShow = true;
}
parent.setShow(childShow);
return parent.isShow();
}
@Override @Override
public List<PlatMenuDTOVO> tree(PlatMenuQueryDTO dto) { public List<PlatMenuDTOVO> tree(PlatMenuQueryDTO dto) {
List<PlatMenuDTOVO> tntMenuList = list(dto); List<PlatMenuDTOVO> tntMenuList = list(dto);
return tree(tntMenuList); dto.setName(null);
dto.setStatus(null);
List<PlatMenuDTOVO> tntMenuListAll = list(dto);
Set<String> menuIdSet = tntMenuList.stream().map(BaseIdDTO::getId).collect(Collectors.toSet());
return tree(tntMenuListAll, menuIdSet);
} }
// private void checkName(TntMenuDTOVO dto) {
// TntMenu old = getOne(new QueryWrapper<TntMenu>().lambda()
// .in(TntMenu::getCategory, SysEnum.MenuTypeEnum.CATALOGUE.getValue(), SysEnum.MenuTypeEnum.MENU.getValue())
// .eq(TntMenu::getName, dto.getName()));
// if (old != null && !old.getId().equals(dto.getId())) {
// throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_NAME_DUPLICATE);
// }
// }
/** /**
* 校验资源名称是否重复 * 校验资源名称是否重复
*
* @param dto * @param dto
*/ */
private void checkCode(PlatMenuDTOVO dto) { private void checkCode(PlatMenuDTOVO dto) {
......
server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java
...@@ -31,7 +31,6 @@ import com.makeit.service.platform.auth.PlatOrgService; ...@@ -31,7 +31,6 @@ import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.saas.PlatTenantMenuService; import com.makeit.service.saas.PlatTenantMenuService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasOperationLogService;
import com.makeit.service.saas.SaasUserService; import com.makeit.service.saas.SaasUserService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.PageUtil; import com.makeit.utils.data.convert.PageUtil;
...@@ -71,9 +70,6 @@ implements PlatTenantService { ...@@ -71,9 +70,6 @@ implements PlatTenantService {
private SaasUserService saasUserService; private SaasUserService saasUserService;
@Autowired @Autowired
private SaasOperationLogService saasOperationLogService;
@Autowired
private SysConfigService sysConfigService; private SysConfigService sysConfigService;
@Autowired @Autowired
private PlatTenantMenuService platTenantMenuService; private PlatTenantMenuService platTenantMenuService;
...@@ -256,8 +252,6 @@ implements PlatTenantService { ...@@ -256,8 +252,6 @@ implements PlatTenantService {
//分配菜单 //分配菜单
assignMenuList(tntTenant.getId(),dto.getMenuIdList()); assignMenuList(tntTenant.getId(),dto.getMenuIdList());
saasOperationLogService.add("saas端-租户账号-编辑", dto.getId());
} }
public PlatOrg convertToPlatOrg(PlatTenant platTenant){ public PlatOrg convertToPlatOrg(PlatTenant platTenant){
...@@ -278,8 +272,6 @@ implements PlatTenantService { ...@@ -278,8 +272,6 @@ 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("saas端-租户账号-详情", id);
LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>() LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>()
.eq(BaseBusEntity::getTenantId, id); .eq(BaseBusEntity::getTenantId, id);
List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper); List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper);
...@@ -296,8 +288,6 @@ implements PlatTenantService { ...@@ -296,8 +288,6 @@ implements PlatTenantService {
public void del(String id) { public void del(String id) {
removeById(id); removeById(id);
saasOperationLogService.add("saas端-租户账号-删除", id);
} }
@Transactional @Transactional
...@@ -319,12 +309,6 @@ implements PlatTenantService { ...@@ -319,12 +309,6 @@ implements PlatTenantService {
tntTenant.setStatus(dto.getStatus()); tntTenant.setStatus(dto.getStatus());
updateById(tntTenant); updateById(tntTenant);
if (CommonEnum.YES.getValue().equals(dto.getStatus())) {
saasOperationLogService.add("saas端-租户账号-启用", dto.getId());
} else {
saasOperationLogService.add("saas端-租户账号-禁用", dto.getId());
}
} }
@Transactional @Transactional
......
server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseEvaluateReportServiceImpl.java
package com.makeit.service.saas.impl; package com.makeit.service.saas.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO; import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport; import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
...@@ -28,14 +29,16 @@ public class SaasDiseaseEvaluateReportServiceImpl extends ServiceImpl<SaasDiseas ...@@ -28,14 +29,16 @@ public class SaasDiseaseEvaluateReportServiceImpl extends ServiceImpl<SaasDiseas
@Override @Override
public void add(SaasDiseaseEvaluateReportDTO dto) { public void add(SaasDiseaseEvaluateReportDTO dto) {
SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport(); SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport();
BeanUtils.copyProperties(dto,entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
save(entity); save(entity);
} }
@Override @Override
public void edit(SaasDiseaseEvaluateReportDTO dto) { public void edit(SaasDiseaseEvaluateReportDTO dto) {
SaasDiseaseEvaluateReport entity = getById(dto.getId()); SaasDiseaseEvaluateReport entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
saveOrUpdate(entity); saveOrUpdate(entity);
} }
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseReportServiceImpl.java 0 → 100644
package com.makeit.service.saas.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasDiseaseReport;
import com.makeit.mapper.saas.analysis.SaasDiseaseReportMapper;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
import com.makeit.service.saas.SaasDiseaseReportService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@Service
public class SaasDiseaseReportServiceImpl extends ServiceImpl<SaasDiseaseReportMapper, SaasDiseaseReport> implements SaasDiseaseReportService {
@Override
public SaasDiseaseReport view(String id) {
return getById(id);
}
@Override
public void add(SaasSleepEvaluateReportDTO dto) {
SaasDiseaseReport entity = new SaasDiseaseReport();
String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
save(entity);
}
@Override
public void edit(SaasSleepEvaluateReportDTO dto) {
SaasDiseaseReport entity = getById(dto.getId());
String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
saveOrUpdate(entity);
}
@Override
public EvaluateReportVO getByScore(long totalScore) {
return null;
}
}
server-service/src/main/java/com/makeit/service/saas/impl/SaasElderReportConfigServiceImpl.java
package com.makeit.service.saas.impl; package com.makeit.service.saas.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.entity.BaseEntity;
import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO; import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
import com.makeit.entity.saas.analysis.SaasElderReportConfig; import com.makeit.entity.saas.analysis.SaasElderReportConfig;
import com.makeit.mapper.saas.analysis.SaasElderReportConfigMapper; import com.makeit.mapper.saas.analysis.SaasElderReportConfigMapper;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
import com.makeit.service.saas.SaasElderReportConfigService; import com.makeit.service.saas.SaasElderReportConfigService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 长者报告配置 服务实现类 * 长者报告配置 服务实现类
...@@ -28,14 +34,34 @@ public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderRepor ...@@ -28,14 +34,34 @@ public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderRepor
@Override @Override
public void add(SaasElderReportConfigDTO dto) { public void add(SaasElderReportConfigDTO dto) {
SaasElderReportConfig entity = new SaasElderReportConfig(); SaasElderReportConfig entity = new SaasElderReportConfig();
BeanUtils.copyProperties(dto,entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
save(entity); save(entity);
} }
@Override @Override
public void edit(SaasElderReportConfigDTO dto) { public void edit(SaasElderReportConfigDTO dto) {
SaasElderReportConfig entity = getById(dto.getId()); SaasElderReportConfig entity = getById(dto.getId());
BeanUtils.copyProperties(dto,entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
saveOrUpdate(entity); saveOrUpdate(entity);
} }
@Override
public EvaluateReportVO getByScore(long totalScore) {
SaasElderReportConfig elderReportConfig = getOne(new QueryWrapper<SaasElderReportConfig>().lambda()
.orderByDesc(BaseEntity::getCreateBy)
.last("limit 1"));
List<EvaluateReportVO> elderEvaluateReportList = JSON.parseArray(elderReportConfig.getResultContent(), EvaluateReportVO.class);
EvaluateReportVO elderReport = null;
for (EvaluateReportVO evaluateReportVO : elderEvaluateReportList) {
String[] scoreRange = evaluateReportVO.getScoreRange().split("~");
long scoreRangeStart = Long.parseLong(scoreRange[0]);
long scoreRangeEnd = Long.parseLong(scoreRange[1]);
if (scoreRangeStart <= totalScore && scoreRangeEnd >= totalScore) {
elderReport = evaluateReportVO;
}
}
return elderReport;
}
} }
server-service/src/main/java/com/makeit/service/saas/impl/SaasSleepEvaluateReportServiceImpl.java
package com.makeit.service.saas.impl; package com.makeit.service.saas.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.entity.BaseEntity;
import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO; import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport; import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
import com.makeit.mapper.saas.analysis.SaasSleepEvaluateReportMapper; import com.makeit.mapper.saas.analysis.SaasSleepEvaluateReportMapper;
import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
import com.makeit.service.saas.SaasSleepEvaluateReportService; import com.makeit.service.saas.SaasSleepEvaluateReportService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 睡眠质量分析模型评估结果 服务实现类 * 睡眠质量分析模型评估结果 服务实现类
...@@ -28,14 +34,37 @@ public class SaasSleepEvaluateReportServiceImpl extends ServiceImpl<SaasSleepEva ...@@ -28,14 +34,37 @@ public class SaasSleepEvaluateReportServiceImpl extends ServiceImpl<SaasSleepEva
@Override @Override
public void add(SaasSleepEvaluateReportDTO dto) { public void add(SaasSleepEvaluateReportDTO dto) {
SaasSleepEvaluateReport entity = new SaasSleepEvaluateReport(); SaasSleepEvaluateReport entity = new SaasSleepEvaluateReport();
BeanUtils.copyProperties(dto, entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
save(entity); save(entity);
} }
@Override @Override
public void edit(SaasSleepEvaluateReportDTO dto) { public void edit(SaasSleepEvaluateReportDTO dto) {
SaasSleepEvaluateReport entity = getById(dto.getId()); SaasSleepEvaluateReport entity = getById(dto.getId());
BeanUtils.copyProperties(dto, entity); String result = JSON.toJSONString(dto.getResultContent());
entity.setResultContent(result);
saveOrUpdate(entity); saveOrUpdate(entity);
} }
@Override
public EvaluateReportVO getByScore(long totalScore) {
SaasSleepEvaluateReport sleepEvaluateReport = getOne(new QueryWrapper<SaasSleepEvaluateReport>().lambda()
.orderByDesc(BaseEntity::getCreateBy)
.last("limit 1"));
String resultContent = sleepEvaluateReport.getResultContent();
List<EvaluateReportVO> evaluateReportList = JSON.parseArray(resultContent, EvaluateReportVO.class);
// 根据睡眠报告结果配置得出最后的睡眠评分
EvaluateReportVO finalReport = new EvaluateReportVO();
for (EvaluateReportVO evaluateReportVO : evaluateReportList) {
String[] scoreRange = evaluateReportVO.getScoreRange().split("~");
long scoreRangeStart = Long.parseLong(scoreRange[0]);
long scoreRangeEnd = Long.parseLong(scoreRange[1]);
if (scoreRangeStart <= totalScore && scoreRangeEnd >= totalScore) {
finalReport = evaluateReportVO;
}
}
return finalReport;
}
} }
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
...@@ -8,7 +8,6 @@ import lombok.Data; ...@@ -8,7 +8,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
/** /**
* <p> * <p>
...@@ -34,7 +33,7 @@ public class PlatAlarmRecordVO extends BaseTenantDTO { ...@@ -34,7 +33,7 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
private String alarmType; private String alarmType;
@ApiModelProperty(value = "告警时间") @ApiModelProperty(value = "告警时间")
private Date alarmDate; private LocalDateTime alarmDate;
@ApiModelProperty(value = "状态 0 待处理 1 已处理") @ApiModelProperty(value = "状态 0 待处理 1 已处理")
private String status; private String status;
...@@ -49,7 +48,8 @@ public class PlatAlarmRecordVO extends BaseTenantDTO { ...@@ -49,7 +48,8 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
private String dealUser; private String dealUser;
@ApiModelProperty(value = "处理时间") @ApiModelProperty(value = "处理时间")
private Date dealDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime dealDate;
@ApiModelProperty(value = "所属组织id") @ApiModelProperty(value = "所属组织id")
private String orgId; private String orgId;
......
server-service/src/main/java/com/makeit/vo/platform/workstation/WorkStationHomeBedVO.java
...@@ -36,7 +36,7 @@ public class WorkStationHomeBedVO { ...@@ -36,7 +36,7 @@ public class WorkStationHomeBedVO {
private String bedId; private String bedId;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String stauts; private String status;
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
......
server-service/src/main/resources/mappers/PlatBedMapper.xml
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
</select> </select>
<select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO"> <select id="selectByCondition" resultType="com.makeit.vo.platform.workstation.WorkStationHomeBedVO">
SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path SELECT pb.`name` as bedName, pb.id as bedId, pb.room_id , pe.id as elderId, pb.name as elderName, prbd.device_id,pm.id as roomId,pm.name as roomName ,pm.space_path,pb.status
FROM plat_bed pb FROM plat_bed pb
LEFT JOIN plat_room pm ON pm.id = pb.room_id LEFT JOIN plat_room pm ON pm.id = pb.room_id
LEFT JOIN plat_space ps ON ps.id = pm.space_id LEFT JOIN plat_space ps ON ps.id = pm.space_id
LEFT JOIN plat_elder pe ON pe.bed_id = pb.id LEFT JOIN plat_elder pe ON pe.bed_id = pb.id
LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id LEFT JOIN plat_room_bed_device prbd ON prbd.bed_id = pb.id
<where> <where>
pb.del_flag = 0 and pe.del_flag = 0 and prbd.del_flag = 0 and pb.status = 0 pb.del_flag = 0 and pe.del_flag = 0 and pb.status = 0
<if test="dto.elderName != null and dto.elderName != ''"> <if test="dto.elderName != null and dto.elderName != ''">
AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%') AND pe.naem LIKE CONCAT('%',#{dto.elderName},'%')
</if> </if>
......
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