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

c2139b0b · 朱淼 · 098afb54 · c9e35017 · c2139b0b · c2139b0b
Commit c2139b0b authored Sep 13, 2023 by 朱淼
Showing with 215 additions and 80 deletions
saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseEvaluateReportController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseModelController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasElderReportConfigController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasModelManageController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasReportManageController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepAnalysisModelController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateReportController.java
saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateStandardReportController.java
server-api/server-api.iml
server-common/src/main/java/com/makeit/common/vo/ExcelErrorVo.java
server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
server-common/src/main/java/com/makeit/module/iot/vo/DeviceInfo.java
server-module/src/main/java/com/makeit/module/controller/space/PlatBedController.java
server-service/src/main/java/com/makeit/dto/platform/auth/PlatUserImportDTO.java
server-service/src/main/java/com/makeit/entity/platform/auth/PlatOrg.java
server-service/src/main/java/com/makeit/enums/platform/device/PlatDeviceEnum.java
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseEvaluateReportController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseEvaluateReportController.java
@@ -10,6 +10,7 @@ import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.saas.SaasDiseaseEvaluateReportService;
 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;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/diseaseEvaluateReport")
+@Api(tags = "saas端-报告管理")
 public class SaasDiseaseEvaluateReportController {

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseModelController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasDiseaseModelController.java
@@ -8,6 +8,7 @@ import com.makeit.dto.saas.analysis.SaasDiseaseModelDTO;
 import com.makeit.entity.saas.analysis.SaasDiseaseModel;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.saas.SaasDiseaseModelService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/diseaseModel")
+@Api(tags = "saas端-模型管理")
 public class SaasDiseaseModelController {

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasElderReportConfigController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasElderReportConfigController.java
@@ -8,6 +8,7 @@ import com.makeit.dto.saas.analysis.SaasElderReportConfigDTO;
 import com.makeit.entity.saas.analysis.SaasElderReportConfig;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.saas.SaasElderReportConfigService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/elderReportConfig")
+@Api(tags = "saas端-报告管理")
 public class SaasElderReportConfigController {
    @Autowired
    private SaasElderReportConfigService saasElderReportConfigService;

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasModelManageController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasModelManageController.java
@@ -9,6 +9,7 @@ import com.makeit.entity.saas.analysis.SaasModelManage;
 import com.makeit.global.annotation.Action;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import com.makeit.service.saas.SaasModelManageService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,13 +29,14 @@ import java.util.List;
 */
 @RestController
 @RequestMapping("/saas/modelManage")
+@Api(tags = "saas端-报告管理")
 public class SaasModelManageController {
    @Autowired
    private SaasModelManageService saasModelManageService;
-    @Action(module = "租户管理-租户", name = "分页列表", code = "saas:modelManage:page")
+    @Action(module = "数据分析-模型管理", name = "分页列表", code = "saas:modelManage:page")
    @ApiOperation("分页列表")
    @PostMapping("list")
    public ApiResponseEntity<List<SaasModelManage>> list(){

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasReportManageController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasReportManageController.java
@@ -8,6 +8,7 @@ import com.makeit.entity.saas.analysis.SaasReportManage;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.saas.SaasModelManageService;
 import com.makeit.service.saas.SaasReportManageService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,13 +27,14 @@ import java.util.List;
 */
 @RestController
 @RequestMapping("/saas/reportManage")
+@Api(tags = "saas端-报告管理")
 public class SaasReportManageController {
    @Autowired
    private SaasReportManageService saasReportManageService;
-    @Action(module = "租户管理-租户", name = "分页列表", code = "saas:reportManage:page")
+    @Action(module = "数据分析-报告管理", name = "分页列表", code = "saas:reportManage:page")
    @ApiOperation("分页列表")
    @PostMapping("list")
    public ApiResponseEntity<List<SaasReportManage>> list(){

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepAnalysisModelController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepAnalysisModelController.java
@@ -9,6 +9,7 @@ import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
 import com.makeit.global.annotation.Action;
 import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
 import com.makeit.service.saas.SaasSleepAnalysisModelService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/sleepAnalysisModel")
+@Api(tags = "saas端-模型管理")
 public class SaasSleepAnalysisModelController {
    @Autowired

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateReportController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateReportController.java
@@ -8,6 +8,7 @@ import com.makeit.dto.saas.analysis.SaasSleepEvaluateReportDTO;
 import com.makeit.entity.saas.analysis.SaasSleepEvaluateReport;
 import com.makeit.global.annotation.Action;
 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;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/sleepEvaluateReport")
+@Api(tags = "saas端-报告管理")
 public class SaasSleepEvaluateReportController {

--- a/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateStandardReportController.java
+++ b/saas-module/src/main/java/com/makeit/controller/analysis/SaasSleepEvaluateStandardReportController.java
@@ -8,6 +8,7 @@ import com.makeit.dto.saas.analysis.SaasSleepEvaluateStandardReportDTO;
 import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
 import com.makeit.global.annotation.Action;
 import com.makeit.service.saas.SaasSleepEvaluateStandardReportService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @RestController
 @RequestMapping("/saas/sleepEvaluateStandardReport")
+@Api(tags = "saas端-报告管理")
 public class SaasSleepEvaluateStandardReportController {

--- a/server-api/server-api.iml
+++ b/server-api/server-api.iml
@@ -157,7 +157,6 @@
    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.5.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.12" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.5.5" level="project" />
    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.9" level="project" />
@@ -184,6 +183,7 @@
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.5" level="project" />
@@ -205,7 +205,6 @@
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />

--- a/server-common/src/main/java/com/makeit/common/vo/ExcelErrorVo.java
+++ b/server-common/src/main/java/com/makeit/common/vo/ExcelErrorVo.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Objects;
+import java.util.Map;
 @Data
 @ApiModel("excel导入错误信息VO")
@@ -52,9 +52,17 @@ public class ExcelErrorVo implements Serializable {
        }
    }
-    public static void notExists(Object object,List<ExcelErrorVo> errorVoList,int i,String title){
+    public static void notExists(String value,List<ExcelErrorVo> errorVoList,int i,String title){
-        if(Objects.isNull(object)){
+        if(StringUtils.isBlank(value)){
            errorVoList.add(new ExcelErrorVo(i,title,"数据库数据不存在"));
        }
    }
+    public static void exists(Map<String, String> emailMap,String value, List<ExcelErrorVo> errorVoList, int i, String title){
+        if(StringUtils.isNotBlank(value)){
+            errorVoList.add(new ExcelErrorVo(i,title,"数据重复"));
+        }else {
+            emailMap.put(value,"system");
+        }
+    }
 }
--- a/server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
+++ b/server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java
@@ -128,6 +128,48 @@ public class IotProductDeviceService extends IotCommonService {
        return getDeviceLog(deviceId, 10,typeValue);
    }
+    public List<DeviceOperationLogEntity> getDeviceLogByTimeRange(String deviceId, int pageSize,String startTime,String endTime) {
+        IotQueryParam iotQueryParam = buildQueryParam(pageSize);
+        List<Term> terms = Lists.newArrayList();
+        Term term1 = Term.builder()
+                .column("timestamp")
+                .termType("gte")
+                .type(Term.Type.or)
+                .value(startTime)
+                .terms(Lists.newArrayList())
+                .options(Lists.newArrayList())
+                .build();
+        Term term2 = Term.builder()
+                .column("timestamp")
+                .termType("lte")
+                .type(Term.Type.and)
+                .value(endTime)
+                .terms(Lists.newArrayList())
+                .options(Lists.newArrayList())
+                .build();
+        terms.add(term1);
+        terms.add(term2);
+        iotQueryParam.setTerms(terms);
+        String body = JsonUtil.toJson(iotQueryParam);
+        String url = iotUrl + DEVICE_PREFIX_URL + deviceId + "/logs";
+        HttpRequest request = buildRequest(url, body);
+        try {
+            ResponseMessage responseMessage = sendPost(url, request);
+            if (responseMessage.getStatus() == 200) {
+                IotPagerResult pagerResult = JSON.parseObject(responseMessage.getResult().toString(), IotPagerResult.class);
+                List<DeviceOperationLogEntity> deviceOperationLogEntities = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceOperationLogEntity.class);
+                //Map maps = (Map) JSON.parse(datum.getContent().toString());
+                return deviceOperationLogEntities;
+            }
+            log.error("获取设备接口失败:{}", responseMessage.getMessage());
+        } catch (IOException e) {
+            log.error("调用：{}接口异常：{}", url, e.getMessage());
+        }
+        return Lists.newArrayList();
+    }
    /**
     * 获取设备的日志
     *
@@ -141,7 +183,7 @@ public class IotProductDeviceService extends IotCommonService {
            List<Term> terms = Lists.newArrayList();
            Term term = Term.builder()
                    .column("type")
-                    .termType("eq")
+                    .termType("btw")
                    .type(Term.Type.or)
                    .value(typeValue)
                    .terms(Lists.newArrayList())

--- a/server-common/src/main/java/com/makeit/module/iot/vo/DeviceInfo.java
+++ b/server-common/src/main/java/com/makeit/module/iot/vo/DeviceInfo.java
 package com.makeit.module.iot.vo;
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 /**
@@ -17,7 +18,7 @@ public class DeviceInfo {
    private HeaderInfo headers;
-    private String properties;
+    private JSONObject properties;
    /**

--- a/server-module/src/main/java/com/makeit/module/controller/space/PlatBedController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/space/PlatBedController.java
@@ -40,7 +40,7 @@ public class PlatBedController {
        return ApiResponseUtils.success(data);
    }
-    @ApiOperation("列表-无权限")
+    @ApiOperation("列表-无权限(未绑定设备床位)")
    @PostMapping("listAuthIgnore")
    public ApiResponseEntity<List<PlatBed>> listAuthIgnore(@RequestBody PlatBedQueryDTO dto) {
        List<PlatBed> data = platBedService.list(dto);

--- a/server-module/src/main/java/com/makeit/module/controller/wechat/alarm/ChildrenAlarmRecordController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/wechat/alarm/ChildrenAlarmRecordController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "子女端小程序-告警记录")
 @RestController
 @RequestMapping("/children/alarm-record")
-public class ChildrenAlarmRecordController {
+public class PlatAlarmRecordChildrenController {
    @Autowired
    private PlatAlarmRecordService platAlarmRecordService;

--- a/server-module/src/main/java/com/makeit/module/controller/wechat/alarm/WechatPlatAlarmRecordController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/wechat/alarm/WechatPlatAlarmRecordController.java
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "小程序-告警记录")
 @RestController
 @RequestMapping("/wechat/plat/alarm-record")
-public class WechatPlatAlarmRecordController {
+public class PlatAlarmRecordWechatController {
    @Autowired
    private PlatAlarmRecordService platAlarmRecordService;

--- a/server-service/src/main/java/com/makeit/dto/platform/auth/PlatUserImportDTO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/auth/PlatUserImportDTO.java
@@ -23,15 +23,15 @@ public class PlatUserImportDTO {
    private String mobile;
    @ExcelProperty(value = "邮箱")
    private String email;
-    @ExcelProperty(value = "所属组织*")
+    @ExcelProperty(value = "*所属组织")
    private String orgName;
-    @ExcelProperty(value = "角色*")
+    @ExcelProperty(value = "*角色")
    private String roleName;
    @ExcelProperty(value = "备注")
    private String remark;
    @ExcelIgnore
-    private String password = "888888";
+    private String password = "abc888888";
 }
--- a/server-service/src/main/java/com/makeit/entity/platform/auth/PlatOrg.java
+++ b/server-service/src/main/java/com/makeit/entity/platform/auth/PlatOrg.java
@@ -63,4 +63,6 @@ public class PlatOrg extends BaseBusEntity {
    @TableField(exist = false)
    private PlatOrg parent;
+    private String remark;
 }
\ No newline at end of file
--- a/server-service/src/main/java/com/makeit/enums/platform/device/PlatDeviceEnum.java
+++ b/server-service/src/main/java/com/makeit/enums/platform/device/PlatDeviceEnum.java
@@ -19,7 +19,7 @@ public class PlatDeviceEnum {
    }
    public enum CategoryEnum implements BaseEnum {
-        HEART("device.category.heart"), FALL("device.status.fall"), SPACE("device.status.space");
+        HEART("device.category.heart"), FALL("device.category.fall"), SPACE("device.category.space");
        private String code;

--- a/server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
@@ -55,4 +55,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
    PlatAlarmRecord createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
+    PlatAlarmCheckDTO getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java
@@ -13,6 +13,7 @@ import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import java.util.Arrays;
@@ -31,8 +32,12 @@ public class BehaviorAlarm implements IAlarm{
        return StringUtils.equals(alarmType,alarmTypeEnum.getValue());
    }
+    /**
+     * 3.行为异常：若长者当在某个空间停留的时间高于长者最近7天在每个空间区域停留时间的平均值+区间（区间在行为异常告警处配置）
+     * @param platAlarmCheckDTO
+     */
    @Override
-    public void createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        String ruleConfigStr = config.getRuleConfig();
        JSONObject properties = platAlarmCheckDTO.getProperties();
@@ -58,9 +63,7 @@ public class BehaviorAlarm implements IAlarm{
                return;
            }
            if (count >= duration) {
-                platAlarmCheckDTO.getParam().add("房间名");
+                notice(platAlarmCheckDTO);
-                PlatAlarmRecord platAlarmRecord =platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
-                platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
                RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,startLong);
            }
        }else {
@@ -68,4 +71,13 @@ public class BehaviorAlarm implements IAlarm{
            RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,null);
        }
    }
+    @Override
+    @Async
+    public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        platAlarmCheckDTO.getParam().add("房间名");
+        PlatAlarmRecord platAlarmRecord =platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
+        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+    }
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
@@ -13,6 +13,7 @@ import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import java.util.Date;
@@ -29,8 +30,16 @@ public class BreathAlarm implements IAlarm{
        return StringUtils.equals(alarmType,alarmTypeEnum.getValue());
    }
+    /**
+     * 2.呼吸异常/心率异常：长者关联的呼吸心率雷达上报的呼吸和心率不在配置的阈值范围内，且满足持续时间进行告警，
+     * 若该长者在长者管理处有配置阈值，则以长者个人的阈值为准，若无，则以此处配置的通用规则为准
+     *
+     * 心率呼吸率低于阈值且满足持续时间，则对应状态为呼吸过缓/心率过缓，高于阈值且满足持续时间，
+     * 对应状态为呼吸过速/心率过速，呼吸心率为0且满足持续时间为呼吸暂停
+     * @param platAlarmCheckDTO
+     */
    @Override
-    public void createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        String ruleConfigStr = config.getRuleConfig();
        JSONObject properties = platAlarmCheckDTO.getProperties();
@@ -57,9 +66,7 @@ public class BreathAlarm implements IAlarm{
        long count = endLong - startLong;
        if (br > end || br < start) {
            if (count >= duration) {
-                platAlarmCheckDTO.getParam().add("呼吸状态111");
+                notice(platAlarmCheckDTO);
-                PlatAlarmRecord platAlarmRecord = platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
-                platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
                RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,endLong/1000);
            }
        } else {
@@ -67,4 +74,13 @@ public class BreathAlarm implements IAlarm{
        }
        return;
    }
+    @Override
+    @Async
+    public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        platAlarmCheckDTO.getParam().add("呼吸状态111");
+        PlatAlarmRecord platAlarmRecord = platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
+        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+    }
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/FallAlarm.java
@@ -7,6 +7,7 @@ import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 @Component
@@ -21,14 +22,25 @@ public class FallAlarm implements IAlarm{
        return StringUtils.equals(alarmType,alarmTypeEnum.getValue());
    }
+    /**
+     * 1.长者跌倒：长者所在空间的跌倒监测雷达上报跌倒，若一个空间内有多为长者，则同时告警多条
+     * @param platAlarmCheckDTO
+     */
    @Override
-    public void createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
        JSONObject properties = platAlarmCheckDTO.getProperties();
        String personState = (String) properties.get("personState");
        if (StringUtils.equals(personState, "1")) {
+           notice(platAlarmCheckDTO);
+        }
+    }
+    @Override
+    @Async
+    public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
        platAlarmCheckDTO.getParam().add("房间名111");
        PlatAlarmRecord platAlarmRecord = platAlarmRecordService.createPlatAlarmRecord(platAlarmCheckDTO);
        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
    }
-    }
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
@@ -13,6 +13,7 @@ import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import java.util.Date;
@@ -30,7 +31,7 @@ public class HeartAlarm implements IAlarm {
    }
    @Override
-    public void createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        String ruleConfigStr = config.getRuleConfig();
        JSONObject properties = platAlarmCheckDTO.getProperties();
@@ -56,13 +57,20 @@ public class HeartAlarm implements IAlarm {
        long count = endLong - startLong;
        if (hr > end || hr < start) {
            if (count >= duration) {
-                platAlarmCheckDTO.getParam().add("呼吸状态111");
+                notice(platAlarmCheckDTO);
-                PlatAlarmRecord platAlarmRecord =platAlarmRecordService. createPlatAlarmRecord(platAlarmCheckDTO);
-                platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
                RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,endLong/1000);
            }
        } else {
            RedisUtil.set(RedisConst.ALARM_DEVICE_ID + deviceId,endLong/1000);
        }
    }
