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

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

@@ -27,6 +27,7 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * iot产品设备相关接口
  * iot产品设备相关接口
@@ -260,8 +261,9 @@ 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"))
+                        .collect(Collectors.toList());
                 //Map maps = (Map) JSON.parse(datum.getContent().toString());
                 //Map maps = (Map) JSON.parse(datum.getContent().toString());
-                return deviceOperationLogEntities;
             }
             }
             log.error("获取设备接口失败:{}", responseMessage.getMessage());
             log.error("获取设备接口失败:{}", responseMessage.getMessage());
         } catch (IOException e) {
         } catch (IOException e) {

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

@@ -20,7 +20,7 @@ public class SaasElderReportConfigDTO  {
 
 
     private String id;
     private String id;
 
 
-    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condtion：\"\",\"score\":\"\",evaluate:\"\"\"}")
+    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"\",evaluate:\"\"\"}")
     private String resultContent;
     private String resultContent;
 
 
 
 

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

@@ -20,7 +20,7 @@ public class SaasSleepEvaluateReportDTO  {
 
 
     private String id;
     private String id;
 
 
-    @ApiModelProperty(value = "评估结果  json字符串 {\"number:\"1\",socreRange：\"\",\"result\":\"\",evaluate:\"\"\"}")
+    @ApiModelProperty(value = "评估结果  json字符串 {\"number:\"1\",scoreRange：\"~隔开\",\"result\":\"\",evaluate:\"\"\"}")
     private String resultContent;
     private String resultContent;
 
 
 
 

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

@@ -26,13 +26,13 @@ public class SaasSleepEvaluateStandardReportDTO {
     @ApiModelProperty(value = "深度睡眠评估标准 json数组  [{hour:\"\",score:\"\"},{}]\"")
     @ApiModelProperty(value = "深度睡眠评估标准 json数组  [{hour:\"\",score:\"\"},{}]\"")
     private String sleepDeepConfig;
     private String sleepDeepConfig;
 
 
-    @ApiModelProperty(value = "浅度睡眠评估标准  json字符串")
+    @ApiModelProperty(value = "浅度睡眠评估标准  json数组")
     private String sleepLightnessConfig;
     private String sleepLightnessConfig;
 
 
-    @ApiModelProperty(value = "清醒评估标准  json字符串")
+    @ApiModelProperty(value = "清醒评估标准  json数组")
     private String soberConfig;
     private String soberConfig;
 
 
-    @ApiModelProperty(value = "睡眠时长  json字符串")
+    @ApiModelProperty(value = "睡眠时长  json数组")
     private String sleepTime;
     private String sleepTime;
 
 
 
 

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

@@ -30,7 +30,7 @@ public class PlatElderSleepAnalysis extends BaseBusEntity {
     @ApiModelProperty(value = "睡眠结果")
     @ApiModelProperty(value = "睡眠结果")
     private String sleepResult;
     private String sleepResult;
 
 
-    @ApiModelProperty(value = "睡眠时长")
+    @ApiModelProperty(value = "睡眠时长 分钟")
     private String sleepTime;
     private String sleepTime;
 
 
     @ApiModelProperty(value = "休息时长")
     @ApiModelProperty(value = "休息时长")

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseEvaluateReport.java

@@ -21,7 +21,7 @@ public class SaasDiseaseEvaluateReport extends BaseBusEntity {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condtion：\"\",\"score\":\"\",evaluate:\"\"\"}")
+    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}")
     private String resultContent;
     private String resultContent;
 
 
 
 

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasElderReportConfig.java

@@ -21,7 +21,7 @@ public class SaasElderReportConfig extends BaseBusEntity {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condtion：\"\",\"score\":\"\",evaluate:\"\"\"}")
+    @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",scoreRange：\"~隔开\",evaluate:\"\"\"}")
     private String resultContent;
     private String resultContent;
 
 
 
 

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepAnalysisModel.java

@@ -68,7 +68,7 @@ public class SaasSleepAnalysisModel extends BaseBusEntity {
     @ApiModelProperty(value = "起床时间  每分钟大于30秒体动值")
     @ApiModelProperty(value = "起床时间  每分钟大于30秒体动值")
     private String riseActionThreshold;
     private String riseActionThreshold;
 
 
-    @ApiModelProperty(value = "起床时间  每分钟大于30秒体动值  持续时间")
+    @ApiModelProperty(value = "起床时间  每分钟大于30秒体动值  持续时间  min")
     private String riseActionDuration;
     private String riseActionDuration;
 
 
     @ApiModelProperty(value = "起床时间  多久（小时）内无再次入睡")
     @ApiModelProperty(value = "起床时间  多久（小时）内无再次入睡")
@@ -80,13 +80,13 @@ public class SaasSleepAnalysisModel extends BaseBusEntity {
     @ApiModelProperty(value = "入睡时间：体动值")
     @ApiModelProperty(value = "入睡时间：体动值")
     private String sleepTimeActionThreshold;
     private String sleepTimeActionThreshold;
 
 
-    @ApiModelProperty(value = "入睡时间：体动值  持续时间")
+    @ApiModelProperty(value = "入睡时间：体动值  持续时间 h")
     private String sleepTimeActionDuration;
     private String sleepTimeActionDuration;
 
 
-    @ApiModelProperty(value = "每分钟体动值条件")
+    @ApiModelProperty(value = "清醒每分钟体动值条件")
     private String awakeComparison;
     private String awakeComparison;
 
 
-    @ApiModelProperty(value = "每分钟体动值")
+    @ApiModelProperty(value = "清醒每分钟体动值")
     private String awakeThreshold;
     private String awakeThreshold;
 
 
     @ApiModelProperty(value = "深度睡眠和浅度睡眠条件")
     @ApiModelProperty(value = "深度睡眠和浅度睡眠条件")

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasSleepEvaluateReport.java

@@ -21,7 +21,7 @@ public class SaasSleepEvaluateReport extends BaseBusEntity {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "评估结果  json字符串 {\"number:\"1\",socreRange：\"\",\"result\":\"\",evaluate:\"\"\"}")
+    @ApiModelProperty(value = "评估结果  json字符串 {\"number:\"1\",scoreRange：\"\",\"result\":\"\",evaluate:\"\"\"}")
     private String resultContent;
     private String resultContent;