From 6945a74fd5e1c4633f4a2ee1567ffa04695a3911 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Sun, 21 Jul 2024 10:33:55 +0800
Subject: [PATCH] fix

---
 .../impl/PublicUserRecordAppServiceImpl.java  |  4 +-
 .../templates/system/playlet/detail/add.html  | 96 ++++++++++---------
 .../system/playlet/detail/detail.html         |  6 +-
 .../templates/system/playlet/detail/edit.html | 48 +++++-----
 4 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicUserRecordAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicUserRecordAppServiceImpl.java
index e5624f0..e2bd32d 100644
--- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicUserRecordAppServiceImpl.java
+++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PublicUserRecordAppServiceImpl.java
@@ -28,7 +28,9 @@ public class PublicUserRecordAppServiceImpl implements PublicUserRecordAppServic
             if(playletPublicDetail.getReadCount() == null){
                 playletPublicDetail.setReadCount(1L);
             }else {
-                playletPublicDetail.setReadCount(playletPublicDetail.getReadCount() + 1);
+                // 实时统计阅读数
+                long count = iPublicUserRecordService.lambdaQuery().eq(PublicUserRecord::getRemark, userRecord.getRemark()).count();
+                playletPublicDetail.setReadCount(count);
             }
             iPlayletPublicDetailService.updateById(playletPublicDetail);
         }
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html
index 3d6f451..0021028 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/add.html
@@ -11,14 +11,14 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-detail-add">
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">公众号id：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">公众号id：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="publicId" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label">公众号：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">公众号：</label>
+            <div class="col-sm-10">
                 <select id="publicId" name="publicId" class="form-control m-b" required>
                     <option th:each="publicAccount:${publicAccounts}" th:value="${publicAccount.id}"
                             th:text="${publicAccount.name}"></option>
@@ -26,28 +26,28 @@
             </div>
         </div>
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">短剧：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">短剧：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <select id="itemId" name="itemId" class="form-control m-b" required>-->
         <!--                    <option th:each="playletItem:${playletItems}" th:value="${playletItem.id}" th:text="${playletItem.videoName}"></option>-->
         <!--                </select>-->
         <!--            </div>-->
         <!--        </div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label">标题：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">标题：</label>
+            <div class="col-sm-10">
                 <input name="title" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">作者花名：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">作者花名：</label>
+            <div class="col-sm-10">
                 <input name="authorAlias" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">缩略图：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">缩略图：</label>
+            <div class="col-sm-10">
                 <input name="imgUrl" type="text" hidden>
                 <div class="file-loading">
                     <input id="imgUrlFile" name="file" type="file">
@@ -55,8 +55,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">头图：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">头图：</label>
+            <div class="col-sm-10">
                 <input name="headUrl" type="text" hidden>
                 <div class="file-loading">
                     <input id="headUrlFile" name="file" type="file">
@@ -64,8 +64,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">文章类型：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">文章类型：</label>
+            <div class="col-sm-10">
                 <label class="radio-box">
                     <input type="radio" checked="" value="01" name="type">富文本</label>
                 <label class="radio-box">
@@ -73,8 +73,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">PDF附件：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">PDF附件：</label>
+            <div class="col-sm-10">
                 <input name="pdfUrl" type="text" hidden>
                 <div class="file-loading">
                     <input id="pdfUrlFile" name="file" type="file">
@@ -82,20 +82,20 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">所在地：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">所在地：</label>
+            <div class="col-sm-10">
                 <input name="address" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">简介：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">简介：</label>
+            <div class="col-sm-10">
                 <input name="remark" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">文章标签：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">文章标签：</label>
+            <div class="col-sm-10">
                 <select name="detailTag" class="form-control m-b"
                         th:with="type=${@dict.getType('playlet_detail_tag')}">
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}">
@@ -104,70 +104,70 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">详情(富文本)：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">详情(富文本)：</label>
+            <div class="col-sm-10">
                 <!-- <input type="hidden" class="form-control" name="content"> -->
                 <!-- <div class="summernote" id="content"></div> -->
                 <textarea id="mytextarea" name="content"></textarea>
             </div>
         </div>
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集1：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集1：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemOne" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集2：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集2：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemTwo" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集3：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集3：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemThree" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集4：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集4：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemFour" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集5：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集5：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemFive" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集6：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集6：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemSix" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集7：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集7：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemSeven" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集8：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集8：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemEight" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集9：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集9：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemNine" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
         <!--        <div class="form-group">-->
-        <!--            <label class="col-sm-3 control-label">剧集10：</label>-->
-        <!--            <div class="col-sm-8">-->
+        <!--            <label class="col-sm-2 control-label">剧集10：</label>-->
+        <!--            <div class="col-sm-10">-->
         <!--                <input name="itemTen" class="form-control" type="text">-->
         <!--            </div>-->
         <!--        </div>-->
@@ -245,7 +245,7 @@
     function submitHandler() {
         if ($.validate.form()) {
             var content = tinymce.get('mytextarea').getContent();
-            $.operate.save(prefix + "/add", $('#form-detail-add').serialize() + content);
+            $.operate.save(prefix + "/add", $('#form-detail-add').serialize() + encodeURIComponent(content));
         }
     }
 