+    @Override
+    @Async
+    public void notice(PlatAlarmCheckDTO platAlarmCheckDTO) {
+        platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
+        platAlarmCheckDTO.getParam().add("呼吸状态111");
+        PlatAlarmRecord platAlarmRecord =platAlarmRecordService. createPlatAlarmRecord(platAlarmCheckDTO);
+        platAlarmRecordService.noticeDeviceAlarm(platAlarmCheckDTO.getPlatAlarmConfig(),platAlarmRecord);
+    }
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/IAlarm.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/IAlarm.java
@@ -6,5 +6,7 @@ public interface IAlarm {
    boolean support(String alarmType);
-    void createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
+    void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO);
+    void notice(PlatAlarmCheckDTO platAlarmCheckDTO);
 }
--- a/server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
@@ -297,7 +297,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
    @Override
    public PlatAlarmRecord createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO) {
-        getElderListByDeviceId(platAlarmCheckDTO);
        PlatAlarmConfig config = platAlarmCheckDTO.getPlatAlarmConfig();
        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
        List<String> param = platAlarmCheckDTO.getParam();
@@ -321,8 +321,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
    }
+    @Override
-    private PlatAlarmCheckDTO getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public PlatAlarmCheckDTO getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO) {
        PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
        LambdaQueryWrapper<PlatRoomBedDevice> roomBedDeviceLambdaQueryWrapper = new LambdaQueryWrapper<>();
        roomBedDeviceLambdaQueryWrapper.eq(PlatRoomBedDevice::getDeviceId, platDevice.getId());

--- a/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
@@ -276,9 +276,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
        check(dto);
        dto.setTenantId(TenantIdUtil.getTenantId());
        if (StringUtils.isBlank(dto.getParentId())) {
-            String tenantId = TenantIdUtil.getTenantId();
-            dto.setParentId(tenantId);
-            dto.setPath(tenantId);
        } else {
            PlatOrg parent = getById(dto.getParentId());
            dto.setPath(parent.getPath() + "," + parent.getId());
@@ -302,9 +299,6 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
    public void edit(PlatOrg dto) {
        check(dto);
        if (StringUtils.isBlank(dto.getParentId())||StringUtils.equals(dto.getParentId(),"1")) {
-            String tenantId = TenantIdUtil.getTenantId();
-            dto.setParentId(tenantId);
-            dto.setPath(tenantId);
        } else {
            PlatOrg parent = getById(dto.getParentId());
            dto.setPath(parent.getPath() + "," + parent.getId());
@@ -521,6 +515,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
        queryWrapper.eq(StringUtils.isNotBlank(dto.getParentId()), PlatOrg::getParentId, dto.getParentId())
                .like(StringUtils.isNotBlank(dto.getName()),PlatOrg::getName,dto.getName())
                .eq(StringUtils.isNotBlank(dto.getType()),PlatOrg::getType,dto.getType())
+                .eq(StringUtils.isNotBlank(dto.getStatus()),PlatOrg::getStatus,dto.getStatus())
                .orderByDesc(BaseEntity::getUpdateDate);
        return queryWrapper;
    }

--- a/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
@@ -1045,33 +1045,37 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
        Map<String, String> mobileMap = userList.stream().collect(Collectors.toMap(PlatUser::getMobile, BaseEntity::getId, (a, b) -> a));
        Map<String, String> emailMap = userList.stream().collect(Collectors.toMap(PlatUser::getEmail, BaseEntity::getId, (a, b) -> a));
-        return ExcelValidatorUtil.validate( platUserImportDTOS, list -> {
+        return ExcelValidatorUtil.validateMain(3, platUserImportDTOS, list -> {
            List<ExcelErrorVo> errorVoList = new ArrayList<>();
            int start = 3;
-            for (int i = 0; i < list.size(); i++) {
+            for (int i = 0; i < platUserImportDTOS.size(); i++) {
-                PlatUserImportDTO dto = list.get(i);
+                PlatUserImportDTO dto = platUserImportDTOS.get(i);
                ExcelErrorVo.isNotNull(dto.getUsername(),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.getRoleName(),errorVoList,start+i,"所属组织*");
+                ExcelErrorVo.isNotNull(dto.getOrgName(),errorVoList,start+i,"*所属组织");
-                ExcelErrorVo.notExists(orgNameMap.get(dto.getOrgName()),errorVoList,start+i,"所属组织*");
+                ExcelErrorVo.notExists(orgNameMap.get(dto.getOrgName()),errorVoList,start+i,"*所属组织");
-                ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"角色*");
+                ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()),errorVoList,start+i,"*角色");
-                ExcelErrorVo.notExists(mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*");
+                ExcelErrorVo.exists(mobileMap,mobileMap.get(dto.getMobile()),errorVoList,start+i,"手机号*");
-                ExcelErrorVo.notExists(emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱");
+                ExcelErrorVo.exists(emailMap,emailMap.get(dto.getEmail()),errorVoList,start+i,"邮箱");
            }
            if(errorVoList.isEmpty()){
                List<PlatUser> platUsers = new ArrayList<>();
-                list.forEach(vo->{
+                platUserImportDTOS.forEach(vo->{
                    PlatUser platUser = BeanDtoVoUtils.convert(vo, PlatUser.class);
-                    setPassword(platUser);
+                    vo.setPassword(PasswordUtils.encryptPassword(vo.getPassword()));
+                    platUser.setStatus(CommonEnum.YES.getValue());
+                    platUser.setTenantId(TenantIdUtil.getTenantId());
+                    platUser.setAccount(platUser.getMobile());
+                    platUser.setIsTenant(CommonEnum.NO.getValue());
                    platUsers.add(platUser);
                });
                saveBatch(platUsers);
            }
            return errorVoList;
-        },null);
+        });
    }

--- a/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java
@@ -127,7 +127,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
        List<PlatDeviceDTO> data = new ArrayList<>();
        if(!listEquipmentIds.isEmpty()){
            LambdaQueryWrapper<PlatDevice> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(PlatDevice::getCategory, PlatDeviceEnum.CategoryEnum.HEART);
+            //queryWrapper.eq(PlatDevice::getCategory, PlatDeviceEnum.CategoryEnum.HEART);
            queryWrapper.in(PlatDevice::getId,listEquipmentIds);
            List<PlatDevice> listDevices = platDeviceService.list(queryWrapper);
            data = BeanDtoVoUtils.listVo(listDevices,PlatDeviceDTO.class);

--- a/server-service/src/main/java/com/makeit/utils/AlarmConfigCacheUtil.java
+++ b/server-service/src/main/java/com/makeit/utils/AlarmConfigCacheUtil.java
@@ -2,7 +2,10 @@ package com.makeit.utils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
+import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.enums.CommonEnum;
+import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
+import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
@@ -13,6 +16,7 @@ import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
+import java.util.ArrayList;
 import java.util.List;
 @Component
@@ -64,4 +68,21 @@ public class AlarmConfigCacheUtil implements ApplicationRunner {
        getAll();
    }
+    public List<PlatAlarmConfig> getDeviceAlarmConfigMap(PlatDevice platDevice) {
+        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.HEART.getValue())) {
+            List<PlatAlarmConfig> set = new ArrayList<>();
+            set.add(this.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.BREATHE.getValue()));
+            set.add(this.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.HEART.getValue()));
+        }
+        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.FALL.getValue())) {
+            List<PlatAlarmConfig> set = new ArrayList<>();
+            set.add(this.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()));
+        }
+        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.SPACE.getValue())) {
+            List<PlatAlarmConfig> set = new ArrayList<>();
+            set.add(this.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.BEHAVIOR.getValue()));
+        }
+        return new ArrayList<>();
+    }
 }
