Merge remote-tracking branch 'origin/dev' into dev

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -29,6 +29,7 @@ public enum CodeMessageEnum {
     SYSTEM_ERROR_NAME_DUPLICATE(500, "SYSTEM.ERROR.NAME.DUPLICATE"),
     SYSTEM_ERROR_NAME_ENG_DUPLICATE(500, "SYSTEM.ERROR.NAME.ENG.DUPLICATE"),
     SYSTEM_ERROR_CODE_DUPLICATE(500, "SYSTEM.ERROR.CODE.DUPLICATE"),
+    SYSTEM_ERROR_MENU_CODE_DUPLICATE(500, "SYSTEM.ERROR.MENU.CODE.DUPLICATE"),
     SYSTEM_ERROR_TENANT_CODE_DUPLICATE(500, "SYSTEM.ERROR.TENANT.CODE.DUPLICATE"),
     SYSTEM_ERROR_DICT_VALUE_DUPLICATE(500, "SYSTEM.ERROR.DICT.VALUE.DUPLICATE"),
     SYSTEM_ERROR_DICT_NOT_EXIST(500, "SYSTEM.ERROR.DICT.NOT.EXIST"),

server-common/src/main/resources/locale/business_messages.properties

@@ -113,3 +113,5 @@ PLATFORM.ERROR.ALARM.NOT.FOUND.ELDER=设备空间下无长者
 SYSTEM.ERROR.TENANT.FORBIDDEN=该租户被禁用
 SYSTEM.ERROR.ORG.FORBIDDEN=该组织被禁用
 
+SYSTEM.ERROR.MENU.CODE.DUPLICATE=跳转页面已存在
+

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportMonthController.java

@@ -38,20 +38,20 @@ public class PlatElderReportMonthController {
     @ApiOperation("综合评价")
     @PostMapping("comprehensiveEvaluation")
     public ApiResponseEntity<PlatElderComprehensiveEvaluationVO> comprehensiveEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.comprehensiveEvaluation(platElderIdDTO));
     }
 
     @ApiOperation("睡眠评价")
     @PostMapping("sleepEvaluation")
     public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.sleepEvaluation(platElderIdDTO));
     }
 
 
     @ApiOperation("心率呼吸评价")
     @PostMapping("heartRespiratoryEvaluation")
     public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderReportMonthService.heartRespiratoryEvaluation(platElderIdDTO));
     }
 
     @ApiOperation("月报表")

server-service/src/main/java/com/makeit/dto/saas/SaasPrivacyConfigDTO.java

