修复比对失败没写入事件表的问题

# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCaptureConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCompareConsumer.java

.gitea/workflows/master.yml

@@ -15,7 +15,7 @@ jobs:
       - name: 拉取代码
         uses: http://git.missmoc.top/mocheng/checkout@v4
         with:
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: 使用Maven构建项目
         run: |

ruoyi-modules/Property/src/main/java/org/dromara/property/rocketmq/RocketMqConstants.java

@@ -10,7 +10,7 @@ public interface RocketMqConstants {
     String TOPIC = "SmartParks";
 
     // mq GROUP
-    String GROUP = "Meter-Group";
+    String METER_GROUP = "METER_GROUP";
 
     /*-----------------------------------消息tag------------------------------------*/
     String METER_RECORD = "METER_RECORD_TAG";

ruoyi-modules/Property/src/main/java/org/dromara/property/rocketmq/consumer/MeterRecordConsumer.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMqConstants.TOPIC,
-    consumerGroup = RocketMqConstants.GROUP,
+    consumerGroup = RocketMqConstants.METER_GROUP,
     selectorExpression = RocketMqConstants.METER_RECORD
 )
 public class MeterRecordConsumer implements RocketMQListener<MessageExt> {

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java

@@ -67,8 +67,8 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
     public CustomerFeedbacksVo queryById(Long id) {
         CustomerFeedbacksVo customerFeedbacksVo = baseMapper.selectVoById(id);
         ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(customerFeedbacksVo.getFeedbackType());
-        customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName()) ? serviceWorkOrdersType.getOrderTypeName() : null);
+        customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotEmpty(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
-        String nikName = remoteUserService.selectNicknameById(customerFeedbacksVo.getFeedbackPersion());
+        String nikName = remoteUserService.selectNicknameById(ObjectUtil.isNotEmpty(customerFeedbacksVo) ?customerFeedbacksVo.getFeedbackPersion():null);
         customerFeedbacksVo.setFeedbackPersionName(nikName);
         return customerFeedbacksVo;
     }
@@ -115,11 +115,11 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
         if (CollUtil.isNotEmpty(remoteUserVos)) {
             RemoteUserVo remoteUserVo = remoteUserVos.stream()
                 .filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null);
-            customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotNull(remoteUserVo) ? remoteUserVo.getNickName() : null);
+            customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotEmpty(remoteUserVo) ? remoteUserVo.getNickName() : null);
         }
         if (CollUtil.isNotEmpty(serviceWorkOrdersTypes)) {
             ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypes.stream().filter(vo -> vo.getId() != null && vo.getId().equals(customerFeedbacksVo.getFeedbackType())).findFirst().orElse(null);
-            customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotNull(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
+            customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotEmpty(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null);
         }
     }
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java