--- a/server-web/src/main/java/com/makeit/mqtt/PushCallback.java
+++ b/server-web/src/main/java/com/makeit/mqtt/PushCallback.java
@@ -5,14 +5,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.device.PlatDevice;
-import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
-import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.module.iot.vo.DeviceInfo;
 import com.makeit.service.platform.alarm.alarmStrategy.IAlarm;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -22,7 +20,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
 import java.util.List;
@@ -71,51 +68,43 @@ public class PushCallback implements MqttCallback {
        logger.info("deliveryComplete--------------" + token.isComplete());
    }
+    @TenantIdIgnore
    public void checkAlarm(DeviceInfo device) {
        String deviceId = device.getDeviceId();
-        String propertiesStr = device.getProperties();
+        //String propertiesStr = device.getProperties();
-        if (StringUtils.isBlank(propertiesStr)) {
+//        if (StringUtils.isBlank(propertiesStr)) {
-            return;
+//            return;
-        }
+//        }
-        JSONObject properties = JSON.parseObject(propertiesStr);
+//        JSONObject properties = JSON.parseObject(propertiesStr);
+        JSONObject properties = device.getProperties();
        //iot设备id
        PlatDevice platDevice = deviceCacheUtil.get(deviceId);
-        List<PlatAlarmConfig> deviceAlarmConfigList = getDeviceAlarmConfigMap(platDevice);
+        List<PlatAlarmConfig> deviceAlarmConfigList = alarmConfigCacheUtil.getDeviceAlarmConfigMap(platDevice);
        if (CollectionUtils.isEmpty(deviceAlarmConfigList)) {
            return;
        }
        for (PlatAlarmConfig config : deviceAlarmConfigList) {
            String alarmType = config.getAlarmType();
            PlatAlarmCheckDTO platAlarmCheckDTO = new PlatAlarmCheckDTO();
+            //告警配置
            platAlarmCheckDTO.setPlatAlarmConfig(config);
+            //设备信息
            platAlarmCheckDTO.setPlatDevice(platDevice);
+            //iot上报数据
            platAlarmCheckDTO.setProperties(properties);
            for (IAlarm alarm : alarmList) {
                if (alarm.support(alarmType)) {
-                    alarm.createPlatAlarmRecord(platAlarmCheckDTO);
+                    alarm.checkConfig(platAlarmCheckDTO);
                }
            }
        }
    }