@@ -26,7 +26,7 @@ public class SaasPrivacyConfigDTO implements Serializable {
 	@ApiModelProperty("标题")
 	private String title;
 	
-	@Size(max = 1800, message = "申请说明最长为1800字符")
+	@Size(max = 5000, message = "申请说明最长为5000字符")
 	@ApiModelProperty(value="内容")
 	private String content;
 	

server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java

@@ -41,9 +41,11 @@ public class PlatDevice extends BaseBusEntity {
     private String firmwareVersion;
 
     @ApiModelProperty(value = "注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime registrationDate;
 
     @ApiModelProperty(value = "最后上线时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastOnlineData;
 
     @ApiModelProperty(value = "说明")

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -128,7 +128,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
                 .eq(StringUtils.isNotBlank(param.getAlarmType()), PlatAlarmRecord::getAlarmType, param.getAlarmType())
                 .eq(StringUtils.isNotBlank(param.getStatus()), PlatAlarmRecord::getStatus, param.getStatus())
-                .eq(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
+                .like(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
                 .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
                 .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
                 .eq(StringUtils.isNotBlank(param.getOrgId()), PlatAlarmRecord::getOrgId, param.getOrgId())

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

@@ -82,6 +82,7 @@ implements PlatRoleService {
                 .like(StringUtils.isNotBlank(dto.getName()), PlatRole::getName, dto.getName())
                 .in(dto.getNameList() != null, PlatRole::getName, dto.getNameList())
                 .eq(StringUtils.isNotBlank(dto.getOrgId()), PlatRole::getOrgId, dto.getOrgId())
+                .eq(StringUtils.isNotBlank(dto.getStatus()),PlatRole::getStatus,dto.getStatus())
                 .orderByDesc(PlatRole::getCreateDate);
     }
 

server-service/src/main/java/com/makeit/service/platform/elder/PlatElderDayReportWeekService.java

@@ -8,6 +8,7 @@ import com.makeit.vo.platform.elder.report.week.PlatElderComprehensiveEvaluation
 import com.makeit.vo.platform.elder.report.week.PlatElderRealTimeHeartRespiratoryWeekVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -20,10 +21,16 @@ import java.util.List;
  */
 public interface PlatElderDayReportWeekService {
 
+    PlatElderComprehensiveEvaluationVO comprehensiveEvaluationInternal(PlatElderSleepEvaluationVO platElderSleepEvaluationVO, PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO);
+
     PlatElderComprehensiveEvaluationVO comprehensiveEvaluation(PlatElderReportDTO platElderIdDTO);
 
+    PlatElderSleepEvaluationVO sleepEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate);
+
     PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO);
 
+    PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate);
+
     PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO);
 
     List<PlatElderHeartRespiratoryEvaluationRecordVO> heartExceptionRecordList(PlatElderReportDTO platElderIdDTO);

server-service/src/main/java/com/makeit/service/platform/elder/PlatElderReportMonthService.java

@@ -3,7 +3,10 @@ package com.makeit.service.platform.elder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
+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 java.util.List;
 
@@ -17,6 +20,12 @@ import java.util.List;
  */
 public interface PlatElderReportMonthService extends IService<PlatElderReportMonth> {
 
+    PlatElderComprehensiveEvaluationVO comprehensiveEvaluation(PlatElderReportDTO platElderIdDTO);
+
+    PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO);
+
+    PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO);
+
     List<PlatElderReportMonthVO> reportMonth(PlatElderReportDTO platElderIdDTO);
 
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java

@@ -62,7 +62,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     private PlatElderBreatheDayStatService platElderBreatheDayStatService;
 
     private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) {
-        return weekStartDateTime(LocalDate.now(), defaultTime);
+        return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
     }
 
     private LocalDateTime weekStartDateTime(LocalDate now, LocalDateTime defaultTime) {
@@ -79,7 +79,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     }
 
     private LocalDateTime weekEndDateTime(LocalDateTime defaultTime) {
-        return weekStartDateTime(LocalDate.now(), defaultTime);
+        return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
     }
 
     private LocalDateTime weekEndDateTime(LocalDate now, LocalDateTime defaultTime) {
@@ -97,7 +97,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
 
     private LocalDate weekStartDate(LocalDateTime defaultTime) {
-        return weekStartDate(LocalDate.now(), defaultTime);
+        return weekStartDate(LocalDate.now().minusDays(1), defaultTime);
     }
 
     private LocalDate weekStartDate(LocalDate now, LocalDateTime defaultTime) {
@@ -112,7 +112,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     }
 
     private LocalDate weekEndDate(LocalDateTime defaultTime) {
-        return weekStartDate(LocalDate.now(), defaultTime);
+        return weekStartDate(LocalDate.now().minusDays(1), defaultTime);
     }
 
     private LocalDate weekEndDate(LocalDate now, LocalDateTime defaultTime) {
@@ -127,10 +127,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     }
 
     @Override
-    public PlatElderComprehensiveEvaluationVO comprehensiveEvaluation(PlatElderReportDTO platElderIdDTO) {
-
-        PlatElderSleepEvaluationVO platElderSleepEvaluationVO = sleepEvaluation(platElderIdDTO);
-        PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO = heartRespiratoryEvaluation(platElderIdDTO);
+    public PlatElderComprehensiveEvaluationVO comprehensiveEvaluationInternal(PlatElderSleepEvaluationVO platElderSleepEvaluationVO, PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO) {
 
         PlatElderComprehensiveEvaluationVO platElderComprehensiveEvaluationVO = new PlatElderComprehensiveEvaluationVO();
         platElderComprehensiveEvaluationVO.setScore((platElderSleepEvaluationVO.getScore() + platElderHeartRespiratoryEvaluationVO.getScore()) / 2);
@@ -145,14 +142,22 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     }
 
     @Override
-    public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
+    public PlatElderComprehensiveEvaluationVO comprehensiveEvaluation(PlatElderReportDTO platElderIdDTO) {
 
-        LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
-        LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime());
+        PlatElderSleepEvaluationVO platElderSleepEvaluationVO = sleepEvaluation(platElderIdDTO);
+        PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO = heartRespiratoryEvaluation(platElderIdDTO);
+
+        return comprehensiveEvaluationInternal(platElderSleepEvaluationVO, platElderHeartRespiratoryEvaluationVO);
+
+    }
+
+    @Override
+    public PlatElderSleepEvaluationVO sleepEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
         List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
+                .eq(PlatElderSleepAnalysis::getElderId, platElderIdDTO.getElderId())
                 .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );
@@ -184,12 +189,20 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
     }
 