@@ -1,75 +1,75 @@
-package org.dromara.sis.config;
+//package org.dromara.sis.config;
-
+//
-import org.apache.rocketmq.client.producer.DefaultMQProducer;
+//import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
+//import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Configuration;
-
+//
-/**
+///**
- * @author lsm
+// * @author lsm
- * @apiNote RocketMQClusterConfig
+// * @apiNote RocketMQClusterConfig
- * @since 2025/8/26
+// * @since 2025/8/26
- */
+// */
-@Configuration
+//@Configuration
-public class RocketMQClusterConfig {
+//public class RocketMQClusterConfig {
-
+//
-    // 从配置文件中读取 cluster 的配置
+//    // 从配置文件中读取 cluster 的配置
-    @Value("${rocketmq1.cluster.name-server}")
+//    @Value("${rocketmq.cluster1.name-server}")
-    private String nameServer1;
+//    private String nameServer1;
-
+//
-    @Value("${rocketmq1.cluster.producer.group}")
+//    @Value("${rocketmq.cluster1.producer.group}")
-    private String producerGroup1;
+//    private String producerGroup1;
-
+//
-    // 为第一个集群创建生产者实例
+//    // 为第一个集群创建生产者实例
-    @Bean({"clusterProducerOne"})
+//    @Bean({"clusterProducerOne"})
-    public DefaultMQProducer clusterProducerOne() throws Exception {
+//    public DefaultMQProducer clusterProducerOne() throws Exception {
-        DefaultMQProducer producer = new DefaultMQProducer(producerGroup1);
+//        DefaultMQProducer producer = new DefaultMQProducer(producerGroup1);
-        producer.setNamesrvAddr(nameServer1);
+//        producer.setNamesrvAddr(nameServer1);
-        // 设置发送超时时间
+//        // 设置发送超时时间
-        producer.setSendMsgTimeout(5000);
+//        producer.setSendMsgTimeout(5000);
-        // 设置重试次数
+//        // 设置重试次数
-        producer.setRetryTimesWhenSendFailed(2);
+//        producer.setRetryTimesWhenSendFailed(2);
-        producer.setRetryTimesWhenSendAsyncFailed(2);
+//        producer.setRetryTimesWhenSendAsyncFailed(2);
-        return producer;
+//        return producer;
-    }
+//    }
-
+//
-    // 使用上面的生产者实例创建 RocketMQTemplate
+//    // 使用上面的生产者实例创建 RocketMQTemplate
-    @Bean("rocketMQTemplateClusterOne")
+//    @Bean("rocketMQTemplateClusterOne")
-    public RocketMQTemplate rocketMQTemplateClusterOne(@Qualifier("clusterProducerOne") DefaultMQProducer producer) {
+//    public RocketMQTemplate rocketMQTemplateClusterOne(@Qualifier("clusterProducerOne") DefaultMQProducer producer) {
-        RocketMQTemplate template = new RocketMQTemplate();
+//        RocketMQTemplate template = new RocketMQTemplate();
-        template.setProducer(producer);
+//        template.setProducer(producer);
-        return template;
+//        return template;
-    }
+//    }
-
+//
-
+//
-    // 从配置文件中读取 cluster 的配置
+//    // 从配置文件中读取 cluster 的配置
-    @Value("${rocketmq2.cluster.name-server}")
+////    @Value("${rocketmq.cluster2.name-server}")
-    private String nameServer2;
+////    private String nameServer2;
-
+////
-    @Value("${rocketmq2.cluster.producer.group}")
+////    @Value("${rocketmq.cluster2.producer.group}")
-    private String producerGroup2;
+////    private String producerGroup2;
-
+////
-    // 为第二个集群创建生产者实例
+////    // 为第二个集群创建生产者实例
-    @Bean({"clusterProducerTwo"})
+////    @Bean({"clusterProducerTwo"})
-    public DefaultMQProducer clusterProducerTwo() throws Exception {
+////    public DefaultMQProducer clusterProducerTwo() throws Exception {
-        DefaultMQProducer producer = new DefaultMQProducer(producerGroup2);
+////        DefaultMQProducer producer = new DefaultMQProducer(producerGroup2);
-        producer.setNamesrvAddr(nameServer2);
+////        producer.setNamesrvAddr(nameServer2);
-        // 设置发送超时时间
+////        // 设置发送超时时间
-        producer.setSendMsgTimeout(5000);
+////        producer.setSendMsgTimeout(5000);
-        // 设置重试次数
+////        // 设置重试次数
-        producer.setRetryTimesWhenSendFailed(2);
+////        producer.setRetryTimesWhenSendFailed(2);
-        producer.setRetryTimesWhenSendAsyncFailed(2);
+////        producer.setRetryTimesWhenSendAsyncFailed(2);
-        return producer;
+////        return producer;
-    }
+////    }
-
+////
-    // 使用上面的生产者实例创建 RocketMQTemplate
+////    // 使用上面的生产者实例创建 RocketMQTemplate
-    @Bean("rocketMQTemplateClusterTwo")
+////    @Bean("rocketMQTemplateClusterTwo")
-    public RocketMQTemplate rocketMQTemplateClusterTwo(@Qualifier("clusterProducerTwo") DefaultMQProducer producer) {
+////    public RocketMQTemplate rocketMQTemplateClusterTwo(@Qualifier("clusterProducerTwo") DefaultMQProducer producer) {
-        RocketMQTemplate template = new RocketMQTemplate();
+////        RocketMQTemplate template = new RocketMQTemplate();
-        template.setProducer(producer);
+////        template.setProducer(producer);
-        return template;
+////        return template;
-    }
+////    }
-
+//
-}
+//}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java

