From 3deaea69bb6a03cfc1161a3e907fb7ae90c03a27 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Fri, 27 Jun 2025 23:13:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(sis):=20-=20=E4=BA=BA=E5=83=8F?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C=E4=B8=8E=E5=AE=87=E8=A7=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=90=8C=E6=AD=A5=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=89=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=E5=90=8C=E6=AD=A5=E5=86=99=E5=85=A5/?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20-=20=E4=BA=BA=E5=83=8F=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8E=E5=AE=87=E8=A7=86=E5=B9=B3=E5=8F=B0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=89=EF=BC=8C=E5=85=B3=E8=81=94=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=86=99=E5=85=A5/=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=90=8C=E6=AD=A5=E8=87=B3E8=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20-=20=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=94=B9?= =?UTF-8?q?=E4=B8=BAid=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/CodePrefixConstants.java | 7 +- .../controller/SisPersonLibController.java | 4 +- .../controller/SisPersonLibImgController.java | 8 +- .../sis/domain/SisLibDeviceImgRef.java | 17 ++- .../dromara/sis/domain/SisLibDeviceRef.java | 10 +- .../dromara/sis/domain/SisPersonLibImg.java | 9 +- .../sis/domain/bo/SisLibDeviceImgRefBo.java | 26 ++-- .../sis/domain/bo/SisLibDeviceRefBo.java | 17 +-- .../dromara/sis/domain/bo/SisPersonLibBo.java | 8 +- .../sis/domain/bo/SisPersonLibImgBo.java | 22 ++-- .../sis/domain/vo/SisLibDeviceImgRefVo.java | 24 ++-- .../sis/domain/vo/SisLibDeviceRefVo.java | 17 +-- .../sis/domain/vo/SisPersonLibImgVo.java | 4 +- .../dromara/sis/sdk/unview/model/UvModel.java | 6 +- .../service/ISisLibDeviceImgRefService.java | 10 +- .../sis/service/ISisLibDeviceRefService.java | 10 +- .../impl/SisLibDeviceImgRefServiceImpl.java | 26 ++-- .../impl/SisLibDeviceRefServiceImpl.java | 24 +++- .../impl/SisPersonLibImgServiceImpl.java | 113 +++++++++++++++++- .../service/impl/SisPersonLibServiceImpl.java | 57 ++++++++- 20 files changed, 307 insertions(+), 112 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 44a035a..05bc29e 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 @@ -4,10 +4,15 @@ public interface CodePrefixConstants { /** * 人像库编码前缀 */ - String PERSONLIB_CODE_PREFIX = "100"; + String PERSON_LIB_CODE_PREFIX = "100"; /** * 门禁设备编码前缀 */ 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/controller/SisPersonLibController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java index 1dcc6d3..a7adc2b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java @@ -75,7 +75,7 @@ public class SisPersonLibController extends BaseController { @SaCheckPermission("sis:personLib:add") @Log(title = "人像库", businessType = BusinessType.INSERT) @RepeatSubmit() - @PostMapping() + @PostMapping("add") public R add(@Validated(AddGroup.class) @RequestBody SisPersonLibBo bo) { return toAjax(tbPersonLibService.insertByBo(bo)); } @@ -98,7 +98,7 @@ public class SisPersonLibController extends BaseController { */ @SaCheckPermission("sis:personLib:remove") @Log(title = "人像库", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("del/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true)); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java index f4c6bbb..66905c2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java @@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/sis/personLibImg * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Validated @RequiredArgsConstructor @@ -65,7 +65,7 @@ public class SisPersonLibImgController extends BaseController { @SaCheckPermission("sis:personLibImg:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(tbPersonLibImgService.queryById(id)); } @@ -75,7 +75,7 @@ public class SisPersonLibImgController extends BaseController { @SaCheckPermission("sis:personLibImg:add") @Log(title = "人像信息", businessType = BusinessType.INSERT) @RepeatSubmit() - @PostMapping() + @PostMapping("add") public R add(@Validated(AddGroup.class) @RequestBody SisPersonLibImgBo bo) { return toAjax(tbPersonLibImgService.insertByBo(bo)); } @@ -98,7 +98,7 @@ public class SisPersonLibImgController extends BaseController { */ @SaCheckPermission("sis:personLibImg:remove") @Log(title = "人像信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("del/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(tbPersonLibImgService.deleteWithValidByIds(List.of(ids), true)); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java index 292c40b..b276d1f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java @@ -28,19 +28,19 @@ public class SisLibDeviceImgRef extends TenantEntity { private Long id; /** - * 库编码 + * 库Id */ - private String libCode; + private Long libId; /** - * 图片编码 + * 图片Id */ - private String imgCode; + private Long imgId; /** - * 设备编码 + * 设备Id */ - private String eqpCode; + private Long eqpId; /** * 设备库id @@ -52,4 +52,9 @@ public class SisLibDeviceImgRef extends TenantEntity { */ private Long eqpLibImgId; + /** + * e8图片地址 + */ + private String eqpLibImgUrl; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java index fc8e17c..224e546 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java @@ -28,19 +28,19 @@ public class SisLibDeviceRef extends TenantEntity { private Long id; /** - * 人员库编码 + * 库Id */ - private String libCode; + private Long libId; /** - * 设备编码 + * 设备Id */ - private String eqpCode; + private Long eqpId; /** * 设备上的库id */ - private Long eqpLibCode; + private Long eqpLibId; /** * 第三方设备库添加状态 1: 成功，2：失败 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java index f584aa9..347974c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java @@ -31,7 +31,7 @@ public class SisPersonLibImg extends TenantEntity { /** * 人员库编码 */ - private String libCode; + private Long libId; /** * 人像名称 @@ -49,8 +49,7 @@ public class SisPersonLibImg extends TenantEntity { private String imgUrl; /** - * 性别 1：男 -2：女 99：未说明 + * 性别 1：男 2：女 99：未说明 */ private Long sex; @@ -65,9 +64,7 @@ public class SisPersonLibImg extends TenantEntity { private String tel; /** - * 证件类型 -1：身份证 2：护照 -3：行驶证 99：其它 + * 证件类型 1：身份证 2：护照3：行驶证 99：其它 */ private Long certificateType; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java index 4a3fd11..c5b1bb7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 系统图片和设备图片的关联业务对象 tb_lib_device_img_ref * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Data @EqualsAndHashCode(callSuper = true) @@ -29,20 +29,20 @@ public class SisLibDeviceImgRefBo extends BaseEntity { /** * 库编码 */ - @NotBlank(message = "库编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String libCode; + @NotNull(message = "库Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long libId; /** - * 图片编码 + * 图片Id */ - @NotBlank(message = "图片编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String imgCode; + @NotNull(message = "图片Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long imgId; /** * 设备编码 */ - @NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String eqpCode; + @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpId; /** * 设备库id @@ -56,6 +56,11 @@ public class SisLibDeviceImgRefBo extends BaseEntity { @NotNull(message = "设备库图片id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long eqpLibImgId; + /** + * e8图片地址 + */ + private String eqpLibImgUrl; + /** * 创建人id */ @@ -66,10 +71,5 @@ public class SisLibDeviceImgRefBo extends BaseEntity { */ private Long updateById; - /** - * 搜索值 - */ - private String searchValue; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java index 03173a4..a24d598 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java @@ -29,20 +29,20 @@ public class SisLibDeviceRefBo extends BaseEntity { /** * 人员库编码 */ - @NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String libCode; + @NotNull(message = "库Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long libId; /** * 设备编码 */ - @NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String eqpCode; + @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long eqpId; /** * 设备上的库id */ @NotNull(message = "设备上的库id不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long eqpLibCode; + private Long eqpLibId; /** * 第三方设备库添加状态 1: 成功，2：失败 @@ -59,11 +59,4 @@ public class SisLibDeviceRefBo extends BaseEntity { * 更新人id */ private Long updateById; - - /** - * 搜索值 - */ - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java index da5bb5a..d312e8b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java @@ -16,7 +16,7 @@ import org.dromara.sis.domain.SisPersonLib; * 人像库业务对象 tb_person_lib * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Data @EqualsAndHashCode(callSuper = true) @@ -53,11 +53,15 @@ public class SisPersonLibBo extends BaseEntity { @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "libType", other = "sis_lib_type") private String libTypeName; - /** * 库的业务类型 1: 门禁库，2: 黑名单库 */ private Long busiType = 1L; + /** + * 门禁设备id + */ + private Long eqbId; + } 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 3aaa337..568d61a 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 @@ -23,19 +23,19 @@ public class SisPersonLibImgBo extends BaseEntity { /** * 主键id */ - @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键id不能为空", groups = {EditGroup.class}) private Long id; /** * 人员库编码 */ - @NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) - private String libCode; + @NotNull(message = "人像库Id不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long libId; /** * 人像名称 */ - @NotBlank(message = "人像名称不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "人像名称不能为空", groups = {AddGroup.class, EditGroup.class}) private String imgName; /** @@ -46,12 +46,11 @@ public class SisPersonLibImgBo extends BaseEntity { /** * 图片的存储地址 */ - @NotBlank(message = "图片的存储地址不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "图片的存储地址不能为空", groups = {AddGroup.class, EditGroup.class}) private String imgUrl; /** - * 性别 1：男 -2：女 99：未说明 + * 性别 1：男2：女 99：未说明 */ private Long sex; @@ -66,9 +65,7 @@ public class SisPersonLibImgBo extends BaseEntity { private String tel; /** - * 证件类型 -1：身份证 2：护照 -3：行驶证 99：其它 + * 证件类型、1：身份证 2：护照、3：行驶证 99：其它 */ private Long certificateType; @@ -97,5 +94,10 @@ public class SisPersonLibImgBo extends BaseEntity { */ private String searchValue; + /** + * 是否同步到E8 + */ + private Boolean isSyncE8; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java index 8a5344e..6766070 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java @@ -33,20 +33,20 @@ public class SisLibDeviceImgRefVo implements Serializable { /** * 库编码 */ - @ExcelProperty(value = "库编码") - private String libCode; + @ExcelProperty(value = "库Id") + private Long libId; /** * 图片编码 */ - @ExcelProperty(value = "图片编码") - private String imgCode; + @ExcelProperty(value = "图片Id") + private Long imgId; /** * 设备编码 */ - @ExcelProperty(value = "设备编码") - private String eqpCode; + @ExcelProperty(value = "设备id") + private Long eqpId; /** * 设备库id @@ -60,6 +60,12 @@ public class SisLibDeviceImgRefVo implements Serializable { @ExcelProperty(value = "设备库图片id") private Long eqpLibImgId; + /** + * e8图片地址 + */ + @ExcelProperty(value = "e8图片地址") + private String eqpLibImgUrl; + /** * 创建人id */ @@ -72,11 +78,5 @@ public class SisLibDeviceImgRefVo implements Serializable { @ExcelProperty(value = "更新人id") private Long updateById; - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java index a82dee5..f6b01a7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java @@ -33,20 +33,20 @@ public class SisLibDeviceRefVo implements Serializable { /** * 人员库编码 */ - @ExcelProperty(value = "人员库编码") - private String libCode; + @ExcelProperty(value = "库Id") + private Long libId; /** * 设备编码 */ - @ExcelProperty(value = "设备编码") - private String eqpCode; + @ExcelProperty(value = "设备Id") + private Long eqpId; /** * 设备上的库id */ @ExcelProperty(value = "设备上的库id") - private Long eqpLibCode; + private Long eqpLibId; /** * 第三方设备库添加状态 1: 成功，2：失败 @@ -66,11 +66,4 @@ public class SisLibDeviceRefVo implements Serializable { @ExcelProperty(value = "更新人id") private Long updateById; - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java index 15068b3..e10145d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java @@ -34,8 +34,8 @@ public class SisPersonLibImgVo implements Serializable { /** * 人员库编码 */ - @ExcelProperty(value = "人员库编码") - private String libCode; + @ExcelProperty(value = "人员库Id") + private String libId; /** * 人像名称 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java index ee14636..c55fbb4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java @@ -259,9 +259,9 @@ public class UvModel { */ private Integer lib_id; /** - * 性别 + * 性别 1：男2：女 99：未说明 */ - private String sex; + private Integer sex; /** * 邮件 */ @@ -275,7 +275,7 @@ public class UvModel { * 证件类型 * 1：身份证 2：护照 3：行驶证 99：其它 */ - private String certificate_type; + private Integer certificate_type; /** * 证件号码 */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceImgRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceImgRefService.java index 281935a..3666689 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceImgRefService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceImgRefService.java @@ -12,7 +12,7 @@ import java.util.List; * 系统图片和设备图片的关联Service接口 * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ public interface ISisLibDeviceImgRefService { @@ -65,4 +65,12 @@ public interface ISisLibDeviceImgRefService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据系统图片id列表，获取设备图片列表 + * + * @param imgIds 系统图片id列表 + * @return 设备图片列表 + */ + List queryListByImgIds(Collection imgIds); } 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 f9c95cf..2c3c6ec 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 @@ -12,7 +12,7 @@ import java.util.List; * 系统库与设备库的关联Service接口 * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ public interface ISisLibDeviceRefService { @@ -65,4 +65,12 @@ public interface ISisLibDeviceRefService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据系统库id列表，获取设备库列表 + * + * @param LibIds 系统图片id列表 + * @return 设备库列表 + */ + List queryListByLibId(Collection LibIds); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java index ab563b6..4f52040 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceImgRefServiceImpl.java @@ -40,7 +40,7 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService * @return 系统图片和设备图片的关联 */ @Override - public SisLibDeviceImgRefVo queryById(Long id){ + public SisLibDeviceImgRefVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -74,12 +74,11 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SisLibDeviceImgRef::getId); - lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), SisLibDeviceImgRef::getLibCode, bo.getLibCode()); - lqw.eq(StringUtils.isNotBlank(bo.getImgCode()), SisLibDeviceImgRef::getImgCode, bo.getImgCode()); - lqw.eq(StringUtils.isNotBlank(bo.getEqpCode()), SisLibDeviceImgRef::getEqpCode, bo.getEqpCode()); + lqw.eq(bo.getLibId() != null, SisLibDeviceImgRef::getLibId, bo.getLibId()); + lqw.eq(bo.getImgId() != null, SisLibDeviceImgRef::getImgId, bo.getImgId()); + lqw.eq(bo.getEqpId() != null, SisLibDeviceImgRef::getEqpId, bo.getEqpId()); lqw.eq(bo.getEqpLibId() != null, SisLibDeviceImgRef::getEqpLibId, bo.getEqpLibId()); lqw.eq(bo.getEqpLibImgId() != null, SisLibDeviceImgRef::getEqpLibImgId, bo.getEqpLibImgId()); - lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisLibDeviceImgRef::getSearchValue, bo.getSearchValue()); return lqw; } @@ -116,7 +115,7 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SisLibDeviceImgRef entity){ + private void validEntityBeforeSave(SisLibDeviceImgRef entity) { //TODO 做一些数据校验,如唯一约束 } @@ -129,9 +128,22 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 根据系统图片id列表，获取设备图片列表 + * + * @param imgIds 系统图片id列表 + * @return 设备图片列表 + */ + @Override + public List queryListByImgIds(Collection imgIds){ + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(SisLibDeviceImgRef::getImgId, imgIds); + return baseMapper.selectVoList(lqw); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java index 3dff6b5..982c7c8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java @@ -40,7 +40,7 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService { * @return 系统库与设备库的关联 */ @Override - public SisLibDeviceRefVo queryById(Long id){ + public SisLibDeviceRefVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -74,9 +74,9 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SisLibDeviceRef::getId); - lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), SisLibDeviceRef::getLibCode, bo.getLibCode()); - lqw.eq(StringUtils.isNotBlank(bo.getEqpCode()), SisLibDeviceRef::getEqpCode, bo.getEqpCode()); - lqw.eq(bo.getEqpLibCode() != null, SisLibDeviceRef::getEqpLibCode, bo.getEqpLibCode()); + lqw.eq(bo.getLibId() != null, SisLibDeviceRef::getLibId, bo.getLibId()); + lqw.eq(bo.getEqpId() != null, SisLibDeviceRef::getEqpId, bo.getEqpId()); + lqw.eq(bo.getEqpLibId() != null, SisLibDeviceRef::getEqpLibId, bo.getEqpLibId()); lqw.eq(bo.getEqpLibState() != null, SisLibDeviceRef::getEqpLibState, bo.getEqpLibState()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisLibDeviceRef::getSearchValue, bo.getSearchValue()); return lqw; @@ -115,7 +115,7 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SisLibDeviceRef entity){ + private void validEntityBeforeSave(SisLibDeviceRef entity) { //TODO 做一些数据校验,如唯一约束 } @@ -128,9 +128,21 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 根据系统库id列表，获取设备库列表 + * + * @param LibIds 系统图片id列表 + * @return 设备库列表 + */ + public List queryListByLibId(Collection LibIds){ + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(SisLibDeviceRef::getLibId, LibIds); + return baseMapper.selectVoList(lqw); + } } 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 09d0298..88a1dc9 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; @@ -9,6 +11,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.sis.domain.bo.SisLibDeviceImgRefBo; +import org.dromara.sis.domain.bo.SisLibDeviceRefBo; +import org.dromara.sis.domain.vo.SisLibDeviceImgRefVo; +import org.dromara.sis.domain.vo.SisLibDeviceRefVo; +import org.dromara.sis.sdk.e8.VoucherControlService; +import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.unview.service.UnViewAiBoxApiService; +import org.dromara.sis.service.ISisLibDeviceImgRefService; +import org.dromara.sis.service.ISisLibDeviceRefService; import org.springframework.stereotype.Service; import org.dromara.sis.domain.bo.SisPersonLibImgBo; import org.dromara.sis.domain.vo.SisPersonLibImgVo; @@ -16,6 +27,9 @@ import org.dromara.sis.domain.SisPersonLibImg; 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; import java.util.Collection; @@ -32,6 +46,10 @@ import java.util.Collection; public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { private final SisPersonLibImgMapper baseMapper; + private final VoucherControlService vouchService; + private final UnViewAiBoxApiService unViewAiBoxApiService; + private final ISisLibDeviceRefService libDeviceRefService; + private final ISisLibDeviceImgRefService libDeviceImgRefService; /** * 查询人像信息 @@ -40,7 +58,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { * @return 人像信息 */ @Override - public SisPersonLibImgVo queryById(Long id){ + public SisPersonLibImgVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -74,7 +92,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SisPersonLibImg::getId); - lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), SisPersonLibImg::getLibCode, bo.getLibCode()); + lqw.eq(bo.getLibId() != null, SisPersonLibImg::getLibId, bo.getLibId()); lqw.like(StringUtils.isNotBlank(bo.getImgName()), SisPersonLibImg::getImgName, bo.getImgName()); lqw.eq(StringUtils.isNotBlank(bo.getImgCode()), SisPersonLibImg::getImgCode, bo.getImgCode()); lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), SisPersonLibImg::getImgUrl, bo.getImgUrl()); @@ -97,10 +115,80 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { @Override public Boolean insertByBo(SisPersonLibImgBo bo) { SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class); + // 生成编码 + add.setImgCode(CodePrefixConstants.PERSON_LIB_IMAGE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); validEntityBeforeSave(add); + + + long eqp_id; + long eqp_lib_id; + Integer eqp_lib_img_id; + String eqp_lib_img_url = ""; + try { + // 根据图片路径读取图片 + byte[] imageByte = Files.readAllBytes(Paths.get(bo.getImgUrl())); + + // TODO 新增E8人像 + if (bo.getIsSyncE8()) { + // 调用e8人像上传接口 + String url = vouchService.uploadFace(imageByte); + if (url == null) return false; + eqp_lib_img_url = url; + } + + // TODO 同步到宇视人像照片 + // 查询系统库与设备库的关联表 获取设备库Id + SisLibDeviceRefBo libDeviceRefBo = new SisLibDeviceRefBo(); + libDeviceRefBo.setLibId(bo.getLibId()); + List libDeviceRefVos = libDeviceRefService.queryList(libDeviceRefBo); + + if (libDeviceRefVos.isEmpty()) return false; + eqp_id = libDeviceRefVos.get(0).getEqpId(); + eqp_lib_id = libDeviceRefVos.get(0).getEqpLibId(); + + // 宇视鉴权信息 + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount("admin"); + systemInfo.setPassword("nc123456."); + systemInfo.setIp("47.109.37.87"); + systemInfo.setPort(4001); + + // 宇视添加人像 + UvModel.AddPersonParams addPersonParams = new UvModel.AddPersonParams(); + addPersonParams.setPerson_name(bo.getImgName()); + addPersonParams.setImage_base64(Base64.getEncoder().encodeToString(imageByte)); + addPersonParams.setLib_id(Math.toIntExact(eqp_lib_id)); + addPersonParams.setSex(Math.toIntExact(bo.getSex())); + addPersonParams.setEmail(bo.getEmail()); + addPersonParams.setTel(bo.getTel()); + addPersonParams.setCertificate_type(Math.toIntExact(bo.getCertificateType())); + addPersonParams.setCertificate_no(bo.getCertificateNo()); + addPersonParams.setBirth_date(bo.getBirthDate()); + + // 发起请求获取响应 + UvModel.AddPersonResult addPersonResult = unViewAiBoxApiService.addPerson(systemInfo, addPersonParams); + if (addPersonResult == null) return false; + eqp_lib_img_id = addPersonResult.getPerson_id(); + } catch (Exception e) { + return false; + } + + boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); + //TODO 写入关联表 + SisLibDeviceImgRefBo ref = new SisLibDeviceImgRefBo(); + ref.setLibId(bo.getLibId()); + ref.setImgId(add.getId()); + ref.setEqpId(eqp_id); + ref.setEqpLibId(eqp_lib_id); + ref.setEqpLibImgId(eqp_lib_img_id.longValue()); + // E8 + if(bo.getIsSyncE8()){ + ref.setEqpLibImgUrl(eqp_lib_img_url); + } + libDeviceImgRefService.insertByBo(ref); } return flag; } @@ -121,7 +209,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SisPersonLibImg entity){ + private void validEntityBeforeSave(SisPersonLibImg entity) { //TODO 做一些数据校验,如唯一约束 } @@ -134,8 +222,25 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 + List list = libDeviceImgRefService.queryListByImgIds(ids); + if(list.isEmpty()) return false; + Collection refIds = list.stream().map(SisLibDeviceImgRefVo::getId).toList(); + Integer[] refImgIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibImgId).map(Long::intValue).toArray(Integer[]::new); + + // 宇视鉴权信息 + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount("admin"); + systemInfo.setPassword("nc123456."); + systemInfo.setIp("47.109.37.87"); + systemInfo.setPort(4001); + + Boolean unViewFlag = unViewAiBoxApiService.batchDeletePerson(systemInfo, refImgIds); + if (!unViewFlag) return false; + + Boolean refFlag = libDeviceImgRefService.deleteWithValidByIds(refIds, true); + if (!refFlag) return false; } return baseMapper.deleteByIds(ids) > 0; } 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 bae0bd7..77b1c30 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 @@ -12,9 +12,14 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisPersonLib; +import org.dromara.sis.domain.bo.SisLibDeviceRefBo; import org.dromara.sis.domain.bo.SisPersonLibBo; +import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; +import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.sis.domain.vo.SisPersonLibVo; import org.dromara.sis.mapper.SisPersonLibMapper; +import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.unview.service.UnViewAiBoxApiService; import org.dromara.sis.service.ISisPersonLibService; import org.springframework.stereotype.Service; @@ -26,7 +31,7 @@ import java.util.Map; * 人像库Service业务层处理 * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Slf4j @Service @@ -34,6 +39,9 @@ import java.util.Map; public class SisPersonLibServiceImpl implements ISisPersonLibService { private final SisPersonLibMapper baseMapper; + private final UnViewAiBoxApiService unViewAiBoxApiService; + private final SisLibDeviceRefServiceImpl libDeviceRefService; + private final SisAccessControlDeviceServiceImpl accessControlDeviceService; /** * 查询人像库 @@ -95,13 +103,38 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { public Boolean insertByBo(SisPersonLibBo bo) { SisPersonLib add = MapstructUtils.convert(bo, SisPersonLib.class); // 生成库编码 - add.setLibCode(CodePrefixConstants.PERSONLIB_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); + add.setLibCode(CodePrefixConstants.PERSON_LIB_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); validEntityBeforeSave(add); + + + long eqp_lib_id = 0L; + // TODO 同步到宇视人像库 + if (bo.getEqbId() != null) { + SisAccessControlDeviceVo accessControlDevice = accessControlDeviceService.queryById(bo.getEqbId()); + + if (accessControlDevice == null) return false; + + // 同步到宇视盒子 + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount(accessControlDevice.getEqpAccount()); + systemInfo.setPassword(accessControlDevice.getEqpPwd()); + systemInfo.setIp(accessControlDevice.getEqpIp()); + systemInfo.setPort(Math.toIntExact(accessControlDevice.getEqpPort())); + UvModel.AddLibResult resp = unViewAiBoxApiService.addPersonLib(systemInfo, add.getLibName()); + if (resp == null) return false; + eqp_lib_id = resp.getLib_id().longValue(); + } + boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); //TODO 写入设备关联库 - + SisLibDeviceRefBo libDeviceRefBo = new SisLibDeviceRefBo(); + libDeviceRefBo.setLibId(add.getId()); + libDeviceRefBo.setEqpId(bo.getEqbId()); + libDeviceRefBo.setEqpLibId(eqp_lib_id); + libDeviceRefBo.setEqpLibState(1L); + libDeviceRefService.insertByBo(libDeviceRefBo); } return flag; @@ -138,6 +171,24 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 + List list = libDeviceRefService.queryListByLibId(ids); + if(list.isEmpty()) return false; + + Collection refIds = list.stream().map(SisLibDeviceRefVo::getId).toList(); + Integer[] refLibIds = list.stream().map(SisLibDeviceRefVo::getEqpLibId).map(Long::intValue).toArray(Integer[]::new); + + // 宇视鉴权信息 + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount("admin"); + systemInfo.setPassword("nc123456."); + systemInfo.setIp("47.109.37.87"); + systemInfo.setPort(4001); + + boolean unViewFlag = unViewAiBoxApiService.deletePersonLib(systemInfo, refLibIds); + if (!unViewFlag) return false; + + Boolean refFlag = libDeviceRefService.deleteWithValidByIds(refIds, true); + if (!refFlag) return false; } return baseMapper.deleteByIds(ids) > 0; } From 9b2904ad06d665a41f244d98d8283196f95197c0 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Fri, 27 Jun 2025 23:53:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(sis):=20-=20=E4=BA=BA=E5=83=8F?= =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C=E4=B8=8E=E5=AE=87=E8=A7=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=90=8C=E6=AD=A5=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=89=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=E5=90=8C=E6=AD=A5=E5=86=99=E5=85=A5/?= =?UTF-8?q?=E5=88=A0=E9=99=A4=20-=20=E4=BA=BA=E5=83=8F=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8E=E5=AE=87=E8=A7=86=E5=B9=B3=E5=8F=B0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=89=EF=BC=8C=E5=85=B3=E8=81=94=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=86=99=E5=85=A5/=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=90=8C=E6=AD=A5=E8=87=B3E8=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20-=20=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=94=B9?= =?UTF-8?q?=E4=B8=BAid=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) { From e13230dc4e8944638a2d0e37369f38007ec40b46 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Sat, 28 Jun 2025 00:50:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(sis):=20=20-=20=E4=BA=BA=E5=83=8F?= =?UTF-8?q?=E5=9B=BE=E7=89=87=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=EF=BC=8C=E5=8F=AF=E9=80=89=E5=90=8C=E6=AD=A5=E8=87=B3?= =?UTF-8?q?E8=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sis/service/ISisLibDeviceRefService.java | 8 - .../impl/SisLibDeviceRefServiceImpl.java | 12 -- .../impl/SisPersonLibImgServiceImpl.java | 190 +++++++++--------- 3 files changed, 100 insertions(+), 110 deletions(-) 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 4986b8a..f04edb1 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 @@ -76,14 +76,6 @@ public interface ISisLibDeviceRefService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - /** - * 根据系统库id列表，获取设备库列表 - * - * @param LibIds 系统图片id列表 - * @return 设备库列表 - */ - List queryListByLibId(Collection LibIds); - /** * 通过personlIB id 查询关联关系 * diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java index 04cf831..6f69e22 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java @@ -141,18 +141,6 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService { return baseMapper.deleteByIds(ids) > 0; } - /** - * 根据系统库id列表，获取设备库列表 - * - * @param LibIds 系统图片id列表 - * @return 设备库列表 - */ - public List queryListByLibId(Collection LibIds){ - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.in(SisLibDeviceRef::getLibId, LibIds); - return baseMapper.selectVoList(lqw); - } - @Override public List queryByLibIds(Collection ids) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); 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 135982d..ed32ce7 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,6 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import org.dromara.common.core.constant.CodePrefixConstants; import org.dromara.common.core.utils.MapstructUtils; @@ -11,28 +12,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisLibDeviceImgRefBo; import org.dromara.sis.domain.bo.SisLibDeviceRefBo; -import org.dromara.sis.domain.vo.SisLibDeviceImgRefVo; -import org.dromara.sis.domain.vo.SisLibDeviceRefVo; +import org.dromara.sis.domain.vo.*; import org.dromara.sis.sdk.e8.VoucherControlService; +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.ISisLibDeviceImgRefService; -import org.dromara.sis.service.ISisLibDeviceRefService; +import org.dromara.sis.service.*; import org.springframework.stereotype.Service; import org.dromara.sis.domain.bo.SisPersonLibImgBo; -import org.dromara.sis.domain.vo.SisPersonLibImgVo; import org.dromara.sis.domain.SisPersonLibImg; 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; -import java.util.Collection; +import java.util.*; /** * 人像信息Service业务层处理 @@ -47,9 +42,11 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { private final SisPersonLibImgMapper baseMapper; private final VoucherControlService vouchService; - private final UnViewAiBoxApiService unViewAiBoxApiService; + private final UnViewAiBoxApi unViewAiBoxApi; + private final ISisPersonLibService sisPersonLibService; private final ISisLibDeviceRefService libDeviceRefService; private final ISisLibDeviceImgRefService libDeviceImgRefService; + private final ISisAccessControlDeviceService sisAccessControlDeviceService; /** * 查询人像信息 @@ -115,80 +112,84 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { @Override public Boolean insertByBo(SisPersonLibImgBo bo) { SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class); + Assert.notNull(add, "数据处理失败"); // 生成编码 add.setImgCode(CodePrefixConstants.PERSON_LIB_IMAGE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); - validEntityBeforeSave(add); - - - long eqp_id; - long eqp_lib_id; - Integer eqp_lib_img_id; - String eqp_lib_img_url = ""; - try { - // 根据图片路径读取图片 - byte[] imageByte = Files.readAllBytes(Paths.get(bo.getImgUrl())); - - // TODO 新增E8人像 - if (bo.getIsSyncE8()) { - // 调用e8人像上传接口 - String url = vouchService.uploadFace(imageByte); - if (url == null) return false; - eqp_lib_img_url = url; - } - - // TODO 同步到宇视人像照片 - // 查询系统库与设备库的关联表 获取设备库Id - SisLibDeviceRefBo libDeviceRefBo = new SisLibDeviceRefBo(); - libDeviceRefBo.setLibId(bo.getLibId()); - List libDeviceRefVos = libDeviceRefService.queryList(libDeviceRefBo); - - if (libDeviceRefVos.isEmpty()) return false; - eqp_id = libDeviceRefVos.get(0).getEqpId(); - eqp_lib_id = libDeviceRefVos.get(0).getEqpLibId(); - - // 宇视鉴权信息 - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount("admin"); - systemInfo.setPassword("nc123456."); - systemInfo.setIp("47.109.37.87"); - systemInfo.setPort(4001); - - // 宇视添加人像 - UvModel.AddPersonParams addPersonParams = new UvModel.AddPersonParams(); - addPersonParams.setPerson_name(bo.getImgName()); - addPersonParams.setImage_base64(Base64.getEncoder().encodeToString(imageByte)); - addPersonParams.setLib_id(Math.toIntExact(eqp_lib_id)); - addPersonParams.setSex(Math.toIntExact(bo.getSex())); - addPersonParams.setEmail(bo.getEmail()); - addPersonParams.setTel(bo.getTel()); - addPersonParams.setCertificate_type(Math.toIntExact(bo.getCertificateType())); - addPersonParams.setCertificate_no(bo.getCertificateNo()); - addPersonParams.setBirth_date(bo.getBirthDate()); - - // 发起请求获取响应 - UvModel.AddPersonResult addPersonResult = unViewAiBoxApiService.addPerson(systemInfo, addPersonParams); - if (addPersonResult == null) return false; - eqp_lib_img_id = addPersonResult.getPerson_id(); - } catch (Exception e) { - return false; - } - - boolean flag = baseMapper.insert(add) > 0; + log.info("图片[{}]开始写入系统，result={}", add.getImgName(), flag); if (flag) { - bo.setId(add.getId()); - //TODO 写入关联表 - SisLibDeviceImgRefBo ref = new SisLibDeviceImgRefBo(); - ref.setLibId(bo.getLibId()); - ref.setImgId(add.getId()); - ref.setEqpId(eqp_id); - ref.setEqpLibId(eqp_lib_id); - ref.setEqpLibImgId(eqp_lib_img_id.longValue()); - // E8 - if(bo.getIsSyncE8()){ - ref.setEqpLibImgUrl(eqp_lib_img_url); + // 获取人像库关联设备Id + SisPersonLibVo libVo = sisPersonLibService.queryById(bo.getLibId()); + Assert.notNull(libVo, "人像库不存在，id=" + bo.getLibId()); + try { + + long eqp_id; + long eqp_lib_id; + Integer eqp_lib_img_id; + String eqp_lib_img_url = null; + // 根据图片路径读取图片 + byte[] imageByte = Files.readAllBytes(Paths.get(bo.getImgUrl())); + for (Long eqpId : libVo.getEqpIds()) { + // 查询设备信息 + SisAccessControlDeviceVo vo = sisAccessControlDeviceService.queryById(eqpId); + Assert.notNull(vo, "门禁控制设备不存在，id=" + eqpId); + log.info("准备写入{}门禁设备人像库", vo.getEqpNo()); + + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount(vo.getEqpAccount()); + systemInfo.setPassword(vo.getEqpPwd()); + systemInfo.setIp(vo.getEqpIp()); + systemInfo.setPort(vo.getEqpPort()); + + // 获取宇视线上库ID + SisLibDeviceRefBo refBo = new SisLibDeviceRefBo(); + refBo.setEqpId(eqpId); + refBo.setLibId(bo.getLibId()); + List refVo = libDeviceRefService.queryList(refBo); + Assert.notNull(refVo, "系统库与设备库关联关系不存在！libId:{},eqpId:{}", bo.getLibId(), eqpId); + eqp_lib_id = refVo.get(0).getEqpLibId(); + // 宇视添加人像 + UvModel.AddPersonParams addPersonParams = new UvModel.AddPersonParams(); + addPersonParams.setPerson_name(bo.getImgName()); + addPersonParams.setImage_base64(Base64.getEncoder().encodeToString(imageByte)); + addPersonParams.setLib_id(Math.toIntExact(eqp_lib_id)); + addPersonParams.setSex(bo.getSex()); + addPersonParams.setEmail(bo.getEmail()); + addPersonParams.setTel(bo.getTel()); + addPersonParams.setCertificate_type(bo.getCertificateType()); + addPersonParams.setCertificate_no(bo.getCertificateNo()); + addPersonParams.setBirth_date(bo.getBirthDate()); + + // 发起请求获取响应 + UvModel.AddPersonResult addPersonResult = unViewAiBoxApi.addPerson(systemInfo, addPersonParams); + Assert.notNull(addPersonResult, "图片上传宇视盒子失败"); + eqp_lib_img_id = addPersonResult.getPerson_id(); + + // TODO 新增E8人像 + if (bo.getIsSyncE8()) { + // 调用e8人像上传接口 + String url = vouchService.uploadFace(imageByte); + Assert.notNull(url, "图片上传E8平台失败"); + eqp_lib_img_url = url; + } + + SisLibDeviceImgRefBo ref = new SisLibDeviceImgRefBo(); + ref.setLibId(bo.getLibId()); + ref.setImgId(add.getId()); + ref.setEqpId(eqpId); + ref.setEqpLibId(eqp_lib_id); + ref.setEqpLibImgId(eqp_lib_img_id.longValue()); + // E8 + if (bo.getIsSyncE8()) { + ref.setEqpLibImgUrl(eqp_lib_img_url); + } + Boolean insert = libDeviceImgRefService.insertByBo(ref); + Assert.isTrue(insert, "写入图片关联关系表失败!"); + log.info("同步上传照片完成!"); + } + } catch (Exception e) { + return false; } - libDeviceImgRefService.insertByBo(ref); } return flag; } @@ -225,19 +226,28 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 List list = libDeviceImgRefService.queryListByImgIds(ids); - if(list.isEmpty()) return false; + if (list.isEmpty()) return false; Collection refIds = list.stream().map(SisLibDeviceImgRefVo::getId).toList(); + Collection refLibIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibId).toList(); Integer[] refImgIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibImgId).map(Long::intValue).toArray(Integer[]::new); - // 宇视鉴权信息 - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount("admin"); - systemInfo.setPassword("nc123456."); - systemInfo.setIp("47.109.37.87"); - systemInfo.setPort(4001); + List ls = libDeviceRefService.queryDeviceListByLibIds(refLibIds); - Boolean unViewFlag = unViewAiBoxApiService.batchDeletePerson(systemInfo, refImgIds); - if (!unViewFlag) return false; + ls.forEach(item -> { + UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); + systemInfo.setAccount(item.getEqpAccount()); + systemInfo.setPassword(item.getEqpPwd()); + systemInfo.setIp(item.getEqpIp()); + systemInfo.setPort(item.getEqpPort()); + + if (item.getEqpLibType() == 1){ + Boolean b = unViewAiBoxApi.batchDeletePerson(systemInfo, refImgIds); + log.info("删除宇视图片[{}]完成,result={}", refImgIds, b); + }else { + Boolean b = unViewAiBoxApi.deleteWorkClothes(systemInfo, item.getEqpLibId(), Arrays.stream(refImgIds).toList()); + log.info("删除宇视服装[{}]完成,result={}", refImgIds, b); + } + }); Boolean refFlag = libDeviceImgRefService.deleteWithValidByIds(refIds, true); if (!refFlag) return false;