@@ -317,11 +317,13 @@
             language: "zh_CN", //语言类型
             content_style: "img {max-width:100%;}",
             placeholder: '在这里输入文字',
+            height: 500,
             branding: false,  //tiny技术支持信息是否显示
             plugins: ' preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media code codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount autosave',
             toolbar: 'fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \
 	 styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
 	 table image media charmap hr pagebreak insertdatetime preview | code selectall searchreplace visualblocks | indent2em lineheight formatpainter axupimgs',
+            toolbar_mode: 'wrap',
             paste_data_images: true,  //图片是否可粘贴
             images_upload_handler: (blobInfo) => {
                 return new Promise(async (resolve, reject) => {
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/detail.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/detail.html
index d5c3cf0..8172a09 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/detail/detail.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/detail.html
@@ -28,10 +28,10 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="playlet:detail:add">
+            <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="playlet:detail:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="playlet:detail:edit">
+            <a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="playlet:detail:edit">
                 <i class="fa fa-edit"></i> 修改
             </a>
             <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="playlet:detail:remove">
@@ -148,7 +148,7 @@
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="unTopComment(\'' + row.id + '\')"><i class="fa fa-edit"></i>取消精选</a> ');
                         }
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showQrcode(\'' + row.id + '\')"></i>微信二维码</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html
index 23fc438..330108f 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/detail/edit.html
@@ -12,8 +12,8 @@
     <form class="form-horizontal m" id="form-detail-edit" th:object="${playletPublicDetail}">
         <input name="id" th:field="*{id}" type="hidden">
         <div class="form-group">
-            <label class="col-sm-3 control-label">公众号：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">公众号：</label>
+            <div class="col-sm-10">
                 <select id="publicId" name="publicId" class="form-control m-b" required>
                     <option th:each="publicAccount:${publicAccounts}" th:value="${publicAccount.id}"
                             th:text="${publicAccount.name}" th:field="*{publicId}"></option>
@@ -21,20 +21,20 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">标题：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">标题：</label>
+            <div class="col-sm-10">
                 <input name="title" th:field="*{title}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">作者花名：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">作者花名：</label>
+            <div class="col-sm-10">
                 <input name="authorAlias" th:field="*{authorAlias}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">缩略图：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">缩略图：</label>
+            <div class="col-sm-10">
                 <input name="imgUrl" th:field="*{imgUrl}" type="text" hidden="hidden">
                 <div class="file-loading">
                     <input id="imgUrlFile" name="file" type="file">
@@ -42,8 +42,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">头图：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">头图：</label>
+            <div class="col-sm-10">
                 <input name="headUrl" th:field="*{headUrl}" type="text" hidden="hidden">
                 <div class="file-loading">
                     <input id="headUrlFile" name="file" type="file">
@@ -51,8 +51,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">文章类型：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">文章类型：</label>
+            <div class="col-sm-10">
                 <label class="radio-box">
                     <input type="radio" th:checked="${playletPublicDetail.type == '01' ? true : false}" value="01"
                            name="type">富文本</label>
@@ -62,8 +62,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">PDF附件：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">PDF附件：</label>
+            <div class="col-sm-10">
                 <input name="pdfUrl" type="text" hidden="hidden">
                 <div class="file-loading">
                     <input id="pdfUrlFile" name="file" type="file">
@@ -71,20 +71,20 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">所在地：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">所在地：</label>
+            <div class="col-sm-10">
                 <input name="address" th:field="*{address}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">简介：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">简介：</label>
+            <div class="col-sm-10">
                 <input name="remark" th:field="*{remark}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">文章标签：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">文章标签：</label>
+            <div class="col-sm-10">
                 <select name="detailTag" class="form-control m-b"
                         th:with="type=${@dict.getType('playlet_detail_tag')}">
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
@@ -93,8 +93,8 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">详情(富文本)：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-2 control-label">详情(富文本)：</label>
+            <div class="col-sm-10">
                 <!-- <input type="hidden" class="form-control" th:field="*{content}">
             <div class="summernote" id="content"></div> -->
                 <textarea id="mytextarea" name="content" th:field="*{content}"></textarea>
@@ -116,7 +116,7 @@
     function submitHandler() {
         if ($.validate.form()) {
             var content = tinymce.get('mytextarea').getContent();
-            $.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + content);
+            $.operate.save(prefix + "/edit", $('#form-detail-edit').serialize() + encodeURIComponent(content));
         }
     }
 
@@ -248,11 +248,13 @@
             language: "zh_CN", //语言类型
             content_style: "img {max-width:100%;}",
             placeholder: '在这里输入文字',
+            height: 500,
             branding: false,  //tiny技术支持信息是否显示
             plugins: ' preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media code codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount autosave',
             toolbar: 'fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | \
 	 styleselect formatselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
 	 table image media charmap hr pagebreak insertdatetime preview | code selectall searchreplace visualblocks | indent2em lineheight formatpainter axupimgs',
+            toolbar_mode: 'wrap',
             paste_data_images: true,  //图片是否可粘贴
             images_upload_handler: (blobInfo) => {
                 return new Promise(async (resolve, reject) => {