@@ -0,0 +1,85 @@
+package org.dromara.sis.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.sis.domain.bo.SisPersonLibImgBo;
+import org.dromara.sis.domain.vo.SisPersonLibImgVo;
+import org.dromara.sis.sdk.e8.E8PlatformApi;
+import org.dromara.sis.sdk.e8.domain.QueryDto;
+import org.dromara.sis.sdk.e8.domain.accessControl.req.AccessRecordFindReq;
+import org.dromara.sis.sdk.e8.domain.accessControl.res.AccessRecordFindRes;
+import org.dromara.sis.service.ISisPersonLibImgService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuyongle
+ * @version 1.0
+ * @description:
+ * @date 2025/8/27 15:57
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/visitor")
+public class SisVisitorController {
+    private final E8PlatformApi e8PlatformApi;
+
+    /**
+     * 查询人员通行记录
+     */
+    @GetMapping("/list")
+    public TableDataInfo<AccessRecordFindRes> list(QueryDto dto) {
+
+//        TableDataInfo tableDataInfo = new TableDataInfo();
+//        List<AccessRecordFindRes> accessRecordFindResList = new ArrayList<>();
+//        AccessRecordFindRes accessRecordFindRes = new AccessRecordFindRes();
+//        accessRecordFindRes.setDeviceName("4#岗亭09");
+//        accessRecordFindRes.setDoorName("4#岗亭09");
+//        accessRecordFindRes.setDeviceType(1102);
+//        accessRecordFindRes.setReaderName("");
+//        accessRecordFindRes.setGatewayType(1);
+//        accessRecordFindRes.setCustomerName("德隆吴鹏");
+//        accessRecordFindRes.setOrganFullPath("主楼11楼");
+//        accessRecordFindRes.setPictureUrl("https://bpic.588ku.com/back_list_pic/23/04/21/ef5e2a3dd5cfc336fdcf2fd000474f0f.jpg");
+//        accessRecordFindRes.setCardType(34);
+//        accessRecordFindRes.setRecordType(2);
+//        accessRecordFindRes.setActionTime(new Date());
+//        accessRecordFindResList.add(accessRecordFindRes);
+//        tableDataInfo.setRows(accessRecordFindResList);
+//        tableDataInfo.setTotal(1);
+//        tableDataInfo.setCode(200);
+//        return tableDataInfo;
+
+        dto.setPageIndex(1);
+        dto.setMaxResultCount(20);
+
+        // 10秒内
+        String starTime = DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, -10), "yyyy-MM-dd HH:mm:ss");
+        String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+
+        AccessRecordFindReq lift = new AccessRecordFindReq();
+        lift.setStartTime(starTime);
+        lift.setEndTime(endTime);
+        lift.setRecordType(2);
+        // 9号电梯
+        lift.setDeviceId(550757939925061L);
+        dto.setQueryDto(lift);
+//        TableDataInfo<AccessRecordFindRes> nineLiftList = e8PlatformApi.getPageAccessRecordList(dto);
+        TableDataInfo<AccessRecordFindRes> pageAccessRecordList = new TableDataInfo();
+
+        return e8PlatformApi.getPageAccessRecordList(dto);
+        //如果pageAccessRecordList报错就捕获并封装
+    }
+}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java

