修改报错
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
15683799673 2025-06-27 17:54:38 +08:00
parent b4f2dfd632
commit f85f2a75e0
4 changed files with 36 additions and 24 deletions

View File

@ -6,8 +6,10 @@ public interface CodePrefixConstants {
*/ */
String PERSONLIB_CODE_PREFIX = "100"; String PERSONLIB_CODE_PREFIX = "100";
String PERSONLIBIMG_CODE_PREFIX = "101";
/** /**
* 门禁设备编码前缀 * 门禁设备编码前缀
*/ */
String SIS_DEVICE_CODE_PREFIX = "101"; String SIS_DEVICE_CODE_PREFIX = "110";
} }

View File

@ -1,13 +1,14 @@
package org.dromara.sis.domain.bo; package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisPersonLibImg;
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 io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.SisPersonLibImg;
/** /**
* 人像信息业务对象 tb_person_lib_img * 人像信息业务对象 tb_person_lib_img
@ -23,19 +24,18 @@ public class SisPersonLibImgBo extends BaseEntity {
/** /**
* 主键id * 主键id
*/ */
@NotNull(message = "主键id不能为空", groups = { EditGroup.class }) @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
private Long id; private Long id;
/** /**
* 人员库编码 * 人员库编码
*/ */
@NotBlank(message = "人员库编码不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "人像库编码不能为空", groups = {AddGroup.class, EditGroup.class})
private String libCode; private String libCode;
/** /**
* 人像名称 * 人像名称
*/ */
@NotBlank(message = "人像名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String imgName; private String imgName;
/** /**
@ -46,12 +46,12 @@ public class SisPersonLibImgBo extends BaseEntity {
/** /**
* 图片的存储地址 * 图片的存储地址
*/ */
@NotBlank(message = "图片的存储地址不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "图片的存储地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String imgUrl; private String imgUrl;
/** /**
* 性别 1 * 性别 1
2 99未说明 * 2 99未说明
*/ */
private Long sex; private Long sex;
@ -67,8 +67,8 @@ public class SisPersonLibImgBo extends BaseEntity {
/** /**
* 证件类型 * 证件类型
1身份证 2护照 * 1身份证 2护照
3行驶证 99其它 * 3行驶证 99其它
*/ */
private Long certificateType; private Long certificateType;

View File

@ -138,4 +138,9 @@ public class SisLibDeviceRefServiceImpl implements ISisLibDeviceRefService {
} }
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
@Override
public List<SisLibDeviceRefVo> queryByIds(Collection<Long> ids) {
return List.of();
}
} }

View File

@ -1,24 +1,26 @@
package org.dromara.sis.service.impl; package org.dromara.sis.service.impl;
import org.dromara.common.core.utils.MapstructUtils; import cn.hutool.core.util.IdUtil;
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.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 lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.sis.domain.SisPersonLibImg;
import org.dromara.sis.domain.bo.SisPersonLibImgBo; import org.dromara.sis.domain.bo.SisPersonLibImgBo;
import org.dromara.sis.domain.vo.SisPersonLibImgVo; import org.dromara.sis.domain.vo.SisPersonLibImgVo;
import org.dromara.sis.domain.SisPersonLibImg;
import org.dromara.sis.mapper.SisPersonLibImgMapper; import org.dromara.sis.mapper.SisPersonLibImgMapper;
import org.dromara.sis.service.ISisPersonLibImgService; import org.dromara.sis.service.ISisPersonLibImgService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection;
/** /**
* 人像信息Service业务层处理 * 人像信息Service业务层处理
@ -40,7 +42,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
* @return 人像信息 * @return 人像信息
*/ */
@Override @Override
public SisPersonLibImgVo queryById(Long id){ public SisPersonLibImgVo queryById(Long id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
@ -97,6 +99,9 @@ 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);
// 生成图片编码
String s = CodePrefixConstants.PERSONLIBIMG_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr();
add.setImgCode(s);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
@ -121,7 +126,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(SisPersonLibImg entity){ private void validEntityBeforeSave(SisPersonLibImg entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
@ -134,7 +139,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
*/ */
@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;