fix 图片has值(根据文件名称来区分)

ruoyi-common/src/main/java/com/ruoyi/common/utils/FileHashUtil.java

@@ -9,6 +9,7 @@ import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.MessageDigest;
+import java.util.Objects;
 
 /**
  * @author Admin
@@ -119,7 +120,7 @@ public class FileHashUtil {
         byte[] uploadBytes = new byte[0];
         MessageDigest md5 = null;
         try {
-            uploadBytes = file.getBytes();
+            uploadBytes = Objects.requireNonNull(file.getOriginalFilename()).getBytes();
             md5 = MessageDigest.getInstance("MD5");
         } catch (Exception e) {
             e.printStackTrace();
@@ -133,7 +134,8 @@ public class FileHashUtil {
         byte[] uploadBytes = new byte[0];
         MessageDigest md5 = null;
         try {
-            uploadBytes = FileUtil.readBytes(file);
+            uploadBytes = Objects.requireNonNull(file.getName()).getBytes();
+            //uploadBytes = FileUtil.readBytes(file);
             md5 = MessageDigest.getInstance("MD5");
         } catch (Exception e) {
             e.printStackTrace();

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZbFileServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -74,24 +75,26 @@ public class ZbFileServiceImpl extends ServiceImpl<ZbFileMapper, ZbFile> impleme
     public boolean deletePicture(ZbFile zbFile) {
         try {
             Integer id = zbFile.getId();
-            if (id == null){
+            if (id == null) {
                 return false;
             }
             //判断图片存放地址是否为空
-            if (StringUtils.isEmpty(zbFile.getPath())){
+            if (StringUtils.isEmpty(zbFile.getPath())) {
                 zbFile = baseMapper.selectById(id);
             }
-            File file = new File(RuoYiConfig.getProfile() + File.separator + zbFile.getPath());
-            log.info("删除原始文件: " + file);
-            FileUtils.forceDelete(file);
-            String thumbnailPath = zbFile.getThumbnailPath();
-            if (StringUtils.isNotEmpty(thumbnailPath)){
-                File fileThumbnail = new File(RuoYiConfig.getProfile() + File.separator + thumbnailPath);
-                log.info("删除缩略图文件: " + fileThumbnail);
-                FileUtils.forceDelete(fileThumbnail);
+            if (ObjectUtil.isNotEmpty(zbFile)) {
+                File file = new File(RuoYiConfig.getProfile() + File.separator + zbFile.getPath());
+                log.info("删除原始文件: " + file);
+                FileUtils.forceDelete(file);
+                String thumbnailPath = zbFile.getThumbnailPath();
+                if (StringUtils.isNotEmpty(thumbnailPath)) {
+                    File fileThumbnail = new File(RuoYiConfig.getProfile() + File.separator + thumbnailPath);
+                    log.info("删除缩略图文件: " + fileThumbnail);
+                    FileUtils.forceDelete(fileThumbnail);
+                }
+                //删除数据库附件表信息
+                baseMapper.deleteById(id);
             }
-            //删除数据库附件表信息
-            baseMapper.deleteById(id);
         } catch (IOException e) {
             // TODO Auto-generated catch block
             log.info("删除文件失败");
@@ -102,21 +105,23 @@ public class ZbFileServiceImpl extends ServiceImpl<ZbFileMapper, ZbFile> impleme
 
     /**
      * 根据ids查询数据
+     *
      * @param fileIdsArr
      * @return
      */
     @Override
     public List<ZbFile> selectByIds(String[] fileIdsArr) {
-        return  baseMapper.selectByIds(fileIdsArr);
+        return baseMapper.selectByIds(fileIdsArr);
     }
 
     /**
      * 删除附件表信息
+     *
      * @param fileIdsArr
      * @return
      */
     @Override
     public Integer deleteByIds(String[] fileIdsArr) {
-        return  baseMapper.deleteByIds(fileIdsArr);
+        return baseMapper.deleteByIds(fileIdsArr);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZbGalleryServiceImpl.java

@@ -220,6 +220,7 @@ public class ZbGalleryServiceImpl extends ServiceImpl<ZbGalleryMapper, ZbGallery
             }
         }
         if (categoryId != null) {
+
             categorys = StrUtil.split(galleryCategoryService.getChildrens(categoryId), ',')
                     .stream().map(Long::valueOf).collect(Collectors.toList());
         }

ruoyi-system/src/main/resources/mapper/system/ZbGalleryMapper.xml

@@ -68,6 +68,7 @@
                 </if>
             </if>
         </where>
+        order by zg.create_time DESC
     </select>
 
     <resultMap id="GalleryDtoMap" type="com.ruoyi.system.dto.GalleryDto">