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

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

@@ -19,7 +19,7 @@ public class PlatUserUtil {
 
 
     public static boolean isSuper() {
     public static boolean isSuper() {
         PlatUserVO userVO = PlatUserUtil.getUserVO();
         PlatUserVO userVO = PlatUserUtil.getUserVO();
-        return IsFactoryAccountEnum.YES.getValue().equals(userVO.getTenantId())
+        return IsFactoryAccountEnum.YES.getValue().equals(userVO.getIsTenant())
                 || IdConst.SUPER_ADMIN_ID.equals(userVO.getId());
                 || IdConst.SUPER_ADMIN_ID.equals(userVO.getId());
     }
     }
 
 

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

@@ -9,18 +9,16 @@ import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 
 
 /**
 /**
-* @author lixl
-* @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service
-* @createDate 2023-09-06 14:26:05
-*/
+ * @author lixl
+ * @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service
+ * @createDate 2023-09-06 14:26:05
+ */
 public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 
 
     PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
     PageVO<PlatAlarmRecordVO> page(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
 
 
     /**
     /**
      * 子女端告警列表
      * 子女端告警列表
-     * @param dto
-     * @return
      */
      */
     PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
     PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto);
 
 
@@ -28,11 +26,30 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 
 
     void deal(String recordId);
     void deal(String recordId);
 
 
+    /**
+     * 通知家属
+     * @param recordId
+     */
     void noticeRelation(String recordId);
     void noticeRelation(String recordId);
 
 
+    /**
+     * 通知家属
+     * 子女端小程序
+     * 短信
+     * 语音短信
+     */
     void noticeChildren(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
     void noticeChildren(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 
 
-    void noticeUser(PlatAlarmConfig alarmConfig,PlatAlarmRecord alarmRecord);
+    /**
+     * 通知工作人员
+     * 短信
+     * 语音短信
+     * 邮件
+     */
+    void noticeUser(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 
 
-    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig,PlatAlarmRecord alarmRecord);
+    /**
+     * 设备告警调用 发送消息
+     */
+    void noticeDeviceAlarm(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord);
 }
 }