From 75cc08fa99dbd259aaa12c9afe6e90d5944d6762 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Mon, 30 Jun 2025 10:13:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/e8/AccessControlController.java | 8 ++++---- .../dromara/sis/sdk/e8/AccessControlService.java | 9 ++++----- .../req/AccessRecordFindReq.java | 2 +- .../req/CustomerAuthAddReq.java | 2 +- .../req/CustomerAuthFindReq.java | 2 +- .../req/RemoteOpenDoorReq.java | 2 +- .../res/AccessRecordFindRes.java | 2 +- .../res/CustomerAuthFindRes.java | 2 +- .../sis/sdk/e8/impl/AccessControlServiceImpl.java | 15 ++++++--------- .../sis/sdk/unview/service/VideoAlarmService.java | 4 ++-- .../service/impl/SisAuthRecordServiceImpl.java | 2 +- 11 files changed, 23 insertions(+), 27 deletions(-) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/req/AccessRecordFindReq.java (95%) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/req/CustomerAuthAddReq.java (96%) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/req/CustomerAuthFindReq.java (93%) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/req/RemoteOpenDoorReq.java (92%) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/res/AccessRecordFindRes.java (98%) rename ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/{accesscontrol => accessControl}/res/CustomerAuthFindRes.java (98%) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java index 9fd6c88..de96e18 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java @@ -6,10 +6,10 @@ import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.domain.QueryDto; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.CustomerAuthAddReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.CustomerAuthFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accessControl.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java index f7c4d51..c991ffd 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java @@ -1,12 +1,11 @@ package org.dromara.sis.sdk.e8; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.sdk.e8.domain.QueryDto; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.CustomerAuthAddReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.CustomerAuthFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accessControl.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/AccessRecordFindReq.java similarity index 95% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/AccessRecordFindReq.java index dbe6323..3cabd92 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/AccessRecordFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accessControl.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthAddReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthAddReq.java similarity index 96% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthAddReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthAddReq.java index ffb9429..7c1d6ab 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthAddReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthAddReq.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accessControl.req; import lombok.Data; import java.util.List; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthFindReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthFindReq.java similarity index 93% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthFindReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthFindReq.java index 1cc9321..637f16a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthFindReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthFindReq.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accessControl.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/RemoteOpenDoorReq.java similarity index 92% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/RemoteOpenDoorReq.java index 3322910..c4b9851 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/RemoteOpenDoorReq.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.req; +package org.dromara.sis.sdk.e8.domain.accessControl.req; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/AccessRecordFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/AccessRecordFindRes.java index dcd3cb5..4d92ba1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/AccessRecordFindRes.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.res; +package org.dromara.sis.sdk.e8.domain.accessControl.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/CustomerAuthFindRes.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/CustomerAuthFindRes.java similarity index 98% rename from ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/CustomerAuthFindRes.java rename to ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/CustomerAuthFindRes.java index 566814c..0828a58 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/CustomerAuthFindRes.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/CustomerAuthFindRes.java @@ -1,4 +1,4 @@ -package org.dromara.sis.sdk.e8.domain.accesscontrol.res; +package org.dromara.sis.sdk.e8.domain.accessControl.res; import lombok.Data; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java index c63d8ca..c5f84ac 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java @@ -3,21 +3,18 @@ package org.dromara.sis.sdk.e8.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.TypeReference; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.SisAccessControl; -import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.domain.ApiResp; 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.req.CustomerAuthAddReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.CustomerAuthFindReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; -import org.dromara.sis.sdk.e8.domain.accesscontrol.res.CustomerAuthFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.req.AccessRecordFindReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthFindReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accessControl.res.AccessRecordFindRes; +import org.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes; import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java index 64a881c..10b07ca 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java @@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.domain.vo.SisAuthRecordVo; import org.dromara.sis.sdk.e8.AccessControlService; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.RemoteOpenDoorReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq; import org.dromara.sis.sdk.unview.model.UvModel; import org.dromara.sis.sdk.unview.model.enums.AlarmTypeEnum; import org.dromara.sis.service.ISisAccessControlService; @@ -111,7 +111,7 @@ public class VideoAlarmService { log.info("无比对结果，不处理此条数据。"); return; } - UvModel.ChannelInfo channelInfo = alarmReportData.getChannel_info(); + UvModel.ChannelInfo channelInfo = alarmReportData.getChannel_info(); if (channelInfo == null) { log.info("上报设备信息不存在，不处理词条数据。"); return; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java index dbbea24..6f4f07d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java @@ -19,7 +19,7 @@ import org.dromara.sis.mapper.SisAuthRecordMapper; import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.DoorDeviceService; import org.dromara.sis.sdk.e8.VoucherControlService; -import org.dromara.sis.sdk.e8.domain.accesscontrol.req.CustomerAuthAddReq; +import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq; import org.dromara.sis.sdk.e8.domain.door.res.AuthDoorDeviceFindRes; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.unview.UnViewAiBoxApi;