2022年10月1日23:37:41 主题文件文件夹避开中文

王明元
1 parent 55d6c618
Showing 3 changed files with 14 additions and 14 deletions
fw-dalaran-server/src/main/java/cn/fw/dalaran/server/controller/common/DataExchangeController.java
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
@@ -126,8 +126,8 @@ public class DataExchangeController {
      * @throws Exception
      */
     @GetMapping("/calcSimilarity")
-    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));
+    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));
     }
     /**
@@ -214,7 +214,7 @@ public class CommonBizService {
                         .list();
                 for (ThemeFile themeFile : list) {
                     try {
-                        final BigDecimal coverSimilarity = this.validCover(activityTheme.getTheme(), themeFile.getThemeId(), 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(), activityTheme.getId(), 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) {
@@ -968,20 +968,20 @@ public class CommonBizService {
      * @return 封面图匹配度
      * @throws Exception
      */
-    public BigDecimal validCover(String theme, Long themeId, 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, themeId, fileId);
+        File imageFile1 = this.findLocalCacheImageTheme(/*theme,*/ themeId, fileId);
         imagePixArr1 = ImageUtils.readImagePixel(imageFile1);
         File imageFile2;
-        File localCacheImage = this.findLocalCacheImageUser(theme, themeId, 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 + themeId + "#" + 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()) {
@@ -989,7 +989,7 @@ public class CommonBizService {
             }
         }
         imagePixArr2 = ImageUtils.readImagePixel(imageFile2);
-        String msg = String.format("\n 主题: %s\n 设置封面文件id: %s\n 账户号: %s\n %s%s\n", theme, fileId, account, Objects.equals(type, 1) ? "短视频id: " : "直播间号: ", itemId);
+        String msg = String.format("\n 主题: %s\n 设置封面文件id: %s\n 账户号: %s\n %s%s\n", /*theme,*/ fileId, account, Objects.equals(type, 1) ? "短视频id: " : "直播间号: ", itemId);
         return BigDecimal.valueOf(ImageUtils.calcSimilarity(ImageUtils.getFingerprint(imagePixArr1), ImageUtils.getFingerprint(imagePixArr2), msg));
     }
@@ -1002,9 +1002,9 @@ public class CommonBizService {
      * @param itemId  视频id/直播间id
      * @param type    1:视频, 2:直播
      */
-    private File findLocalCacheImageUser(String theme, Long themeId, 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 + themeId + "#" + 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)
@@ -1027,9 +1027,9 @@ public class CommonBizService {
      * @param themeId 主题id
      * @param fileId  文件id(主题配置指定封面图文件)
      */
-    private File findLocalCacheImageTheme(String theme, Long themeId, String fileId) {
+    private File findLocalCacheImageTheme(/*String theme,*/ Long themeId, String fileId) {
         String tempDir = common.getActivityThemeCoverDir();
-        File file = new File(tempDir + "activityTheme" + File.separator + themeId + "#" + 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)
@@ -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.getId() + "#" + 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();