From 9b2904ad06d665a41f244d98d8283196f95197c0 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Fri, 27 Jun 2025 23:53:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(sis):=20-=20=E4=BA=BA=E5=83=8F=E5=BA=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=8E=E5=AE=87=E8=A7=86=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=89=EF=BC=8C=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5=E5=86=99=E5=85=A5/=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20-=20=E4=BA=BA=E5=83=8F=E5=9B=BE=E7=89=87=E4=B8=8E?= =?UTF-8?q?=E5=AE=87=E8=A7=86=E5=B9=B3=E5=8F=B0=E5=90=8C=E6=AD=A5=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=88=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=85=B3=E8=81=94=E8=A1=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=86=99=E5=85=A5/=E5=88=A0=E9=99=A4=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E5=90=8C=E6=AD=A5=E8=87=B3E8=E5=B9=B3=E5=8F=B0=20-=20?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=94=B9=E4=B8=BAid?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/core/constant/CodePrefixConstants.java | 2 +- .../java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java | 5 +++++ .../java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java | 1 - .../org/dromara/sis/service/ISisLibDeviceRefService.java | 5 ++--- .../sis/service/impl/SisPersonLibImgServiceImpl.java | 3 +++ .../dromara/sis/service/impl/SisPersonLibServiceImpl.java | 6 ++++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java index 05bc29e..5588b19 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java @@ -12,7 +12,7 @@ public interface CodePrefixConstants { String SIS_DEVICE_CODE_PREFIX = "101"; /** - * 门禁设备编码前缀 + * 人像编码前缀 */ String PERSON_LIB_IMAGE_CODE_PREFIX = "102"; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java index 15fe30d..abfccb2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java @@ -79,4 +79,9 @@ public class SisPersonLibImgBo extends BaseEntity { */ private String birthDate; + /** + * 同步E8 + */ + private Boolean isSyncE8; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java index 19842f4..96e0ce7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java @@ -3,7 +3,6 @@ package org.dromara.sis.mapper; import org.apache.ibatis.annotations.Param; import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java index 9a685f0..4986b8a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java @@ -3,9 +3,8 @@ package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisLibDeviceRef; -import org.dromara.sis.domain.bo.SisAccessControlDeviceBo; +import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisLibDeviceRefBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import java.util.Collection; @@ -107,5 +106,5 @@ public interface ISisLibDeviceRefService { * @param ids libIds * @return 返回设备列表 */ - List queryDeviceListByLibIds(Collection ids); + List queryDeviceListByLibIds(Collection ids); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java index 9233132..135982d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java @@ -1,5 +1,7 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.util.IdUtil; +import org.dromara.common.core.constant.CodePrefixConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -26,6 +28,7 @@ import org.dromara.sis.mapper.SisPersonLibImgMapper; import org.dromara.sis.service.ISisPersonLibImgService; import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Base64; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java index e38bba0..28fdf1a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java @@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.SisPersonLib; +import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisPersonLibBo; import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo; @@ -22,13 +23,14 @@ import org.dromara.sis.domain.vo.SisPersonLibVo; import org.dromara.sis.mapper.SisPersonLibMapper; import org.dromara.sis.sdk.unview.UnViewAiBoxApi; import org.dromara.sis.sdk.unview.model.UvModel; -import org.dromara.sis.sdk.unview.service.UnViewAiBoxApiService; import org.dromara.sis.service.ISisAccessControlDeviceService; import org.dromara.sis.service.ISisLibDeviceRefService; import org.dromara.sis.service.ISisPersonLibService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -115,7 +117,7 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { public Boolean insertByBo(SisPersonLibBo bo) { SisPersonLib add = MapstructUtils.convert(bo, SisPersonLib.class); Assert.notNull(add, "数据处理失败"); - add.setLibCode(CodePrefixConstants.PERSONLIB_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); + add.setLibCode(CodePrefixConstants.PERSON_LIB_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); boolean flag = baseMapper.insert(add) > 0; log.info("库[{}]开始写入系统，result={}", add.getLibCode(), flag); if (flag) {