+
     @Override
-    public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
+    public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
 
         LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
         LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime());
 
+        return sleepEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate);
+
+    }
+
+    @Override
+    public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
+
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
         List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
@@ -216,6 +229,17 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
     }
 
+
+    @Override
+    public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
+
+        LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
+        LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime());
+
+        return heartRespiratoryEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate);
+
+    }
+
     @Override
     public List<PlatElderHeartRespiratoryEvaluationRecordVO> heartExceptionRecordList(PlatElderReportDTO platElderIdDTO) {
 

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java

@@ -5,10 +5,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
 import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
+import com.makeit.service.platform.elder.PlatElderDayReportWeekService;
 import com.makeit.service.platform.elder.PlatElderReportMonthService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -25,6 +30,57 @@ import java.util.List;
 @Service
 public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReportMonthMapper, PlatElderReportMonth> implements PlatElderReportMonthService {
 
+    @Autowired
+    private PlatElderDayReportWeekService platElderDayReportWeekService;
+
+    public LocalDate monthStartDate(PlatElderReportDTO platElderIdDTO) {
+        return monthStartDate(platElderIdDTO.getYear(), platElderIdDTO.getMonth());
+    }
+
+    public LocalDate monthStartDate(Integer year, Integer month) {
+
+        if (year != null && month == null) {
+            throw new RuntimeException();
+        }
+
+        if (year == null && month != null) {
+            throw new RuntimeException();
+        }
+
+        if (year != null) {
+            return LocalDate.of(year, month, 1);
+        }
+
+        return LocalDateTimeUtils.getMonthMin(LocalDate.now().minusMonths(1));
+
+    }
+
+    public LocalDate monthEndDate(PlatElderReportDTO platElderIdDTO) {
+        return monthEndDate(platElderIdDTO.getYear(), platElderIdDTO.getMonth());
+    }
+
+    public LocalDate monthEndDate(Integer year, Integer month) {
+        return LocalDateTimeUtils.getMonthMax(monthStartDate(year, month));
+    }
+
+    @Override
+    public PlatElderComprehensiveEvaluationVO comprehensiveEvaluation(PlatElderReportDTO platElderIdDTO) {
+        PlatElderSleepEvaluationVO platElderSleepEvaluationVO = sleepEvaluation(platElderIdDTO);
+        PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO = heartRespiratoryEvaluation(platElderIdDTO);
+
+        return platElderDayReportWeekService.comprehensiveEvaluationInternal(platElderSleepEvaluationVO, platElderHeartRespiratoryEvaluationVO);
+    }
+
+    @Override
+    public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
+        return platElderDayReportWeekService.sleepEvaluationInternal(platElderIdDTO, monthStartDate(platElderIdDTO), monthEndDate(platElderIdDTO));
+    }
+
+    @Override
+    public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
+        return platElderDayReportWeekService.heartRespiratoryEvaluationInternal(platElderIdDTO, monthStartDate(platElderIdDTO), monthEndDate(platElderIdDTO));
+    }
+
     @Override
     public List<PlatElderReportMonthVO> reportMonth(PlatElderReportDTO platElderIdDTO) {
 

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

@@ -172,7 +172,7 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
         PlatMenu old = getOne(new QueryWrapper<PlatMenu>().lambda()
                 .eq(PlatMenu::getCode, dto.getCode()));
         if (old != null && !old.getId().equals(dto.getId())) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_CODE_DUPLICATE);
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_MENU_CODE_DUPLICATE);
         }
     }