2022年9月30日14:19:51 防止同名主题封面文件被误删除

王明元
1 parent 24dbfaa6
Showing 7 changed files with 31 additions and 24 deletions
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/app/OtherController.java
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/common/DataExchangeController.java
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/OtherTask.java
fw-dalaran-server/src/main/resources/application-local.yml
fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/CommonBizService.java
fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java
fw-dalaran-service/src/main/test/example/ImageListener.java
@@ -97,7 +97,7 @@ public class OtherController {
             handleType = "删除";
             if (file.isDirectory())
                 result = common.deleteAllFile(dir, file);
-            else if(file.isFile())
+            else if (file.isFile())
                 result = file.delete();
         }
         log.info(String.format("%s文件或文件夹, 路径为: %s, 结果为: %s", handleType, dir, Objects.isNull(result) ? "未执行" : (result ? "成功" : "失败")));
@@ -117,6 +117,7 @@ public class DataExchangeController {
      * 计算图片相似度
      *
      * @param theme    主题名
+     * @param themeId  主题id
      * @param fid      服务器图片id
      * @param coverUrl 作品封面图地址
      * @param itemId   作品id
@@ -125,8 +126,8 @@ public class DataExchangeController {
      * @throws Exception
      */
     @GetMapping("/calcSimilarity")
-    public Message<BigDecimal> calcSimilarity(String theme, String fid, String coverUrl, String account, String itemId, Integer type) throws Exception {
-        return success(commonBizService.validCover(theme, fid, coverUrl, account, itemId, type));
+    public Message<BigDecimal> calcSimilarity(String theme, Long themeId, String fid, String coverUrl, String account, String itemId, Integer type) throws Exception {
+        return success(commonBizService.validCover(theme, themeId, fid, coverUrl, account, itemId, type));
     }
     /**
@@ -32,7 +32,7 @@ public class OtherTask {
     /**
      * 每天都找已经停止抓数据7天及其更久的主题, 删除缓存封面图
      */
-    @Scheduled(fixedRate = 15 * 60 * 1000, initialDelay = 5 * 1000)
+    @Scheduled(fixedRate = 60 * 60 * 1000, initialDelay = 5 * 1000)
     public void deleteCoverFiles() {
         final List<ActivityTheme> themeList = activityThemeService.lambdaQuery()
                 .list()
@@ -47,7 +47,10 @@ public class OtherTask {
             sb.append(tempDir);
             sb.append("activityTheme");
             sb.append(File.separator);
+            sb.append(item.getId());
+            sb.append("「");
             sb.append(item.getTheme());
+            sb.append("」");
             String dirPath = sb.toString();
             File file = new File(dirPath);
             if (file.isDirectory())
@@ -20,6 +20,6 @@ rocketmq:
   name-srv-addr: 172.26.154.169:9876
   producer-group: ${spring.application.name}
 task:
-  switch: 'on'
+  switch: 'off'
 file-server-addr: 'http://testgate.feewee.cn/file/show?fid='
@@ -214,7 +214,7 @@ public class CommonBizService {
                         .list();
                 for (ThemeFile themeFile : list) {
                     try {
-                        final BigDecimal coverSimilarity = this.validCover(activityTheme.getTheme(), themeFile.getFileId(), videoCover, accountNo, videoId, 1);
+                        final BigDecimal coverSimilarity = this.validCover(activityTheme.getTheme(), themeFile.getThemeId(), themeFile.getFileId(), videoCover, accountNo, videoId, 1);
                         if (validCover = coverSimilarity.compareTo(rate) >= 0)
                             break;
                     } catch (Exception e) {
@@ -491,7 +491,7 @@ public class CommonBizService {
                     .list();
             for (ThemeFile themeFile : list) {
                 try {
-                    final BigDecimal coverSimilarity = this.validCover(activityTheme.getTheme(), themeFile.getFileId(), liveCover, accountNo, roomNo, 2);
+                    final BigDecimal coverSimilarity = this.validCover(activityTheme.getTheme(), activityTheme.getId(), themeFile.getFileId(), liveCover, accountNo, roomNo, 2);
                     if (validCover = coverSimilarity.compareTo(rate) >= 0)
                         break;
                 } catch (Exception e) {
@@ -959,6 +959,7 @@ public class CommonBizService {
      * 验证封面匹配度
      *
      * @param theme    主题名
+     * @param themeId  主题id
      * @param fileId   文件id(主题配置指定封面图文件)
      * @param coverUrl 用户作品封面图地址
      * @param account  账户号
@@ -967,20 +968,20 @@ public class CommonBizService {
      * @return 封面图匹配度
      * @throws Exception
      */
-    public BigDecimal validCover(String theme, String fileId, String coverUrl, String account, String itemId, Integer type) throws Exception {
+    public BigDecimal validCover(String theme, Long themeId, String fileId, String coverUrl, String account, String itemId, Integer type) throws Exception {
         int[][] imagePixArr1;// 图片1的像素数组
         int[][] imagePixArr2;// 图片2的像素数组
-        File imageFile1 = this.findLocalCacheImageTheme(theme, fileId);
+        File imageFile1 = this.findLocalCacheImageTheme(theme, themeId, fileId);
         imagePixArr1 = ImageUtils.readImagePixel(imageFile1);
         File imageFile2;
-        File localCacheImage = this.findLocalCacheImageUser(theme, account, itemId, type);
+        File localCacheImage = this.findLocalCacheImageUser(theme, themeId, account, itemId, type);
         if (Objects.nonNull(localCacheImage)) {
             imageFile2 = localCacheImage;
         } else {
             imageFile2 = ImageUtils.convertFileByUrl(coverUrl, itemId);
             String tempDir = common.getActivityThemeCoverDir();
             File file = new File(ImageUtils.modifyResolution1(imageFile2.getPath(),
-                    tempDir + "activityTheme" + File.separator + theme + File.separator + account + File.separator + (Objects.equals(type, 1) ? "video" : "live"),
+                    tempDir + "activityTheme" + File.separator + themeId + "「" + theme + "」" + File.separator + account + File.separator + (Objects.equals(type, 1) ? "video" : "live"),
                     "fw_theme_cover_" + itemId,
                     512, 512));
             if (imageFile2.delete()) {
@@ -996,13 +997,14 @@ public class CommonBizService {
      * 获取本地已下载的封面图(用户作品封面图)
      *
      * @param theme   主题名
+     * @param themeId 主题id
      * @param account 账号
      * @param itemId  视频id/直播间id
      * @param type    1:视频, 2:直播
      */
-    private File findLocalCacheImageUser(String theme, String account, String itemId, Integer type) {
+    private File findLocalCacheImageUser(String theme, Long themeId, String account, String itemId, Integer type) {
         String tempDir = common.getActivityThemeCoverDir();
-        File file = new File(tempDir + File.separator + "activityTheme" + File.separator + theme + File.separator + account + File.separator + (Objects.equals(type, 1) ? "video" : "live"));
+        File file = new File(tempDir + File.separator + "activityTheme" + File.separator + themeId + "「" + theme + "」" + File.separator + account + File.separator + (Objects.equals(type, 1) ? "video" : "live"));
         if (!file.exists()) {
             boolean mkdirs = file.mkdirs();
             if (mkdirs)
@@ -1021,12 +1023,13 @@ public class CommonBizService {
     /**
      * 获取本地已下载的主题背景图
      *
-     * @param theme  主题名
-     * @param fileId 文件id(主题配置指定封面图文件)
+     * @param theme   主题名
+     * @param themeId 主题id
+     * @param fileId  文件id(主题配置指定封面图文件)
      */
-    private File findLocalCacheImageTheme(String theme, String fileId) {
+    private File findLocalCacheImageTheme(String theme, Long themeId, String fileId) {
         String tempDir = common.getActivityThemeCoverDir();
-        File file = new File(tempDir + "activityTheme" + File.separator + theme + File.separator + "settingCover");
+        File file = new File(tempDir + "activityTheme" + File.separator + themeId + "「" + theme + "」" + File.separator + "settingCover");
         if (!file.exists()) {
             boolean mkdirs = file.mkdirs();
             if (mkdirs)
@@ -99,7 +99,7 @@ public class ActivityThemeServiceImpl extends ServiceImpl&lt;ActivityThemeDao, Acti
             return true;
         } else {
             shopIds1.retainAll(shopIds2);
-            return shopIds1.size() > 0;
+            return !shopIds1.isEmpty();
         }
     }
@@ -346,7 +346,7 @@ public class ActivityThemeServiceImpl extends ServiceImpl&lt;ActivityThemeDao, Acti
                         .type(item.getType())
                         .build())
                 .collect(Collectors.toList());
-        if (fileList.size() > 0)
+        if (!fileList.isEmpty())
             return themeFileService.saveBatch(fileList);
         return true;
     }
@@ -365,7 +365,7 @@ public class ActivityThemeServiceImpl extends ServiceImpl&lt;ActivityThemeDao, Acti
                 String fileId = item.getFid();
                 File downloadFile = ImageUtils.convertFileByUrl(serverAddr + fileId, fileId);
                 ImageUtils.modifyResolution1(downloadFile.getPath(),
-                        tempDir + "activityTheme" + File.separator + activityTheme.getTheme() + File.separator + "settingCover",
+                        tempDir + "activityTheme" + File.separator + activityTheme.getId() + "「" + activityTheme.getTheme() + "」" + File.separator + "settingCover",
                         "fw_theme_cover_" + fileId,
                         512, 512);
                 boolean result = downloadFile.delete();
@@ -19,13 +19,13 @@ public class ImageListener implements ActionListener {
     }
     public ImageListener() throws Exception {
-        File imageFile1 = ImageUtils.convertFileByUrl("https://p2.a.yximgs.com/upic/2022/07/02/18/BMjAyMjA3MDIxODQyNDVfMTA2MjU5OTU5MV83ODE2MDkwNTkzMF8yXzM=_B50b9301c2d61ea0faf60a882a60cd336.jpg?tag=1-1656909189-nil-0-b9qwvimwnk-c1383d641aa55e8e&clientCacheKey=3x62tedv27b8a39.jpg&di=6f711692&bp=10000");
-        File imageFile2 = ImageUtils.convertFileByUrl("http://gate.feewee.cn/file/show?fid=f19fd7afd5504b0f919b1f806bbe0a2a");
+        File imageFile1 = ImageUtils.convertFileByUrl("https://gate.feewee.cn/file/show?fid=e1d71b45dd0e4d73bde25afc3e260de5");
+        File imageFile2 = ImageUtils.convertFileByUrl("https://gate.feewee.cn/file/show?fid=7dfedbed8996443584b6b2221b79235e");
         //File imageFile2 = ImageUtils.convertFileByUrl("https://p2.a.yximgs.com/upic/2022/01/20/20/BMjAyMjAxMjAyMDEyMTZfNDcwOTM0NDgyXzY1MzMwMDA5Mjk0XzJfMw==_B0296c8ed5afa94b9b7a06dd1612c3ecb.jpg?tag=1-1642748356-nil-0-ndrgo4aid6-21e0d82706b2e935&clientCacheKey=3x4xb3uvxtpibvc.jpg&di=abd4f314&bp=10000");
         /*File imageFile1 = new File("C:\\Users\\wmy3969\\Desktop\\2.png");
         File imageFile2 = new File("C:\\Users\\wmy3969\\Desktop\\2022.4.23-4.30短视频背景封面jpg\\春风十里焕新鲸喜\\1.png");*/
-        imagePixArr1 = ImageUtils.readImagePixel(new File(ImageUtils.modifyResolution(imageFile1.getPath(), "C:\\Users\\wmy3969\\Desktop", 256, 512)));
-        imagePixArr2 = ImageUtils.readImagePixel(new File(ImageUtils.modifyResolution(imageFile2.getPath(), "C:\\Users\\wmy3969\\Desktop", 256, 512)));
+        imagePixArr1 = ImageUtils.readImagePixel(new File(ImageUtils.modifyResolution(imageFile1.getPath(), "C:\\Users\\wmy3969\\Desktop", 512, 512)));
+        imagePixArr2 = ImageUtils.readImagePixel(new File(ImageUtils.modifyResolution(imageFile2.getPath(), "C:\\Users\\wmy3969\\Desktop", 512, 512)));
         /*imagePixArr1 = ImageUtils.readImagePixel(imageFile1);
         imagePixArr2 = ImageUtils.readImagePixel(imageFile2);*/
     }