-    public List<PlatAlarmConfig> getDeviceAlarmConfigMap(PlatDevice platDevice) {
-        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.HEART.getValue())) {
-            List<PlatAlarmConfig> set = new ArrayList<>();
-            set.add(alarmConfigCacheUtil.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.BREATHE.getValue()));
-            set.add(alarmConfigCacheUtil.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.HEART.getValue()));
-        }
-        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.FALL.getValue())) {
-            List<PlatAlarmConfig> set = new ArrayList<>();
-            set.add(alarmConfigCacheUtil.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue()));
-        }
-        if (StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.SPACE.getValue())) {
-            List<PlatAlarmConfig> set = new ArrayList<>();
-            set.add(alarmConfigCacheUtil.get(platDevice.getOrgId() + PlatAlarmConfigEnum.AlarmTypeEnum.BEHAVIOR.getValue()));
-        }
-        return new ArrayList<>();
-    }
 }
--- a/server-web/src/test/java/com/makeit/iotapi/IotTest.java
+++ b/server-web/src/test/java/com/makeit/iotapi/IotTest.java
@@ -63,6 +63,11 @@ public class IotTest {
    }
    @Test
+    void getDeviceLogByTimeRange() {
+        iotProductDeviceService.getDeviceLogByTimeRange("1701127702523473920",100,"2023-09-12 00:00:00","2023-09-12 23:59:00");
+    }
+    @Test
    void getIotOrgInfo() {
        iotOrgService.getIotOrgInfo("1698964909267415040");
    }