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

驼峰变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
zcxlsm 2025-06-30 10:13:07 +08:00
parent 3837c2f2ef
commit 75cc08fa99
11 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/AccessControlController.java
View File

@ -6,10 +6,10 @@ import org.dromara.common.core.domain.R;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.AccessControlService;
import org.dromara.sis.sdk.e8.domain.QueryDto; 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.CustomerAuthAddReq;
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.e8.domain.accesscontrol.res.AccessRecordFindRes; 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.res.CustomerAuthFindRes;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

9
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/AccessControlService.java
View File

@ -1,12 +1,11 @@
package org.dromara.sis.sdk.e8; package org.dromara.sis.sdk.e8;
import org.dromara.common.mybatis.core.page.TableDataInfo; 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.QueryDto;
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.accesscontrol.req.RemoteOpenDoorReq; 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.AccessRecordFindRes;
import org.dromara.sis.sdk.e8.domain.accesscontrol.res.CustomerAuthFindRes; import org.dromara.sis.sdk.e8.domain.accessControl.res.CustomerAuthFindRes;
/** /**
* @author lsm * @author lsm

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/AccessRecordFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/AccessRecordFindReq.java
View File

@ -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 lombok.Data;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthAddReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthAddReq.java
View File

@ -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 lombok.Data;
import java.util.List; import java.util.List;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/CustomerAuthFindReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/CustomerAuthFindReq.java
View File

@ -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 lombok.Data;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/req/RemoteOpenDoorReq.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/req/RemoteOpenDoorReq.java
View File

@ -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 lombok.Data;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/AccessRecordFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/AccessRecordFindRes.java
View File

@ -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; import lombok.Data;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accesscontrol/res/CustomerAuthFindRes.java → ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/accessControl/res/CustomerAuthFindRes.java
View File

@ -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; import lombok.Data;

15
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/AccessControlServiceImpl.java
View File

@ -3,21 +3,18 @@ package org.dromara.sis.sdk.e8.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.mybatis.core.page.TableDataInfo; 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.AccessControlService;
import org.dromara.sis.sdk.e8.domain.ApiResp; import org.dromara.sis.sdk.e8.domain.ApiResp;
import org.dromara.sis.sdk.e8.domain.QueryDto; 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.AccessRecordFindReq;
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.accesscontrol.req.CustomerAuthFindReq; 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.req.RemoteOpenDoorReq;
import org.dromara.sis.sdk.e8.domain.accesscontrol.res.AccessRecordFindRes; 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.res.CustomerAuthFindRes;
import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.dromara.sis.sdk.e8.utils.E8ApiUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java
View File

@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.domain.vo.SisAccessControlVo;
import org.dromara.sis.domain.vo.SisAuthRecordVo; import org.dromara.sis.domain.vo.SisAuthRecordVo;
import org.dromara.sis.sdk.e8.AccessControlService; 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.UvModel;
import org.dromara.sis.sdk.unview.model.enums.AlarmTypeEnum; import org.dromara.sis.sdk.unview.model.enums.AlarmTypeEnum;
import org.dromara.sis.service.ISisAccessControlService; import org.dromara.sis.service.ISisAccessControlService;
@ -111,7 +111,7 @@ public class VideoAlarmService {
log.info("无比对结果，不处理此条数据。"); log.info("无比对结果，不处理此条数据。");
return; return;
} }
UvModel.ChannelInfo channelInfo = alarmReportData.getChannel_info(); UvModel.ChannelInfo channelInfo = alarmReportData.getChannel_info();
if (channelInfo == null) { if (channelInfo == null) {
log.info("上报设备信息不存在，不处理词条数据。"); log.info("上报设备信息不存在，不处理词条数据。");
return; return;

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java
View File

@ -19,7 +19,7 @@ import org.dromara.sis.mapper.SisAuthRecordMapper;
import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.AccessControlService;
import org.dromara.sis.sdk.e8.DoorDeviceService; import org.dromara.sis.sdk.e8.DoorDeviceService;
import org.dromara.sis.sdk.e8.VoucherControlService; 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.door.res.AuthDoorDeviceFindRes;
import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq;
import org.dromara.sis.sdk.unview.UnViewAiBoxApi; import org.dromara.sis.sdk.unview.UnViewAiBoxApi;