Merge branch 'bug/1031832' into 'master'

bug : [none] 版权保护导出加二维码名称

See merge request rays/pcloud-book!1456

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/impl/BookSceneAuthBizImpl.java

@@ -192,11 +192,12 @@ public class BookSceneAuthBizImpl implements BookSceneAuthBiz {
                     bookAuthCodes.add(bookAuthCode);
                 }
                 bookSceneAuthCodeDao.insert(bookAuthCodes);
+                String bookName=bookDto.getBookName() +"_"+sceneDto.getSceneName();
                 String noticeUrl;
-                String zipUrl = CopyrightTools.generateQrcode4ZipNew(bookAuthCodes, bookDto.getBookName(), sceneDto.getUrl(), authBookType);
+                String zipUrl = CopyrightTools.generateQrcode4ZipNew(bookAuthCodes, bookDto.getBookName(), sceneDto.getSceneName(),sceneDto.getUrl(), authBookType);
                 noticeUrl = zipUrl;
                 //发送站内信
-                bookAuthInfoBiz.sendLetter(adviserId, bookDto.getBookName(), noticeUrl, commitTime);
+                bookAuthInfoBiz.sendLetter(adviserId, bookName, noticeUrl, commitTime);
                 //新增导出记录
                 updateSuccessRecord(bookId, channelId, adviserId, num, noticeUrl, sceneId);
                 BookSceneAuth authSceneInfo = bookSceneAuthDao.getAuthSceneInfo(bookId, sceneId);

pcloud-service-book/src/main/java/com/pcloud/book/copyright/tools/CopyrightTools.java

@@ -232,7 +232,7 @@ public class CopyrightTools {
      * @param sceneUrl
      * @return
      */
-    public static String generateQrcode4ZipNew(List<BookSceneAuthCode> bookAuthCodes, String fileName, String sceneUrl,Integer authBookType) {
+    public static String generateQrcode4ZipNew(List<BookSceneAuthCode> bookAuthCodes, String fileName,String sceneName, String sceneUrl,Integer authBookType) {
         fileName = FileUtils.formatName(fileName);
         String tempZipName = fileName + "_" + LocalDateUtils.getYmdhmss();
         String zipFilePath = ZIP_FILE_PATH + tempZipName + ".zip";
@@ -261,7 +261,7 @@ public class CopyrightTools {
                         }
                     }
 //                    paintQrcodeText(bufferedImage, bookAuthCode.getFullCode());
-                    File file = new File(fileFolderPath + "/" + bookAuthCode.getFullCode() + ".png");
+                    File file = new File(fileFolderPath + "/" + sceneName+bookAuthCode.getFullCode() + ".png");
                     ImageIO.write(bufferedImage, ImageTypeEnum.PNG.value, file);
                     String qrcodeUrl = QrcodeUtils.uploadImage(bufferedImage);
                     bookAuthCode.setUrl(content);
@@ -275,7 +275,7 @@ public class CopyrightTools {
             FileUtils.isDir(ZIP_FILE_PATH);
             CompressUtils.zip(fileFolderPath, zipFilePath);
             // 上传文件到服务器中
-            uploadResultInfo = OssUtils.uploadLocalFile4CustomName(zipFilePath, fileName);
+            uploadResultInfo = OssUtils.uploadLocalFile4CustomName(zipFilePath, fileName+"_"+sceneName);
         } catch (Exception e) {
             LOGGER.error("【压缩】压缩失败,<ERROR>:" + e.getMessage(), e);
             throw new FileException(FileException.ZIP_ERROR, "压缩失败！");