From 18f37be0d51b9b2dbed56194f07d02cc7819f684 Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Sat, 28 Jun 2025 01:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=83=8F=E5=BA=93=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../main/java/org/dromara/sis/domain/SisPersonLib.java | 5 ----- .../java/org/dromara/sis/domain/SisPersonLibImg.java | 7 +------ .../java/org/dromara/sis/domain/bo/SisPersonLibBo.java | 3 --- .../org/dromara/sis/domain/bo/SisPersonLibImgBo.java | 9 ++------- .../org/dromara/sis/domain/vo/SisPersonLibImgVo.java | 8 +------- .../java/org/dromara/sis/domain/vo/SisPersonLibVo.java | 6 ------ .../sis/service/impl/SisPersonLibImgServiceImpl.java | 5 ----- 8 files changed, 5 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 1f8d7af..1bc0e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ - localhost + local dev diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java index 6f3241d..566e8a8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java @@ -28,11 +28,6 @@ public class SisPersonLib extends TenantEntity { @TableId(value = "id") private Long id; - /** - * 人员库编码 - */ - private String libCode; - /** * 人员库名称 */ 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 f4b5748..7d14a27 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,18 +31,13 @@ public class SisPersonLibImg extends TenantEntity { /** * 人员库编码 */ - private String libCode; + private Long libId; /** * 人像名称 */ private String imgName; - /** - * 图片编码 - */ - private String imgCode; - /** * 图片的存储地址 */ 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 42557bd..2aa0d9f 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 @@ -30,9 +30,6 @@ public class SisPersonLibBo extends BaseEntity { */ @NotNull(message = "主键id不能为空", groups = {EditGroup.class}) private Long id; - - private String libCode; - /** * 人员库名称 */ 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 ff9d722..8cc7098 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 @@ -30,19 +30,14 @@ public class SisPersonLibImgBo extends BaseEntity { /** * 人员库编码 */ - @NotNull(message = "人像库编码不能为空", groups = {AddGroup.class, EditGroup.class}) - private String libCode; + @NotNull(message = "人像库id不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long libId; /** * 人像名称 */ private String imgName; - /** - * 图片编码 - */ - private String imgCode; - /** * 图片的存储地址 */ 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 340485e..6193164 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 @@ -35,7 +35,7 @@ public class SisPersonLibImgVo implements Serializable { * 人员库编码 */ @ExcelProperty(value = "人员库编码") - private String libCode; + private Long libId; /** * 人像名称 @@ -43,12 +43,6 @@ public class SisPersonLibImgVo implements Serializable { @ExcelProperty(value = "人像名称") private String imgName; - /** - * 图片编码 - */ - @ExcelProperty(value = "图片编码") - private String imgCode; - /** * 图片的存储地址 */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java index bce51cf..569928c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java @@ -31,12 +31,6 @@ public class SisPersonLibVo implements Serializable { @ExcelProperty(value = "主键id") private Long id; - /** - * 人员库编码 - */ - @ExcelProperty(value = "人员库编码") - private String libCode; - /** * 人员库名称 */ 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 a439cb3..d94c765 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 @@ -76,9 +76,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.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()); lqw.eq(bo.getSex() != null, SisPersonLibImg::getSex, bo.getSex()); lqw.eq(StringUtils.isNotBlank(bo.getEmail()), SisPersonLibImg::getEmail, bo.getEmail()); @@ -99,9 +97,6 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { @Override public Boolean insertByBo(SisPersonLibImgBo bo) { SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class); - // 生成图片编码 - String s = CodePrefixConstants.PERSONLIBIMG_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr(); - add.setImgCode(s); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) {