by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source 
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
This commit is contained in:
zcxlsm 2025-08-06 09:16:23 +08:00
parent db58a91252
commit a4e40f5123
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ruoyi-modules/Sis/src/main/java/org/dromara/sis/consumer/CleanLiftAuthRocketConsumer.java
View File

@ -33,32 +33,28 @@ public class CleanLiftAuthRocketConsumer implements RocketMQListener<MessageExt>
public void onMessage(MessageExt ext) { public void onMessage(MessageExt ext) {
log.info("【消费者】接收消息：消息体 => {}", new String(ext.getBody())); log.info("【消费者】接收消息：消息体 => {}", new String(ext.getBody()));
// Long deviceId = Long.parseLong(ext.getUserProperty("deviceId")); Long deviceId = Long.parseLong(ext.getUserProperty("deviceId"));
// Long groupId = Long.parseLong(ext.getUserProperty("groupId")); Long groupId = Long.parseLong(ext.getUserProperty("groupId"));
// Long deviceFloorId = Long.parseLong(ext.getUserProperty("deviceFloorId")); Long deviceFloorId = Long.parseLong(ext.getUserProperty("deviceFloorId"));
//
// // 获取当前电梯信息
// SisElevatorInfoVo ele = sisElevatorInfoService.queryById(deviceId);
//
// // 获取权限组下电梯⇄楼层关联信息
// List<SisElevatorFloorRefVo> groupRef = sisElevatorFloorRefService.queryByAuthGroupId(groupId);
//
// // 取出当前电梯的楼层授权信息
// List<SisElevatorFloorRefVo> eleRef = groupRef.stream().filter(o -> Objects.equals(o.getElevatorId(), deviceId)).toList();
//
// for (SisElevatorFloorRefVo ref : eleRef){
// if (ref.getOutChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){
// HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getOutChannel().intValue(), 3);
// }
//
// if (ref.getInChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){
// HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getInChannel().intValue(), 3);
// }
// }
HikApiService.getInstance().controlGateway("192.168.24.188", 1, 3); // 获取当前电梯信息
HikApiService.getInstance().controlGateway("192.168.24.188", 2, 3); SisElevatorInfoVo ele = sisElevatorInfoService.queryById(deviceId);
// 获取权限组下电梯⇄楼层关联信息
List<SisElevatorFloorRefVo> groupRef = sisElevatorFloorRefService.queryByAuthGroupId(groupId);
// 取出当前电梯的楼层授权信息
List<SisElevatorFloorRefVo> eleRef = groupRef.stream().filter(o -> Objects.equals(o.getElevatorId(), deviceId)).toList();
for (SisElevatorFloorRefVo ref : eleRef){
if (ref.getOutChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){
HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getOutChannel().intValue(), 3);
}
if (ref.getInChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){
HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getInChannel().intValue(), 3);
}
}
log.info("梯控清除权限完成"); log.info("梯控清除权限完成");
} }
} }

4
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java
View File

@ -1,5 +1,6 @@
package org.dromara.sis.mapper; package org.dromara.sis.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.sis.domain.SisAccessControl; import org.dromara.sis.domain.SisAccessControl;
import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.domain.vo.SisAccessControlVo;
@ -8,8 +9,9 @@ import org.dromara.sis.domain.vo.SisAccessControlVo;
* 门禁设备Mapper接口 * 门禁设备Mapper接口
* *
* @author lxj * @author lxj
* @date 2025-06-25 * @since 2025-06-25
*/ */
@Mapper
public interface SisAccessControlMapper extends BaseMapperPlus<SisAccessControl, SisAccessControlVo> { public interface SisAccessControlMapper extends BaseMapperPlus<SisAccessControl, SisAccessControlVo> {
SisAccessControlVo queryById(Long id); SisAccessControlVo queryById(Long id);