@@ -9,8 +9,10 @@ public interface RocketMqConstants {
     // mq topic
     String TOPIC = "SmartParks";
 
-    // mq GROUP
+    // 人比比对消费者组
-    String GROUP = "SmartParks";
+    String COMPAREGROUP = "SmartParks-compare";
+    // 人脸抓拍消费者组
+    String CAPTUREGROUP = "SmartParks-capture";
 
     /*-----------------------------------消息tag------------------------------------*/
     String HIKADD = "ADD_HIK_DEVICE_TAG";
@@ -19,6 +21,4 @@ public interface RocketMqConstants {
     // 人脸比对
     String FACECOMPARE = "FACE_COMPARE_REPORT";
 
-    String METER_RECORD = "METER_RECORD_TAG";
-
 }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCaptureConsumer.java

@@ -9,7 +9,6 @@ import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.dromara.sis.rocketmq.RocketMqConstants;
 import org.dromara.sis.rocketmq.domain.FaceCapture;
 import org.dromara.sis.service.IZeroSensationPassageService;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,9 +22,8 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMqConstants.TOPIC,
-    consumerGroup = RocketMqConstants.GROUP,
+    consumerGroup = RocketMqConstants.CAPTUREGROUP,
-    selectorExpression = RocketMqConstants.FACECAPTURE,
+    selectorExpression = RocketMqConstants.FACECAPTURE
-    nameServer =  "${rocketmq2.cluster.name-server}"
 )
 public class FaceCaptureConsumer implements RocketMQListener<MessageExt> {
 
@@ -36,7 +34,7 @@ public class FaceCaptureConsumer implements RocketMQListener<MessageExt> {
         log.info("消费人脸抓拍数据，数据长度={}", ext.getBody().length);
         try {
             FaceCapture capture = JSONObject.parseObject(ext.getBody(), FaceCapture.class);
-//            zeroSensationPassageService.pass(capture.getDeviceIp(), capture.getSmallImg(), capture.getBigImg());
+            zeroSensationPassageService.pass(capture.getDeviceIp(), capture.getSmallImg(), capture.getBigImg());
         } catch (Exception e) {
             log.error("消费人脸抓拍数据处理失败，", e);
         }

ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCompareConsumer.java

@@ -21,9 +21,8 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMqConstants.TOPIC,
-    consumerGroup = RocketMqConstants.GROUP,
+    consumerGroup = RocketMqConstants.COMPAREGROUP,
-    selectorExpression = RocketMqConstants.FACECOMPARE,
+    selectorExpression = RocketMqConstants.FACECOMPARE
-    nameServer =  "${rocketmq2.cluster.name-server}"
 )
 public class FaceCompareConsumer implements RocketMQListener<MessageExt> {
 

ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java

@@ -1,38 +1,44 @@
-package org.dromara.sis.rocketmq.consumer;
+//package org.dromara.sis.rocketmq.consumer;
-
+//
-import lombok.RequiredArgsConstructor;
+//import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+//import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.common.message.MessageExt;
+//import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+//import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
+//import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.dromara.sis.rocketmq.RocketMqConstants;
+//import org.dromara.sis.rocketmq.RocketMqConstants;
-import org.springframework.stereotype.Component;
+//import org.dromara.sis.rocketmq.producer.ProducerService;
-
+//import org.springframework.stereotype.Component;
-/**
+//
- * @author lsm
+///**
- * @apiNote MeterRecordConsumer
+// * @author lsm
- * @since 2025/8/25
+// * @apiNote MeterRecordConsumer
- */
+// * @since 2025/8/25
-@Slf4j
+// */
-@Component
+//@Slf4j
-@RequiredArgsConstructor
+//@Component
-@RocketMQMessageListener(
+//@RequiredArgsConstructor
-    consumerGroup = "Meter_Group",
+//@RocketMQMessageListener(
-    topic = RocketMqConstants.TOPIC,
+//    topic = RocketMqConstants.TOPIC,
-    selectorExpression = RocketMqConstants.METER_RECORD,
+//    consumerGroup = RocketMqConstants.METER_GROUP,
-    nameServer =  "${rocketmq2.cluster.name-server}"
+//    selectorExpression = RocketMqConstants.METER_RECORD,
-)
+//    nameServer = "${rocketmq.cluster1.name-server}"
-public class MeterRecordConsumer implements RocketMQListener<MessageExt> {
+//)
-
+//public class MeterRecordConsumer implements RocketMQListener<MessageExt> {
-    @Override
+//
-    public void onMessage(MessageExt ext) {
+//    private final ProducerService producerService;
-        log.info("消费仪表上报数据，数据长度={}", ext.getBody().length);
+//
-        try {
+//    @Override
-            String message = new String(ext.getBody());
+//    public void onMessage(MessageExt ext) {
-            log.info("消费仪表上报数据，数据={}", message);
+//        try {
-        } catch (Exception e) {
+//            if (ext.getBody() == null) {
-            log.error("消费仪表上报数据处理失败，", e);
+//                log.info("仪表上报消息数据，不转发！");
-        }
+//            } else {
-
+//                producerService.defaultSend(RocketMqConstants.TOPIC, RocketMqConstants.METER_RECORD, new String(ext.getBody()));
-    }
+//                log.info("转发仪表上报数据处理成功");
-}
+//            }
+//        } catch (Exception e) {
+//            log.error("转发仪表上报数据处理失败，", e);
+//        }
+//
+//    }
+//}

ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java

@@ -1,69 +1,65 @@
-package org.dromara.sis.rocketmq.producer;
+//package org.dromara.sis.rocketmq.producer;
-
+//
-import lombok.extern.slf4j.Slf4j;
+//import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.common.message.Message;
+//import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
+//import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
+//import org.springframework.stereotype.Component;
-
+//
-/**
+///**
- * @author lsm
+// * @author lsm
- * @apiNote ProducerService
+// * @apiNote ProducerService
- * @since 2025/8/26
+// * @since 2025/8/26
- */
+// */
-@Slf4j
+//@Slf4j
-@Component
+//@Component
-public class ProducerService {
+//public class ProducerService {
-
+//
-    @Autowired
+//    @Autowired
-    @Qualifier("rocketMQTemplateClusterOne")
+//    @Qualifier("rocketMQTemplateClusterOne")
-    private RocketMQTemplate rocketMQTemplateClusterOne;
+//    private RocketMQTemplate rocketMQTemplateClusterOne;
-
+//
-    @Autowired
+////    @Autowired
-//    @Qualifier("rocketMQTemplateClusterTwo")
+////    @Qualifier("rocketMQTemplateClusterTwo")
-    private RocketMQTemplate rocketMQTemplateClusterTwo;
+////    private RocketMQTemplate rocketMQTemplateClusterTwo;
-
+//
-    /**
+//    /**
-     * 向mq写入消息
+//     * 向mq写入消息
-     *
+//     *
-     * @param topic 消息topic
+//     * @param topic 消息topic
-     * @param tag   消息tag
+//     * @param tag   消息tag
-     * @param msg   消息
+//     * @param msg   消息
-     */
+//     */
-    public void defaultSend(String topic, String tag, String msg) {
+//    public void defaultSend(String topic, String tag, String msg) {
-        try {
+//        try {
-            String destination = topic + ":" + tag;
+//            String destination = topic + ":" + tag;
-            log.info("准备向默认RocketMQ发送消息，目的地：{}", destination);
+//            // 使用 RocketMQTemplate 的同步发送方法
-
+//            rocketMQTemplateClusterOne.syncSend(destination, msg);
-            // 使用 RocketMQTemplate 的同步发送方法
+//
-            rocketMQTemplateClusterOne.syncSend(destination, msg);
+//            log.info("发送RocketMQOne消息成功, nameServer:{}", rocketMQTemplateClusterOne.getProducer().getNamesrvAddr());
-
+//        } catch (Exception e) {
-            log.info("发送RocketMQ消息成功");
+//            log.error("发送RocketMQOne消息失败", e);
-        } catch (Exception e) {
+//        }
-            log.error("发送RocketMQ消息失败", e);
+//    }
-        }
+//
-    }
+//
-
+//    /**
-
+//     * 向mq写入消息
-    /**
+//     *
-     * 向mq写入消息
+//     * @param topic 消息topic
-     *
+//     * @param tag   消息tag
-     * @param topic 消息topic
+//     * @param msg   消息
-     * @param tag   消息tag
+//     */
-     * @param msg   消息
+////    public void clusterSend(String topic, String tag, String msg) {
-     */
+////        try {
-    public void clusterSend(String topic, String tag, String msg) {
+////            String destination = topic + ":" + tag;
-        try {
+////            // 使用 RocketMQTemplate 的同步发送方法
-            String destination = topic + ":" + tag;
+////            rocketMQTemplateClusterTwo.syncSend(destination, msg);
-            log.info("准备向集群2 RocketMQ发送消息，目的地：{}", destination);
+////
-
+////            log.info("发送RocketMQTwo消息成功, nameServer:{}", rocketMQTemplateClusterTwo.getProducer().getNamesrvAddr());
-            // 使用 RocketMQTemplate 的同步发送方法
+////        } catch (Exception e) {
-            rocketMQTemplateClusterTwo.syncSend(destination, msg);
+////            log.error("发送RocketMQTwo消息失败", e);
-
+////        }
-            log.info("发送ClusterRocketMQ消息成功");
+////    }
-        } catch (Exception e) {
+//}
-            log.error("发送RocketMQ消息失败", e);
-        }
-    }
-}

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

@@ -63,7 +63,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer
         if (result.getCode() != 200) {
             log.info("华为盒子比对失败,msg={}", result.getMessage());
             // 产生告警数据
-//            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
+            alarmEventsService.createAlarmRecord(deviceIp, 1, 1, "人脸比对失败", smallImg, bigImg);
             return;
         }
         log.info("人脸比对执行完成,耗时：{}ms", interval.intervalMs());

ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties

@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://192.168.159.129:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=123456
+db.password.0=By@2025!
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50