Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

# 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

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

@@ -38,11 +38,6 @@ public class SisPersonLibImg extends TenantEntity {
      */
     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

@@ -29,7 +29,7 @@ public class SisPersonLibImgBo extends BaseEntity {
     /**
      * 人员库编码
      */
-    @NotNull(message = "人像库Id不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "人像库id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long libId;
 
     /**
@@ -38,11 +38,6 @@ public class SisPersonLibImgBo extends BaseEntity {
     @NotBlank(message = "人像名称不能为空", groups = {AddGroup.class, EditGroup.class})
     private String imgName;
 
-    /**
-     * 图片编码
-     */
-    private String imgCode;
-
     /**
      * 图片的存储地址
      */

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

@@ -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

@@ -91,7 +91,6 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService {
         lqw.orderByAsc(SisPersonLibImg::getId);
         lqw.eq(bo.getLibId() != null, SisPersonLibImg::getLibId, bo.getLibId());
         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());

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

@@ -97,7 +97,6 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SisPersonLib> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(SisPersonLib::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getLibCode()), SisPersonLib::getLibCode, bo.getLibCode());
         lqw.like(StringUtils.isNotBlank(bo.getLibName()), SisPersonLib::getLibName, bo.getLibName());
         lqw.eq(StringUtils.isNotBlank(bo.getLibDesc()), SisPersonLib::getLibDesc, bo.getLibDesc());
         lqw.eq(bo.getLibType() != null, SisPersonLib::getLibType, bo.getLibType());
@@ -117,9 +116,8 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService {
     public Boolean insertByBo(SisPersonLibBo bo) {
         SisPersonLib add = MapstructUtils.convert(bo, SisPersonLib.class);
         Assert.notNull(add, "数据处理失败");
-        add.setLibCode(CodePrefixConstants.PERSON_LIB_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr());
         boolean flag = baseMapper.insert(add) > 0;
-        log.info("库[{}]开始写入系统，result={}", add.getLibCode(), flag);
+        log.info("库[{}]开始写入系统，result={}", add.getLibName(), flag);
         if (flag) {
             bo.setId(add.getId());
             for (Long eqpId : bo.getEqpIds()) {