登陆过期重新登录跳回原来页面；管理员后台文件详情页面文件详情和关联文件对象

bookshelfplus-frontend/views/dashboard/admin/FileManage.html

@@ -1,19 +1,19 @@
 <style>
     /* 限制 来源 列的宽度 */
-    tr>*:nth-child(8),
-    td>*:nth-child(8) {
+    tr>*:nth-child(7),
+    td>*:nth-child(7) {
         max-width: 100px;
     }
 
     /* 限制 哈希 列的宽度 */
-    tr>*:nth-child(10),
-    td>*:nth-child(10) {
+    tr>*:nth-child(9),
+    td>*:nth-child(9) {
         max-width: 100px;
     }
 
     /* 限制 时间 列的宽度 */
-    tr>*:nth-child(11),
-    td>*:nth-child(11) {
+    tr>*:nth-child(10),
+    td>*:nth-child(10) {
         max-width: 100px;
     }
 </style>
@@ -67,7 +67,7 @@
                                         创建: ${new Date(element.fileCreateAt).toLocaleString()}<br>
                                         修改: ${new Date(element.fileModifiedAt).toLocaleString()}
                                     </nobr></span>`,
-                            管理: `<span class="overflow-omit" style="margin: 0 auto;">
+                            管理: `<span style="margin: 0 auto;">
                                         <a href="<%= pageUrl %>detail?id=${element.id}">详情(TODO)</a>
                                         <a href="javascript:deleteBook(${element.id});">删除(TODO)</a>
                                     </span>`,

bookshelfplus-frontend/views/dashboard/admin/FileManage_Detail.html

@@ -1,5 +1,112 @@
-<p>
-    <h3>文件详情</h3>
-    <hr>
-    <h3>关联文件对象</h3>
-</p>
+<h3>文件详情</h3>
+<div id="file-detail-container">
+</div>
+<hr>
+<h3>关联文件对象</h3>
+<div id="file-object-container">
+
+</div>
+
+<!-- 获取参数 -->
+<script src="/assets/javascripts/getParams.js"></script>
+<script>
+    var requestParams = getParams();
+    var fileId = Number(requestParams["id"]) ?? "";
+    if (fileId === "") {
+        location.href = "<%= pageUrl %>../";
+    }
+</script>
+<script>
+    // 获取文件信息
+    function getFileInfo() {
+        function stringifyFileSize(nBytes = 0) {
+            // 美化输出文件大小
+            let sOutput = nBytes + " bytes";
+            const aMultiples = ["KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+            for (nMultiple = 0, nApprox = nBytes / 1024; nApprox > 1; nApprox /= 1024, nMultiple++) {
+                sOutput = nApprox.toFixed(2) + " " + aMultiples[nMultiple];
+            }
+            return sOutput;
+        }
+        getRequest("/file/getFileById", { fileId: fileId })
+            .then(function (response) {
+                var axiosData = response.data;
+                var status = axiosData.status;
+                var data = axiosData.data;
+                if (status === "success") {
+                    console.log("file", data);
+                    document.getElementById("file-detail-container").innerHTML =
+                        `<table border="1" style="margin: 0 auto;">
+                            <tr><th>key</th><th>value</th></tr>
+                            <tr><td>文件名</td><td>${data.fileName}</td></tr>
+                            <tr><td>文件扩展名</td><td>${data.fileExt}</td></tr>
+                            <tr><td>文件大小</td><td>${stringifyFileSize(data.fileSize)}</td></tr>
+                            <tr><td>SHA1</td><td>${data.fileSha1}</td></tr>
+                            <tr><td>文件Id</td><td>${data.id}</td></tr>
+                            <tr><td>关联书籍Id</td><td>${data.bookId}</td></tr>
+                            <tr><td>是否有广告</td><td>${data.advertising ? "是" : "否"}</td></tr>
+                            <tr><td>是否有水印</td><td>${data.watermark ? "是" : "否"}</td></tr>
+                            <tr><td>文件创建日期</td><td>${data.fileCreateAt}</td></tr>
+                            <tr><td>文件修改日期</td><td>${data.fileModifiedAt}</td></tr>
+                            <tr><td>页数</td><td>${data.numberOfPages}</td></tr>
+                            <tr><td>来源信息</td><td>${data.source}</td></tr>
+                        </table>`;
+
+                } else {
+                    alert(`出错啦！${data.errMsg} (错误码: ${data.errCode}) `);
+                }
+            }).catch(function (error) {
+                console.log(error);
+                alert("无法连接到服务器，请检查网络连接！");
+            });
+    }
+    getFileInfo();
+
+
+    // 获取文件对象信息
+    function getFileObjectInfo() {
+        getRequest("/file/object/getByFileId", { fileId: fileId })
+            .then(function (response) {
+                var axiosData = response.data;
+                var status = axiosData.status;
+                var data = axiosData.data;
+                if (status === "success") {
+                    console.log("fileObject", data);
+
+                    var items = [];
+                    for (var i = 0; i < data.length; i++) {
+                        var item = data[i];
+                        items.push(`<tr>
+                            <td>${item.id}</td>
+                            <td>${item.lastModified === 0 ? "未知" : new Date(item.lastModified).toISOString().replace(/T/, ' ').replace(/\..+/, '')}</td>
+                            <td>${item.storageMedium}</td>
+                            <td>${item.filePwd}</td>
+                            <td>${item.fileShareCode}</td>
+                            <td>${(item.uploadStatus ? item.uploadStatus : "<span style='color: grey; font-weight: bold;'>未知</span>")
+                                .replace("SUCCESS", "<span style='color: green; font-weight: bold;'>成功</span>")
+                                .replace("UPLOADING", "<span style='color: orange; font-weight: bold;'>正在上传</span>")
+                                .replace("NOT_EXIST", "<span style='color: red; font-weight: bold;'>不存在</span>")}</td>
+                        </tr>`);
+                    }
+                    document.getElementById("file-object-container").innerHTML =
+                        `<table border="1" style="margin: 0 auto;">
+                            <tr>
+                                <th>文件对象Id</th>
+                                <th>文件修改日期</th>
+                                <th>存储介质</th>
+                                <th>文件密码</th>
+                                <th>提取码</th>
+                                <th>状态</th>
+                            </tr>
+                            ${items.join("")}
+                        </table>`;
+                } else {
+                    alert(`出错啦！${data.errMsg} (错误码: ${data.errCode}) `);
+                }
+            }).catch(function (error) {
+                console.log(error);
+                alert("无法连接到服务器，请检查网络连接！");
+            });
+    }
+    getFileObjectInfo();
+</script>

bookshelfplus-frontend/views/dashboard/admin/FileManage_ObjectManage.html

@@ -29,9 +29,6 @@
                             修改日期: element.lastModified === 0 ? "未知" : `<span class="overflow-omit" style="font-size: 12px; line-height: 1.2em; display: block;"><nobr>
                                         ${new Date(element.lastModified).toISOString().replace(/T/, ' ').replace(/\..+/, '')}
                                     </nobr></span>`,
-                            格式: `<span class="overflow-omit" style="font-size: 12px; line-height: 1.2em; display: block;"><nobr>
-                                        ${element.fileType ? element.fileType : "未知"}
-                                    </nobr></span>`,
                             密码: `<span class="overflow-omit" style="font-size: 12px; line-height: 1.2em; display: block;"><nobr>
                                         文件密码: ${element.filePwd}<br>
                                         提取码: ${element.fileShareCode}
@@ -47,7 +44,7 @@
                                         <a href="javascript:refreshFileObjectStatus(${element.id});">刷新状态</a>
                                         <a href="<%= pageUrl %>../object-detail?id=${element.id}">修改(TODO)</a>
                                         <a href="javascript:deleteBook(${element.id});">删除(TODO)</a>
-                                    </span > `,
+                                    </span >`,
                         })
                     });
                     if (renderData.length == 0) {