增加事件类型判断

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/EventSmallTypeEnum.java

@@ -35,6 +35,8 @@ public enum EventSmallTypeEnum {
     SMART_REPORT_YW(1023, "烟雾报警"),
     SMART_REPORT_RYSLCX(1024, "人员数量超限报警"),
     EQP_REPORT_SBSB(1025, "报警设备上报"),
+    BLACK_PERSON(1026, "黑名单人员"),
+    AUTHORIZATION_EXPIRED(1027, "门禁授权已过期"),
     /* -----------------------系统报警相关-------------------------------------*/
     SYS_REPORT_WLGZ(2001, "网络连接故障"),
     SYS_REPORT_DLYC(2002, "用户登录异常"),

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java

@@ -5,6 +5,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.sis.domain.bo.SisAlarmEventsBo;
 import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
 import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
+import org.dromara.sis.domain.enums.EventSmallTypeEnum;
 import org.dromara.sis.domain.vo.SisAlarmEventsVo;
 
 import java.util.Collection;
@@ -78,7 +79,7 @@ public interface ISisAlarmEventsService {
     /**
      * 异步生成告警记录
      */
-    void createAlarmRecord(String deviceIp, Integer level, Integer type, String msg, byte[] smallImg, byte[] bigImg);
+    void createAlarmRecord(String deviceIp, Integer level, EventSmallTypeEnum type, String msg, byte[] smallImg, byte[] bigImg);
 
     /**
      * 任务分配操作

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java

@@ -182,7 +182,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
     @Async
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createAlarmRecord(String deviceIp, Integer level, Integer type, String msg, byte[] smallImg, byte[] bigImg) {
+    public void createAlarmRecord(String deviceIp, Integer level, EventSmallTypeEnum type, String msg, byte[] smallImg, byte[] bigImg) {
         // 校验设备信息
         SisDeviceManage sisDeviceManage = deviceManageService.queryByDeviceIp(deviceIp);
         if (sisDeviceManage == null) {
@@ -193,7 +193,7 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
         Date now = new Date();
         SisAlarmEvents alarmEvents = new SisAlarmEvents();
         alarmEvents.setBigType(EventBigTypeEnum.EQUIPMENT_UP.getCode());
-        alarmEvents.setSmallType(EventSmallTypeEnum.SMART_REPORT_ZJCR.getCode());
+        alarmEvents.setSmallType(type.getCode());
         alarmEvents.setLevel(Long.valueOf(level));
         alarmEvents.setDeviceIp(deviceIp);
         alarmEvents.setDeviceName(sisDeviceManage.getDeviceName());

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java

@@ -12,6 +12,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.property.api.RemoteFloorService;
 import org.dromara.property.api.domain.vo.RemoteFloorVo;
 import org.dromara.sis.domain.enums.ControlTypeEnum;
+import org.dromara.sis.domain.enums.EventSmallTypeEnum;
 import org.dromara.sis.domain.enums.RosterTypeEnum;
 import org.dromara.sis.domain.vo.*;
 import org.dromara.sis.sdk.e8.E8PlatformApi;
@@ -62,8 +63,8 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
         HWResult<Long> result = huaWeiBoxApi.findPerson(smallImgBase64Str);
         if (result.getCode() != 200) {
             log.info("华为盒子比对失败,msg={}", result.getMessage());
-            // 产生告警数据
+            // 产生告警数据 人脸比对失败，默认为
-            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
+            alarmEventsService.createAlarmRecord(deviceIp, 2, EventSmallTypeEnum.SMART_REPORT_ZJCR, "人脸比对失败", smallImg, bigImg);
             return;
         }
         log.info("人脸比对执行完成,耗时：{}ms", interval.intervalMs());
@@ -74,19 +75,19 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
         if (authRecord == null) {
             log.info("人员[{}]没有授权记录，判定为陌生人", person);
             // 不是内部人员 产生紧急的告警信息
-            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "陌生人员入内", smallImg, bigImg);
+            alarmEventsService.createAlarmRecord(deviceIp, 2, EventSmallTypeEnum.SMART_REPORT_ZJCR, "陌生人员入内", smallImg, bigImg);
             return;
         } else {
             if (Objects.equals(authRecord.getRosterType(), RosterTypeEnum.BLACK_LIST.getCode())) {
                 log.info("人员[{}]在黑名单中，暂不处理。", person);
-                alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg);
+                alarmEventsService.createAlarmRecord(deviceIp, 3, EventSmallTypeEnum.BLACK_PERSON, "黑名单人员入内", smallImg, bigImg);
                 return;
             }
         }
 
         Date now = new Date();
         if (DateUtil.compare(now, authRecord.getEndDate()) > 0) {
-//            alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "人员授权信息已过期", smallImg, bigImg);
+            alarmEventsService.createAlarmRecord(deviceIp, 1, EventSmallTypeEnum.AUTHORIZATION_EXPIRED, "人员授权信息已过期", smallImg, bigImg);
             log.info("当前人脸已过期，暂不处理。");
             return;
         }