人像库图片完成

pom.xml

@@ -69,7 +69,7 @@
 
     <profiles>
         <profile>
-            <id>localhost</id>
+            <id>local</id>
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>

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;
-
     /**
      * 人员库名称
      */

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;
-
     /**
      * 图片的存储地址
      */

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;
-
     /**
      * 人员库名称
      */

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})
+    @NotNull(message = "人像库id不能为空", groups = {AddGroup.class, EditGroup.class})
-    private String libCode;
+    private Long libId;
 
     /**
      * 人像名称
      */
     private String imgName;
 
-    /**
-     * 图片编码
-     */
-    private String imgCode;
-
     /**
      * 图片的存储地址
      */

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;
-
     /**
      * 图片的存储地址
      */

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;
-
     /**
      * 人员库名称
      */

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

@@ -76,9 +76,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SisPersonLibImg> 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) {