告警

server-common/src/main/java/com/makeit/enums/redis/RedisConst.java

@@ -92,6 +92,10 @@ public class RedisConst {
 
 
     public static final String TENANT_PREFIX = "tenant:";
     public static final String TENANT_PREFIX = "tenant:";
 
 
+    public static final String ALARM_DEVICE_ID = "alarm:device:id:";
+
+    public static final String ALARM_CONFIG_ORG_ID = "alram:config:org:id";
+
 
 
 
 
 
 

server-common/src/main/java/com/makeit/utils/msg/dto/MsgSendDTO.java

@@ -36,23 +36,5 @@ public class MsgSendDTO {
         this.param = param;
         this.param = param;
     }
     }
 
 
-    private void replaceParam(){
-        if(StringUtils.isNotBlank(sendContent)){
-            return;
-        }
-        Pattern p = Pattern.compile("\\[#\\d+\\]|\\[#[\\p{IsHan}]+\\]|\\[#[^\\]]*\\]");
-        Matcher m = p.matcher(oriContent);
-        StringBuffer sb = new StringBuffer();
-        if(!m.find()){
-            sendContent= oriContent;
-        }
-        m.reset();
-        int i = 0;
-        while (m.find()) {
-            m.appendReplacement(sb, param[i]);
-            i++;
-        }
-        m.appendTail(sb);
-        sendContent=sb.toString();
-    }
+
 }
 }

server-common/src/main/java/com/makeit/utils/redis/RedisUtil.java

@@ -367,4 +367,6 @@ public class RedisUtil {
     public void setProjectName(String projectName) {
     public void setProjectName(String projectName) {
         RedisUtil.projectName = projectName;
         RedisUtil.projectName = projectName;
     }
     }
+
+
 }
 }

server-common/src/main/java/com/makeit/utils/user/plat/PlatUserUtil.java

@@ -71,7 +71,7 @@ public class PlatUserUtil {
     public static PlatUserVO getSystemUser() {
     public static PlatUserVO getSystemUser() {
         PlatUserVO platUserVO = new PlatUserVO();
         PlatUserVO platUserVO = new PlatUserVO();
         platUserVO.setId("1");
         platUserVO.setId("1");
-        platUserVO.setName("system");
+        platUserVO.setUsername("system");
         //tntUserVO.setTenantId();
         //tntUserVO.setTenantId();
         platUserVO.setIsTenant(CommonEnum.NO.getValue());
         platUserVO.setIsTenant(CommonEnum.NO.getValue());
 
 

server-common/src/main/java/com/makeit/utils/user/plat/PlatUserVO.java

@@ -11,8 +11,8 @@ import java.util.function.BiConsumer;
 @Data
 @Data
 public class PlatUserVO implements Serializable {
 public class PlatUserVO implements Serializable {
     private String id;
     private String id;
-    private String name;
-//    private String username;
+
+    private String username;
 
 
     private String tenantId;
     private String tenantId;
 
 
@@ -40,12 +40,12 @@ public class PlatUserVO implements Serializable {
     public PlatUserVO(String id, String name, String tenantId) {
     public PlatUserVO(String id, String name, String tenantId) {
         this.id = id;
         this.id = id;
         this.tenantId = tenantId;
         this.tenantId = tenantId;
-        this.name = name;
+        this.username = name;
     }
     }
 
 
     public PlatUserVO(String id, String name) {
     public PlatUserVO(String id, String name) {
         this.id = id;
         this.id = id;
-        this.name = name;
+        this.username = name;
     }
     }
 
 
 
 

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlaramCheckDTO.java

+package com.makeit.dto.platform.alarm;
+
+import com.makeit.entity.platform.elder.PlatElder;
+import com.makeit.entity.platform.space.PlatRoom;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class PlatAlaramCheckDTO {
+
+    private List<PlatElder> platElderList = new ArrayList<>();
+
+    private PlatRoom platRoom;
+}

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

@@ -155,6 +155,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
 
 
     /**
     /**
      * 设备告警调用 发送消息
      * 设备告警调用 发送消息
+     *
+     * todo 异步
      */
      */
     @Transactional
     @Transactional
     @Override
     @Override

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

@@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.page.PageVO;
-import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
 import com.makeit.entity.platform.auth.PlatRoleOrg;
 import com.makeit.entity.platform.auth.PlatUserRole;
 import com.makeit.entity.platform.auth.PlatUserRole;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.id.TreeConst;
 import com.makeit.enums.id.TreeConst;
+import com.makeit.exception.BusinessException;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.auth.PlatOrgMapper;
 import com.makeit.mapper.platform.auth.PlatOrgMapper;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
@@ -273,7 +273,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
     @Transactional
     @Transactional
     @Override
     @Override
     public String add(PlatOrg dto) {
     public String add(PlatOrg dto) {
-
+        check(dto);
         dto.setTenantId(TenantIdUtil.getTenantId());
         dto.setTenantId(TenantIdUtil.getTenantId());
         if (StringUtils.isBlank(dto.getParentId())) {
         if (StringUtils.isBlank(dto.getParentId())) {
             String tenantId = TenantIdUtil.getTenantId();
             String tenantId = TenantIdUtil.getTenantId();
@@ -287,10 +287,20 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
         return dto.getId();
         return dto.getId();
     }
     }
 
 
+    private void check(PlatOrg dto) {
+        LambdaQueryWrapper<PlatOrg> platOrgLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        platOrgLambdaQueryWrapper.eq(PlatOrg::getParentId, dto.getParentId())
+                .eq(StringUtils.isNotBlank(dto.getId()),PlatOrg::getName, dto.getName())
+                .eq(PlatOrg::getName, dto);
+        if(count(platOrgLambdaQueryWrapper)>0){
+            throw new BusinessException("名称重复");
+        }
+    }
+
     @Transactional
     @Transactional
     @Override
     @Override
     public void edit(PlatOrg dto) {
     public void edit(PlatOrg dto) {
-
+        check(dto);
         if (StringUtils.isBlank(dto.getParentId())||StringUtils.equals(dto.getParentId(),"1")) {
         if (StringUtils.isBlank(dto.getParentId())||StringUtils.equals(dto.getParentId(),"1")) {
             String tenantId = TenantIdUtil.getTenantId();
             String tenantId = TenantIdUtil.getTenantId();
             dto.setParentId(tenantId);
             dto.setParentId(tenantId);
@@ -512,6 +522,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
 
 
     @Override
     @Override
     public List<PlatOrg> subOrgList(PlatOrgQueryDTO platOrgQueryDTO) {
     public List<PlatOrg> subOrgList(PlatOrgQueryDTO platOrgQueryDTO) {
+
         LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(platOrgQueryDTO);
         LambdaQueryWrapper<PlatOrg> queryWrapper = getLambdaQueryWrapper(platOrgQueryDTO);
 
 
         return list(queryWrapper);
         return list(queryWrapper);
@@ -523,6 +534,7 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
      * @param platOrg
      * @param platOrg
      */
      */
     @Override
     @Override
+    @Transactional
     public void saveOrg(PlatOrg platOrg) {
     public void saveOrg(PlatOrg platOrg) {
 
 
         save(platOrg);
         save(platOrg);

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -79,7 +79,7 @@ public class IotSyncTask {
     }
     }
 
 
 
 
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0 */1 * * ?")
     public void syncDeviceLog() {
     public void syncDeviceLog() {
         log.info("开始同步设备日志");
         log.info("开始同步设备日志");