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

saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseEvaluateReportController.java

@@ -4,6 +4,7 @@ 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.SaasDiseaseEvaluateReportDTO;
 import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
 import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
 import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
@@ -47,7 +48,7 @@ public class SaasDiseaseEvaluateReportController {
     @Action(module = "报告管理-呼吸心率慢性病模型评估结果", name = "新增", code = "saas:diseaseEvaluateReport:add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<Void> add(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
+    public ApiResponseEntity<Void> add(@Validated @RequestBody SaasDiseaseEvaluateReportDTO dto) {
         saasDiseaseEvaluateReportService.add(dto);
         return ApiResponseUtils.success();
     }
@@ -55,7 +56,7 @@ public class SaasDiseaseEvaluateReportController {
     @Action(module = "报告管理-呼吸心率慢性病模型评估结果", name = "编辑", code = "saas:diseaseEvaluateReport:edit")
     @ApiOperation("编辑")
     @PostMapping("edit")
-    public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasSleepEvaluateReportDTO dto) {
+    public ApiResponseEntity<Void> edit(@Validated @RequestBody SaasDiseaseEvaluateReportDTO dto) {
         saasDiseaseEvaluateReportService.edit(dto);
         return ApiResponseUtils.success();
     }

server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java

@@ -128,7 +128,7 @@ public class IotProductDeviceService extends IotCommonService {
     public List<DeviceInfoContentBreathe> getDeviceLogByTimeRangeBreathe(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
         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));
 
@@ -138,7 +138,7 @@ public class IotProductDeviceService extends IotCommonService {
     public List<DeviceInfoContentSpace> getDeviceLogByTimeRangeSpace(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
         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));
 
@@ -148,7 +148,7 @@ public class IotProductDeviceService extends IotCommonService {
     public List<DeviceInfoContentFall> getDeviceLogByTimeRangeFall(String deviceId, int pageSize, LocalDateTime startTime, LocalDateTime endTime) {
         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));
 
@@ -261,8 +261,7 @@ public class IotProductDeviceService extends IotCommonService {
             if (responseMessage.getStatus() == 200) {
                 IotPagerResult pagerResult = JSON.parseObject(responseMessage.getResult().toString(), IotPagerResult.class);
                 List<DeviceOperationLogEntity> deviceOperationLogEntities = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceOperationLogEntity.class);
-                return deviceOperationLogEntities.stream().filter(deviceOperationLogEntity -> deviceOperationLogEntity.getType().contains("reportProperty"))
-                        .collect(Collectors.toList());
+                return deviceOperationLogEntities;
                 //Map maps = (Map) JSON.parse(datum.getContent().toString());
             }
             log.error("获取设备接口失败:{}", responseMessage.getMessage());

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

+package com.makeit.dto.saas.analysis;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 呼吸心率慢性病模型评估结果
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-09-05
+ */
+@Data
+@ApiModel(value = "SaasDiseaseEvaluateReport对象", description = "呼吸心率慢性病模型评估结果")
+public class SaasDiseaseEvaluateReportDTO {
+
+    private String id;
+
+    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}")
+    private String resultContent;
+
+
+}

server-service/src/main/java/com/makeit/entity/platform/alarm/PlatDayDurationRecord.java

 package com.makeit.entity.platform.alarm;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.makeit.common.entity.BaseBusEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity {
     private String oriDeviceId;
 
     /**
-     * 日期 yyyyMMdd
+     * 日期
      */
-    private String day;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date day;
 
     /**
      * 本次进入时间

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm {
         PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
         Date now = new Date();
         long endLong = now.getTime();
-        Long startLong = alarmRedisDTO.getStartLong();
         long count = endLong - alarmRedisDTO.getStartLong();
         //save db
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm {
         durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
         durationRecord.setDuration(count);
         durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        durationRecord.setDay(dateTimeFormatter.format(LocalDateTime.ofEpochSecond(startLong / 1000, 0, ZoneOffset.ofHours(8))));
+        durationRecord.setDay(alarmRedisDTO.getStart());
         durationRecord.setStartDate(alarmRedisDTO.getStart());
         durationRecord.setEndDate(now);
         durationRecord.setTenantId(config.getTenantId());

server-service/src/main/java/com/makeit/service/saas/SaasDiseaseEvaluateReportService.java

 package com.makeit.service.saas;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
+import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO;
 import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
 
 /**
@@ -16,7 +16,7 @@ public interface SaasDiseaseEvaluateReportService extends IService<SaasDiseaseEv
 
     SaasDiseaseEvaluateReport view(String id);
 
-    void add(SaasSleepEvaluateReportDTO dto);
+    void add(SaasDiseaseEvaluateReportDTO dto);
 
-    void edit(SaasSleepEvaluateReportDTO dto);
+    void edit(SaasDiseaseEvaluateReportDTO dto);
 }

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

 package com.makeit.service.saas.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
+import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO;
 import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
 import com.makeit.mapper.saas.analysis.SaasDiseaseEvaluateReportMapper;
 import com.makeit.service.saas.SaasDiseaseEvaluateReportService;
@@ -26,14 +26,14 @@ public class SaasDiseaseEvaluateReportServiceImpl extends ServiceImpl<SaasDiseas
     }
 
     @Override
-    public void add(SaasSleepEvaluateReportDTO dto) {
+    public void add(SaasDiseaseEvaluateReportDTO dto) {
         SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport();
         BeanUtils.copyProperties(dto,entity);
         save(entity);
     }
 
     @Override
-    public void edit(SaasSleepEvaluateReportDTO dto) {
+    public void edit(SaasDiseaseEvaluateReportDTO dto) {
         SaasDiseaseEvaluateReport entity = getById(dto.getId());
         BeanUtils.copyProperties(dto,entity);
         saveOrUpdate(entity);

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

@@ -249,7 +249,6 @@ implements SaasUserService{
     @Transactional
     @Override
     public void edit(SaasUserDTOVO dto) {
-        dto.setAccount(null);
         superCantEdit(dto);
         check(dto);
 

server-service/src/main/resources/mappers/SaasOperationLogMapper.xml

@@ -5,11 +5,11 @@
 	<select id="selectByCondition" resultType="com.makeit.dto.saas.SaasOperationLogDTO">
 		select 
 		ol.id as id,
-		ol.saas_user_id as platUserId,
+		ol.saas_user_id as saasUserId,
 		ol.tenant_id as tenantId,
 		ol.content as content,
 		ol.create_date as createDate,
-		pu.username as platUserName,
+		pu.username as saasUserName,
 		t.name as tenantName
 		from saas_operation_log ol
 		left join saas_user pu on ol.saas_user_id = pu.id and pu.del_flag = 0