diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisLibImgRefController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisLibImgRefController.java new file mode 100644 index 0000000..cb845f4 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisLibImgRefController.java @@ -0,0 +1,106 @@ +package org.dromara.sis.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.sis.domain.vo.SisLibImgRefVo; +import org.dromara.sis.domain.bo.SisLibImgRefBo; +import org.dromara.sis.service.ISisLibImgRefService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 人像库-人像图片关联 + * 前端访问路由地址为:/sis/libImgRef + * + * @author lsm + * @since 2025-07-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/libImgRef") +public class SisLibImgRefController extends BaseController { + + private final ISisLibImgRefService sisLibImgRefService; + + /** + * 查询人像库-人像图片关联列表 + */ + @SaCheckPermission("sis:libImgRef:list") + @GetMapping("/list") + public TableDataInfo list(SisLibImgRefBo bo, PageQuery pageQuery) { + return sisLibImgRefService.queryPageList(bo, pageQuery); + } + + /** + * 导出人像库-人像图片关联列表 + */ + @SaCheckPermission("sis:libImgRef:export") + @Log(title = "人像库-人像图片关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SisLibImgRefBo bo, HttpServletResponse response) { + List list = sisLibImgRefService.queryList(bo); + ExcelUtil.exportExcel(list, "人像库-人像图片关联", SisLibImgRefVo.class, response); + } + + /** + * 获取人像库-人像图片关联详细信息 + * + * @param libId 主键 + */ + @SaCheckPermission("sis:libImgRef:query") + @GetMapping("/{libId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("libId") Long libId) { + return R.ok(sisLibImgRefService.queryById(libId)); + } + + /** + * 新增人像库-人像图片关联 + */ + @SaCheckPermission("sis:libImgRef:add") + @Log(title = "人像库-人像图片关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SisLibImgRefBo bo) { + return toAjax(sisLibImgRefService.insertByBo(bo)); + } + + /** + * 修改人像库-人像图片关联 + */ + @SaCheckPermission("sis:libImgRef:edit") + @Log(title = "人像库-人像图片关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SisLibImgRefBo bo) { + return toAjax(sisLibImgRefService.updateByBo(bo)); + } + + /** + * 删除人像库-人像图片关联 + * + * @param libIds 主键串 + */ + @SaCheckPermission("sis:libImgRef:remove") + @Log(title = "人像库-人像图片关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{libIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("libIds") Long[] libIds) { + return toAjax(sisLibImgRefService.deleteWithValidByIds(List.of(libIds), true)); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/test.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/test.java new file mode 100644 index 0000000..82983e7 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/test.java @@ -0,0 +1,41 @@ +package org.dromara.sis.controller; + +import jakarta.annotation.Resource; +import org.dromara.sis.sdk.huawei.HuaWeiBoxApi; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Base64; + +/** + * @author lsm + * @apiNote test + * @since 2025/7/12 + */ +@RestController +@RequestMapping("/huawei") +public class test { + + @Resource + private HuaWeiBoxApi huaWeiBoxApi; + + @GetMapping("/test") + public Long huawei() { + Long a; + try { + byte[] imageByte = Files.readAllBytes(Paths.get("D:\\tool\\face\\2.png")); + + a = huaWeiBoxApi.findPerson(Base64.getEncoder().encodeToString(imageByte)); + } catch (IOException e) { + throw new RuntimeException(e); + } + + + return a; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java new file mode 100644 index 0000000..ed83e1c --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibImgRef.java @@ -0,0 +1,37 @@ +package org.dromara.sis.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 人像库-人像图片关联对象 sis_lib_img_ref + * + * @author lsm + * @since 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sis_lib_img_ref") +public class SisLibImgRef extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 人像库id + */ + @TableId(value = "lib_id") + private Long libId; + + /** + * 人像id + */ + @TableId(value = "img_id") + private Long imgId; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java new file mode 100644 index 0000000..9d6da3d --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibImgRefBo.java @@ -0,0 +1,36 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.SisLibImgRef; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 人像库-人像图片关联业务对象 sis_lib_img_ref + * + * @author lsm + * @since 2025-07-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SisLibImgRef.class, reverseConvertGenerate = false) +public class SisLibImgRefBo extends BaseEntity { + + /** + * 人像库id + */ + @NotNull(message = "人像库id不能为空", groups = {EditGroup.class, AddGroup.class}) + private Long libId; + + /** + * 人像id + */ + @NotNull(message = "人像id不能为空", groups = {EditGroup.class, AddGroup.class}) + private Long imgId; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java new file mode 100644 index 0000000..731ba77 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibImgRefVo.java @@ -0,0 +1,41 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.SisLibImgRef; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 人像库-人像图片关联视图对象 sis_lib_img_ref + * + * @author lsm + * @since 2025-07-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SisLibImgRef.class) +public class SisLibImgRefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 人像库id + */ + @ExcelProperty(value = "人像库id") + private Long libId; + + /** + * 人像id + */ + @ExcelProperty(value = "人像id") + private Long imgId; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java new file mode 100644 index 0000000..1fd6e0e --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisLibImgRefMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.SisLibImgRef; +import org.dromara.sis.domain.vo.SisLibImgRefVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 人像库-人像图片关联Mapper接口 + * + * @author lsm + * @since 2025-07-14 + */ +public interface SisLibImgRefMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java new file mode 100644 index 0000000..92028ea --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibImgRefService.java @@ -0,0 +1,68 @@ +package org.dromara.sis.service; + +import org.dromara.sis.domain.vo.SisLibImgRefVo; +import org.dromara.sis.domain.bo.SisLibImgRefBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 人像库-人像图片关联Service接口 + * + * @author lsm + * @since 2025-07-14 + */ +public interface ISisLibImgRefService { + + /** + * 查询人像库-人像图片关联 + * + * @param libId 主键 + * @return 人像库-人像图片关联 + */ + SisLibImgRefVo queryById(Long libId); + + /** + * 分页查询人像库-人像图片关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像库-人像图片关联分页列表 + */ + TableDataInfo queryPageList(SisLibImgRefBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人像库-人像图片关联列表 + * + * @param bo 查询条件 + * @return 人像库-人像图片关联列表 + */ + List queryList(SisLibImgRefBo bo); + + /** + * 新增人像库-人像图片关联 + * + * @param bo 人像库-人像图片关联 + * @return 是否新增成功 + */ + Boolean insertByBo(SisLibImgRefBo bo); + + /** + * 修改人像库-人像图片关联 + * + * @param bo 人像库-人像图片关联 + * @return 是否修改成功 + */ + Boolean updateByBo(SisLibImgRefBo bo); + + /** + * 校验并批量删除人像库-人像图片关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java new file mode 100644 index 0000000..24e9b05 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibImgRefServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.sis.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.springframework.stereotype.Service; +import org.dromara.sis.domain.bo.SisLibImgRefBo; +import org.dromara.sis.domain.vo.SisLibImgRefVo; +import org.dromara.sis.domain.SisLibImgRef; +import org.dromara.sis.mapper.SisLibImgRefMapper; +import org.dromara.sis.service.ISisLibImgRefService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人像库-人像图片关联Service业务层处理 + * + * @author lsm + * @since 2025-07-14 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SisLibImgRefServiceImpl implements ISisLibImgRefService { + + private final SisLibImgRefMapper baseMapper; + + /** + * 查询人像库-人像图片关联 + * + * @param libId 主键 + * @return 人像库-人像图片关联 + */ + @Override + public SisLibImgRefVo queryById(Long libId){ + return baseMapper.selectVoById(libId); + } + + /** + * 分页查询人像库-人像图片关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人像库-人像图片关联分页列表 + */ + @Override + public TableDataInfo queryPageList(SisLibImgRefBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的人像库-人像图片关联列表 + * + * @param bo 查询条件 + * @return 人像库-人像图片关联列表 + */ + @Override + public List queryList(SisLibImgRefBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SisLibImgRefBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(SisLibImgRef::getLibId); + lqw.orderByAsc(SisLibImgRef::getImgId); + return lqw; + } + + /** + * 新增人像库-人像图片关联 + * + * @param bo 人像库-人像图片关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SisLibImgRefBo bo) { + SisLibImgRef add = MapstructUtils.convert(bo, SisLibImgRef.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setLibId(add.getLibId()); + } + return flag; + } + + /** + * 修改人像库-人像图片关联 + * + * @param bo 人像库-人像图片关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SisLibImgRefBo bo) { + SisLibImgRef update = MapstructUtils.convert(bo, SisLibImgRef.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SisLibImgRef entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除人像库-人像图片关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}