fix

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportDayController.java

@@ -3,13 +3,17 @@ package com.makeit.controller.device;
 
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
-import com.makeit.dto.platform.elder.PlatElderIdDTO;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.elder.PlatElderDayReportDayService;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
-import com.makeit.vo.platform.elder.report.day.*;
+import com.makeit.vo.platform.elder.report.day.PlatElderBehaviorDistributionVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderBehaviorExceptionRecordVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationRecordVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderSleepEvaluationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,15 +64,17 @@ public class SaasDeviceReportDayController {
     @ApiOperation("心率异常记录")
     @PostMapping("heartExceptionRecordList")
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> heartExceptionRecordList(@RequestBody PlatElderIdDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> heartExceptionRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderDayReportDayService.heartExceptionRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("呼吸率异常记录")
     @PostMapping("respiratoryExceptionRecordList")
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> respiratoryExceptionRecordList(@RequestBody PlatElderIdDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> respiratoryExceptionRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderDayReportDayService.respiratoryExceptionRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("心率呼吸率")

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportMonthController.java

@@ -2,19 +2,24 @@ package com.makeit.controller.device;
 
 
 import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
+import com.makeit.service.platform.elder.PlatElderReportMonthService;
 import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationVO;
 import com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO;
 import com.makeit.vo.platform.elder.report.day.PlatElderSleepEvaluationVO;
 import com.makeit.vo.platform.elder.report.week.PlatElderComprehensiveEvaluationVO;
 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>
  * 长者基本信息 前端控制器
@@ -28,18 +33,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/saas/device/report/month")
 public class SaasDeviceReportMonthController {
 
+    @Autowired
+    private PlatElderReportMonthService platElderReportMonthService;
+
+
     @ApiOperation("综合评价")
     @PostMapping("comprehensiveEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderComprehensiveEvaluationVO> comprehensiveEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.comprehensiveEvaluation(platElderIdDTO));
+
     }
 
     @ApiOperation("睡眠评价")
     @PostMapping("sleepEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.sleepEvaluation(platElderIdDTO));
     }
 
 
@@ -47,14 +57,16 @@ public class SaasDeviceReportMonthController {
     @PostMapping("heartRespiratoryEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.heartRespiratoryEvaluation(platElderIdDTO));
+
     }
 
     @ApiOperation("月报表")
     @PostMapping("reportMonth")
     @TenantIdIgnore
-    public ApiResponseEntity<PlatElderReportMonthVO> reportMonth(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<List<PlatElderReportMonthVO>> reportMonth(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderReportMonthService.reportMonth(platElderIdDTO));
+
     }
 
 

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportWeekController.java

@@ -45,63 +45,68 @@ public class SaasDeviceReportWeekController {
     @PostMapping("comprehensiveEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderComprehensiveEvaluationVO> comprehensiveEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.comprehensiveEvaluation(platElderIdDTO));
     }
 
     @ApiOperation("睡眠评价")
     @PostMapping("sleepEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.sleepEvaluation(platElderIdDTO));
     }
 
     @ApiOperation("睡眠图表")
     @PostMapping("sleepDiagram")
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderSleepDiagramWeekVO>> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<PlatElderSleepDiagramWeekVO> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderDayReportWeekService.sleepDiagram(platElderIdDTO));
     }
 
     @ApiOperation("心率呼吸评价")
     @PostMapping("heartRespiratoryEvaluation")
     @TenantIdIgnore
     public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.heartRespiratoryEvaluation(platElderIdDTO));
     }
 
     @ApiOperation("心率异常记录")
     @PostMapping("heartExceptionRecordList")
     @TenantIdIgnore
     public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> heartExceptionRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.heartExceptionRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("呼吸率异常记录")
     @PostMapping("respiratoryExceptionRecordList")
     @TenantIdIgnore
     public ApiResponseEntity<List<PlatElderHeartRespiratoryEvaluationRecordVO>> respiratoryExceptionRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.respiratoryExceptionRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("心率呼吸率")
     @PostMapping("heartRespiratory")
     @TenantIdIgnore
-    public ApiResponseEntity<PlatElderRealTimeHeartRespiratoryWeekVO> heartRespiratory(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+    public ApiResponseEntity<List<PlatElderRealTimeHeartRespiratoryWeekVO>> heartRespiratory(@RequestBody PlatElderReportDTO platElderIdDTO) {
+        return ApiResponseUtils.success(platElderDayReportWeekService.heartRespiratory(platElderIdDTO));
+
     }
 
     @ApiOperation("行为异常记录")
     @PostMapping("behaviorExceptionRecordList")
     @TenantIdIgnore
     public ApiResponseEntity<List<PlatElderBehaviorExceptionRecordVO>> behaviorExceptionRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.behaviorExceptionRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("跌倒记录")
     @PostMapping("failRecordList")
     @TenantIdIgnore
     public ApiResponseEntity<List<String>> failRecordList(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.failRecordList(platElderIdDTO));
+
     }
 
     @ApiOperation("坐标记录")
@@ -115,7 +120,8 @@ public class SaasDeviceReportWeekController {
     @PostMapping("behaviorDistribution")
     @TenantIdIgnore
     public ApiResponseEntity<List<PlatElderBehaviorDistributionVO>> behaviorDistribution(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.behaviorDistribution(platElderIdDTO));
+
     }
 
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -11,6 +11,7 @@ import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
 import com.makeit.entity.platform.auth.PlatOrg;
+import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
 import com.makeit.entity.platform.auth.PlatUserRole;
 import com.makeit.entity.platform.space.PlatSpace;
@@ -46,6 +47,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -436,9 +438,9 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         if (CollectionUtils.isEmpty(roleOrgList)) {
             return new HashSet<>();
         }
-        return roleOrgList.stream().map(PlatRoleOrg::getOrgId).collect(Collectors.toSet());
-//        List<PlatRole> roleList = platRoleService.listByIds(roleOrgList.stream().map(PlatRoleOrg::getRoleId).collect(Collectors.toList()));
-//        return roleList.stream().flatMap(vo -> Stream.of(Optional.ofNullable(vo.getDataScope()).orElse(new String()) .split(","))).collect(Collectors.toSet());
+        //return roleOrgList.stream().map(PlatRoleOrg::getOrgId).collect(Collectors.toSet());
+        List<PlatRole> roleList = platRoleService.listByIds(roleOrgList.stream().map(PlatRoleOrg::getRoleId).collect(Collectors.toList()));
+        return roleList.stream().flatMap(vo -> Stream.of(Optional.ofNullable(vo.getDataScope()).orElse(new String()) .split(","))).collect(Collectors.toSet());
     }
     /**
      * 租户权限的组织树
@@ -593,7 +595,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
             vo.setChildren(parentMap.get(vo.getId()));
         });
 
-        return orgList.stream().filter(vo->StringUtils.equals(vo.getParentId(),"1")).collect(Collectors.toList());
+        return orgList.stream().filter(vo->StringUtils.equals(vo.getParentId(),TreeConst.TOP_LEVEL)).collect(Collectors.toList());
     }
 
     /**

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -32,6 +32,7 @@ import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.IsTenantAccountEnum;
 import com.makeit.enums.biz.auth.SysEnum;
+import com.makeit.enums.id.TreeConst;
 import com.makeit.exception.BusinessException;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
@@ -1060,7 +1061,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         LambdaUpdateWrapper<PlatUser> updateWrapper = Wrappers.lambdaUpdate(PlatUser.class)
                 .set(PlatUser::getTenantId, tenantId)
                 .set(PlatUser::getOrgId, tenantId)
-                .set(PlatUser::getOrgPath, "1,"+tenantId)
+                .set(PlatUser::getOrgPath, TreeConst.TOP_LEVEL+","+tenantId)
                 .eq(BaseEntity::getId, platUserId);
         this.update(updateWrapper);
     }

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -15,6 +15,7 @@ import com.makeit.entity.saas.PlatTenantMenu;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.IsTenantAccountEnum;
+import com.makeit.enums.id.TreeConst;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.exception.BusinessException;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
@@ -315,9 +316,9 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
         platOrg.setName(platTenant.getName());
         platOrg.setStatus(platTenant.getStatus());
         platOrg.setId(platTenant.getId());
-        platOrg.setPath("1");
+        platOrg.setPath(TreeConst.TOP_LEVEL);
         //租户没有父级
-        platOrg.setParentId("1");
+        platOrg.setParentId(TreeConst.TOP_LEVEL);
         return platOrg;
     }