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

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source 
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
This commit is contained in:
15683799673 2025-06-28 01:33:02 +08:00
commit 3721689ce7
21 changed files with 265 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java
View File

@ -4,12 +4,15 @@ public interface CodePrefixConstants {
/** /**
* 人像库编码前缀 * 人像库编码前缀
*/ */
String PERSONLIB_CODE_PREFIX = "100"; String PERSON_LIB_CODE_PREFIX = "100";
String PERSONLIBIMG_CODE_PREFIX = "101";
/** /**
* 门禁设备编码前缀 * 门禁设备编码前缀
*/ */
String SIS_DEVICE_CODE_PREFIX = "110"; String SIS_DEVICE_CODE_PREFIX = "101";
/**
* 人像编码前缀
*/
String PERSON_LIB_IMAGE_CODE_PREFIX = "102";
} }

4
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibController.java
View File

@ -75,7 +75,7 @@ public class SisPersonLibController extends BaseController {
@SaCheckPermission("sis:personLib:add") @SaCheckPermission("sis:personLib:add")
@Log(title = "人像库", businessType = BusinessType.INSERT) @Log(title = "人像库", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping("add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibBo bo) {
return toAjax(tbPersonLibService.insertByBo(bo)); return toAjax(tbPersonLibService.insertByBo(bo));
} }
@ -98,7 +98,7 @@ public class SisPersonLibController extends BaseController {
*/ */
@SaCheckPermission("sis:personLib:remove") @SaCheckPermission("sis:personLib:remove")
@Log(title = "人像库", businessType = BusinessType.DELETE) @Log(title = "人像库", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("del/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) { @PathVariable("ids") Long[] ids) {
return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true)); return toAjax(tbPersonLibService.deleteWithValidByIds(List.of(ids), true));

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisPersonLibImgController.java
View File

@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/sis/personLibImg * 前端访问路由地址为:/sis/personLibImg
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@ -75,7 +75,7 @@ public class SisPersonLibImgController extends BaseController {
@SaCheckPermission("sis:personLibImg:add") @SaCheckPermission("sis:personLibImg:add")
@Log(title = "人像信息", businessType = BusinessType.INSERT) @Log(title = "人像信息", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping("add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibImgBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SisPersonLibImgBo bo) {
return toAjax(tbPersonLibImgService.insertByBo(bo)); return toAjax(tbPersonLibImgService.insertByBo(bo));
} }
@ -98,7 +98,7 @@ public class SisPersonLibImgController extends BaseController {
*/ */
@SaCheckPermission("sis:personLibImg:remove") @SaCheckPermission("sis:personLibImg:remove")
@Log(title = "人像信息", businessType = BusinessType.DELETE) @Log(title = "人像信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("del/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) { @PathVariable("ids") Long[] ids) {
return toAjax(tbPersonLibImgService.deleteWithValidByIds(List.of(ids), true)); return toAjax(tbPersonLibImgService.deleteWithValidByIds(List.of(ids), true));

17
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceImgRef.java
View File

@ -28,19 +28,19 @@ public class SisLibDeviceImgRef extends TenantEntity {
private Long id; 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 * 设备库id
@ -52,4 +52,9 @@ public class SisLibDeviceImgRef extends TenantEntity {
*/ */
private Long eqpLibImgId; private Long eqpLibImgId;
/**
* e8图片地址
*/
private String eqpLibImgUrl;
} }

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java
View File

@ -12,7 +12,7 @@ import java.io.Serial;
* 系统库与设备库的关联对象 tb_lib_device_ref * 系统库与设备库的关联对象 tb_lib_device_ref
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -29,12 +29,12 @@ public class SisLibDeviceRef extends TenantEntity {
private Long id; private Long id;
/** /**
* 人员库编码 * 库Id
*/ */
private Long libId; private Long libId;
/** /**
* 设备编码 * 设备Id
*/ */
private Long eqpId; private Long eqpId;

7
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java
View File

@ -44,8 +44,7 @@ public class SisPersonLibImg extends TenantEntity {
private String imgUrl; private String imgUrl;
/** /**
* 性别 1：男 * 性别 1：男 2：女 99：未说明
2：女 99：未说明
*/ */
private Integer sex; private Integer sex;
@ -60,9 +59,7 @@ public class SisPersonLibImg extends TenantEntity {
private String tel; private String tel;
/** /**
* 证件类型 * 证件类型 1：身份证 2：护照3：行驶证 99：其它
1：身份证 2：护照
3：行驶证 99：其它
*/ */
private Integer certificateType; private Integer certificateType;

21
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
View File

@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 系统图片和设备图片的关联业务对象 tb_lib_device_img_ref * 系统图片和设备图片的关联业务对象 tb_lib_device_img_ref
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -29,20 +29,20 @@ public class SisLibDeviceImgRefBo extends BaseEntity {
/** /**
* 库编码 * 库编码
*/ */
@NotBlank(message = "库编码不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "库Id不能为空", groups = { AddGroup.class, EditGroup.class })
private String libCode; private Long libId;
/** /**
* 图片编码 * 图片Id
*/ */
@NotBlank(message = "图片编码不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "图片Id不能为空", groups = { AddGroup.class, EditGroup.class })
private String imgCode; private Long imgId;
/** /**
* 设备编码 * 设备编码
*/ */
@NotBlank(message = "设备编码不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
private String eqpCode; private Long eqpId;
/** /**
* 设备库id * 设备库id
@ -56,4 +56,9 @@ public class SisLibDeviceImgRefBo extends BaseEntity {
@NotNull(message = "设备库图片id不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "设备库图片id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long eqpLibImgId; private Long eqpLibImgId;
/**
* e8图片地址
*/
private String eqpLibImgUrl;
} }

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
View File

@ -5,6 +5,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.SisLibDeviceRef;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import jakarta.validation.constraints.*;
/** /**
* 系统库与设备库的关联业务对象 tb_lib_device_ref * 系统库与设备库的关联业务对象 tb_lib_device_ref
@ -20,28 +23,31 @@ public class SisLibDeviceRefBo extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id; private Long id;
/** /**
* 人员库编码 * 人员库编码
*/ */
@NotNull(message = "库Id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long libId; private Long libId;
/** /**
* 设备编码 * 设备编码
*/ */
@NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long eqpId; private Long eqpId;
/** /**
* 设备上的库id * 设备上的库id
*/ */
@NotNull(message = "设备上的库id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long eqpLibId; private Long eqpLibId;
private Integer eqpLibType;
/** /**
* 第三方设备库添加状态 1: 成功，2：失败 * 第三方设备库添加状态 1: 成功，2：失败
*/ */
@NotNull(message = "第三方设备库添加状态 1: 成功，2：失败不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer eqpLibState; private Integer eqpLibState;
} }

8
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* 人像库业务对象 tb_person_lib * 人像库业务对象 tb_person_lib
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -58,11 +58,15 @@ public class SisPersonLibBo extends BaseEntity {
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "libType", other = "sis_lib_type") @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "libType", other = "sis_lib_type")
private String libTypeName; private String libTypeName;
/** /**
* 库的业务类型 1: 门禁库，2: 黑名单库 * 库的业务类型 1: 门禁库，2: 黑名单库
*/ */
private Integer busiType = 1; private Integer busiType = 1;
/**
* 门禁设备id
*/
private Long eqbId;
} }

29
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
View File

@ -1,20 +1,19 @@
package org.dromara.sis.domain.bo; package org.dromara.sis.domain.bo;
import io.github.linpeilie.annotations.AutoMapper; import org.dromara.sis.domain.SisPersonLibImg;
import jakarta.validation.constraints.NotBlank; import org.dromara.common.mybatis.core.domain.BaseEntity;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper;
import org.dromara.sis.domain.SisPersonLibImg; import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/** /**
* 人像信息业务对象 tb_person_lib_img * 人像信息业务对象 tb_person_lib_img
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -36,6 +35,7 @@ public class SisPersonLibImgBo extends BaseEntity {
/** /**
* 人像名称 * 人像名称
*/ */
@NotBlank(message = "人像名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String imgName; private String imgName;
/** /**
@ -45,8 +45,7 @@ public class SisPersonLibImgBo extends BaseEntity {
private String imgUrl; private String imgUrl;
/** /**
* 性别 1：男 * 性别 1：男2：女 99：未说明
* 2：女 99：未说明
*/ */
private Integer sex; private Integer sex;
@ -61,9 +60,7 @@ public class SisPersonLibImgBo extends BaseEntity {
private String tel; private String tel;
/** /**
* 证件类型 * 证件类型、1：身份证 2：护照、3：行驶证 99：其它
* 1：身份证 2：护照
* 3：行驶证 99：其它
*/ */
private Integer certificateType; private Integer certificateType;
@ -76,4 +73,10 @@ public class SisPersonLibImgBo extends BaseEntity {
* 出生日期 * 出生日期
*/ */
private String birthDate; private String birthDate;
/**
* 同步E8
*/
private Boolean isSyncE8;
} }

20
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
View File

@ -14,7 +14,7 @@ import java.io.Serializable;
* 系统图片和设备图片的关联视图对象 tb_lib_device_img_ref * 系统图片和设备图片的关联视图对象 tb_lib_device_img_ref
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ -33,20 +33,20 @@ public class SisLibDeviceImgRefVo implements Serializable {
/** /**
* 库编码 * 库编码
*/ */
@ExcelProperty(value = "库编码") @ExcelProperty(value = "库Id")
private String libCode; private Long libId;
/** /**
* 图片编码 * 图片编码
*/ */
@ExcelProperty(value = "图片编码") @ExcelProperty(value = "图片Id")
private String imgCode; private Long imgId;
/** /**
* 设备编码 * 设备编码
*/ */
@ExcelProperty(value = "设备编码") @ExcelProperty(value = "设备id")
private String eqpCode; private Long eqpId;
/** /**
* 设备库id * 设备库id
@ -60,4 +60,10 @@ public class SisLibDeviceImgRefVo implements Serializable {
@ExcelProperty(value = "设备库图片id") @ExcelProperty(value = "设备库图片id")
private Long eqpLibImgId; private Long eqpLibImgId;
/**
* e8图片地址
*/
@ExcelProperty(value = "e8图片地址")
private String eqpLibImgUrl;
} }

14
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
View File

@ -1,9 +1,10 @@
package org.dromara.sis.domain.vo; package org.dromara.sis.domain.vo;
import org.dromara.sis.domain.SisLibDeviceRef;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.sis.domain.SisLibDeviceRef;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -13,7 +14,7 @@ import java.io.Serializable;
* 系统库与设备库的关联视图对象 tb_lib_device_ref * 系统库与设备库的关联视图对象 tb_lib_device_ref
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ -26,21 +27,25 @@ public class SisLibDeviceRefVo implements Serializable {
/** /**
* 主键id * 主键id
*/ */
@ExcelProperty(value = "主键id")
private Long id; private Long id;
/** /**
* 人员库id * 人员库id
*/ */
@ExcelProperty(value = "库Id")
private Long libId; private Long libId;
/** /**
* 设备表id * 设备表id
*/ */
@ExcelProperty(value = "设备Id")
private Long eqpId; private Long eqpId;
/** /**
* 设备上的库id * 设备上的库id
*/ */
@ExcelProperty(value = "设备上的库id")
private Long eqpLibId; private Long eqpLibId;
private Integer eqpLibType; private Integer eqpLibType;
@ -48,6 +53,9 @@ public class SisLibDeviceRefVo implements Serializable {
/** /**
* 第三方设备库添加状态 1: 成功，2：失败 * 第三方设备库添加状态 1: 成功，2：失败
*/ */
private Integer eqpLibState; @ExcelProperty(value = "第三方设备库添加状态 1: 成功，2：失败")
private Long eqpLibState;
} }

4
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
View File

@ -34,8 +34,8 @@ public class SisPersonLibImgVo implements Serializable {
/** /**
* 人员库编码 * 人员库编码
*/ */
@ExcelProperty(value = "人员库编码") @ExcelProperty(value = "人员库Id")
private Long libId; private String libId;
/** /**
* 人像名称 * 人像名称

1
ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibDeviceRefMapper.java
View File

@ -3,7 +3,6 @@ package org.dromara.sis.mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.SisLibDeviceRef;
import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.AccessControlLibDeviceBo;
import org.dromara.sis.domain.vo.SisAccessControlDeviceVo;
import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/model/UvModel.java
View File

@ -259,9 +259,9 @@ public class UvModel {
*/ */
private Integer lib_id; private Integer lib_id;
/** /**
* 性别 * 性别 1：男2：女 99：未说明
*/ */
private String sex; private Integer sex;
/** /**
* 邮件 * 邮件
*/ */
@ -275,7 +275,7 @@ public class UvModel {
* 证件类型 * 证件类型
* 1：身份证 2：护照 3：行驶证 99：其它 * 1：身份证 2：护照 3：行驶证 99：其它
*/ */
private String certificate_type; private Integer certificate_type;
/** /**
* 证件号码 * 证件号码
*/ */

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceImgRefService.java
View File

@ -12,7 +12,7 @@ import java.util.List;
* 系统图片和设备图片的关联Service接口 * 系统图片和设备图片的关联Service接口
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
public interface ISisLibDeviceImgRefService { public interface ISisLibDeviceImgRefService {
@ -65,4 +65,12 @@ public interface ISisLibDeviceImgRefService {
* @return 是否删除成功 * @return 是否删除成功
*/ */
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid); Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 根据系统图片id列表，获取设备图片列表
*
* @param imgIds 系统图片id列表
* @return 设备图片列表
*/
List<SisLibDeviceImgRefVo> queryListByImgIds(Collection<Long> imgIds);
} }

3
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
View File

@ -5,7 +5,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.SisLibDeviceRef;
import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.AccessControlLibDeviceBo;
import org.dromara.sis.domain.bo.SisLibDeviceRefBo; import org.dromara.sis.domain.bo.SisLibDeviceRefBo;
import org.dromara.sis.domain.vo.SisAccessControlDeviceVo;
import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo;
import java.util.Collection; import java.util.Collection;
@ -15,7 +14,7 @@ import java.util.List;
* 系统库与设备库的关联Service接口 * 系统库与设备库的关联Service接口
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
public interface ISisLibDeviceRefService { public interface ISisLibDeviceRefService {

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

@ -40,7 +40,7 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService
* @return 系统图片和设备图片的关联 * @return 系统图片和设备图片的关联
*/ */
@Override @Override
public SisLibDeviceImgRefVo queryById(Long id){ public SisLibDeviceImgRefVo queryById(Long id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
@ -74,12 +74,11 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SisLibDeviceImgRef> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SisLibDeviceImgRef> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisLibDeviceImgRef::getId); lqw.orderByAsc(SisLibDeviceImgRef::getId);
lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), SisLibDeviceImgRef::getLibCode, bo.getLibCode()); lqw.eq(bo.getLibId() != null, SisLibDeviceImgRef::getLibId, bo.getLibId());
lqw.eq(StringUtils.isNotBlank(bo.getImgCode()), SisLibDeviceImgRef::getImgCode, bo.getImgCode()); lqw.eq(bo.getImgId() != null, SisLibDeviceImgRef::getImgId, bo.getImgId());
lqw.eq(StringUtils.isNotBlank(bo.getEqpCode()), SisLibDeviceImgRef::getEqpCode, bo.getEqpCode()); lqw.eq(bo.getEqpId() != null, SisLibDeviceImgRef::getEqpId, bo.getEqpId());
lqw.eq(bo.getEqpLibId() != null, SisLibDeviceImgRef::getEqpLibId, bo.getEqpLibId()); lqw.eq(bo.getEqpLibId() != null, SisLibDeviceImgRef::getEqpLibId, bo.getEqpLibId());
lqw.eq(bo.getEqpLibImgId() != null, SisLibDeviceImgRef::getEqpLibImgId, bo.getEqpLibImgId()); lqw.eq(bo.getEqpLibImgId() != null, SisLibDeviceImgRef::getEqpLibImgId, bo.getEqpLibImgId());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisLibDeviceImgRef::getSearchValue, bo.getSearchValue());
return lqw; return lqw;
} }
@ -116,7 +115,7 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(SisLibDeviceImgRef entity){ private void validEntityBeforeSave(SisLibDeviceImgRef entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
@ -129,9 +128,22 @@ public class SisLibDeviceImgRefServiceImpl implements ISisLibDeviceImgRefService
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
/**
* 根据系统图片id列表，获取设备图片列表
*
* @param imgIds 系统图片id列表
* @return 设备图片列表
*/
@Override
public List<SisLibDeviceImgRefVo> queryListByImgIds(Collection<Long> imgIds){
LambdaQueryWrapper<SisLibDeviceImgRef> lqw = Wrappers.lambdaQuery();
lqw.in(SisLibDeviceImgRef::getImgId, imgIds);
return baseMapper.selectVoList(lqw);
}
} }

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

@ -26,7 +26,7 @@ import java.util.Map;
* 系统库与设备库的关联Service业务层处理 * 系统库与设备库的关联Service业务层处理
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor

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

@ -1,32 +1,39 @@
package org.dromara.sis.service.impl; package org.dromara.sis.service.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CodePrefixConstants; import org.dromara.common.core.constant.CodePrefixConstants;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; 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.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.SisPersonLibImg; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.sis.domain.bo.SisPersonLibImgBo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.sis.domain.vo.SisPersonLibImgVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.dromara.sis.mapper.SisPersonLibImgMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.dromara.sis.service.ISisPersonLibImgService; 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.*;
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.service.*;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.sis.domain.bo.SisPersonLibImgBo;
import org.dromara.sis.domain.SisPersonLibImg;
import org.dromara.sis.mapper.SisPersonLibImgMapper;
import java.util.Collection; import java.nio.file.Files;
import java.util.List; import java.nio.file.Paths;
import java.util.Map; import java.util.*;
/** /**
* 人像信息Service业务层处理 * 人像信息Service业务层处理
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@ -34,6 +41,12 @@ import java.util.Map;
public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
private final SisPersonLibImgMapper baseMapper; private final SisPersonLibImgMapper baseMapper;
private final VoucherControlService vouchService;
private final UnViewAiBoxApi unViewAiBoxApi;
private final ISisPersonLibService sisPersonLibService;
private final ISisLibDeviceRefService libDeviceRefService;
private final ISisLibDeviceImgRefService libDeviceImgRefService;
private final ISisAccessControlDeviceService sisAccessControlDeviceService;
/** /**
* 查询人像信息 * 查询人像信息
@ -76,6 +89,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SisPersonLibImg> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SisPersonLibImg> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisPersonLibImg::getId); lqw.orderByAsc(SisPersonLibImg::getId);
lqw.eq(bo.getLibId() != null, SisPersonLibImg::getLibId, bo.getLibId());
lqw.like(StringUtils.isNotBlank(bo.getImgName()), SisPersonLibImg::getImgName, bo.getImgName()); lqw.like(StringUtils.isNotBlank(bo.getImgName()), SisPersonLibImg::getImgName, bo.getImgName());
lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), SisPersonLibImg::getImgUrl, bo.getImgUrl()); lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), SisPersonLibImg::getImgUrl, bo.getImgUrl());
lqw.eq(bo.getSex() != null, SisPersonLibImg::getSex, bo.getSex()); lqw.eq(bo.getSex() != null, SisPersonLibImg::getSex, bo.getSex());
@ -97,10 +111,84 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
@Override @Override
public Boolean insertByBo(SisPersonLibImgBo bo) { public Boolean insertByBo(SisPersonLibImgBo bo) {
SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class); SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class);
validEntityBeforeSave(add); Assert.notNull(add, "数据处理失败");
// 生成编码
add.setImgCode(CodePrefixConstants.PERSON_LIB_IMAGE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr());
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
log.info("图片[{}]开始写入系统，result={}", add.getImgName(), flag);
if (flag) { if (flag) {
bo.setId(add.getId()); // 获取人像库关联设备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<SisLibDeviceRefVo> 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;
}
} }
return flag; return flag;
} }
@ -136,6 +224,32 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) { if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
List<SisLibDeviceImgRefVo> list = libDeviceImgRefService.queryListByImgIds(ids);
if (list.isEmpty()) return false;
Collection<Long> refIds = list.stream().map(SisLibDeviceImgRefVo::getId).toList();
Collection<Long> refLibIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibId).toList();
Integer[] refImgIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibImgId).map(Long::intValue).toArray(Integer[]::new);
List<AccessControlLibDeviceBo> ls = libDeviceRefService.queryDeviceListByLibIds(refLibIds);
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;
} }
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }

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

@ -1,8 +1,8 @@
package org.dromara.sis.service.impl; package org.dromara.sis.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -38,7 +38,7 @@ import java.util.Map;
* 人像库Service业务层处理 * 人像库Service业务层处理
* *
* @author mocheng * @author mocheng
* @date 2025-06-24 * @since 2025-06-24
*/ */
@Slf4j @Slf4j
@Service @Service
@ -46,10 +46,9 @@ import java.util.Map;
public class SisPersonLibServiceImpl implements ISisPersonLibService { public class SisPersonLibServiceImpl implements ISisPersonLibService {
private final SisPersonLibMapper baseMapper; private final SisPersonLibMapper baseMapper;
private final UnViewAiBoxApi unViewAiBoxApi;
private final ISisLibDeviceRefService sisLibDeviceRefService; private final ISisLibDeviceRefService sisLibDeviceRefService;
private final ISisAccessControlDeviceService sisAccessControlDeviceService; private final ISisAccessControlDeviceService sisAccessControlDeviceService;
private final UnViewAiBoxApi unViewAiBoxApi;
/** /**
* 查询人像库 * 查询人像库