Sākums Izpētīt Palīdzība
Pierakstīties
reghao
/
oss
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

更新 UserNode 接口和页面

reghao 2 gadi atpakaļ
vecāks
f5d892b9aa
revīzija
ecce1ecfb0
5 mainītis faili ar 20 papildinājumiem un 3 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserNodePageController.java
  2. 4 0
      oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserNodeRepository.java
  3. 4 1
      oss-console/src/main/java/cn/reghao/oss/console/app/service/UserNodeService.java
  4. 10 0
      oss-console/src/main/resources/templates/usernode/detail.html
  5. 1 1
      oss-console/src/main/resources/templates/usernode/index1.html

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/controller/page/UserNodePageController.java
Parādīt failu 

@@ -56,6 +56,6 @@ public class UserNodePageController {
 
     @GetMapping(value = "/detail/{appId}")
 
     public String nodeDetailPage(@PathVariable(value = "appId") String appId, Model model) {
 
         model.addAttribute("list", Collections.emptyList());
 
-        return "/usernode/index1";
 
+        return "/usernode/detail";
 
     }
 
 }

+ 4 - 0
oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserNodeRepository.java
Parādīt failu 

@@ -1,6 +1,9 @@
 
 package cn.reghao.oss.console.app.db.repository;
 
 
 import cn.reghao.oss.console.app.model.po.UserNode;
 
+import org.springframework.data.domain.Page;
 
+import org.springframework.data.domain.PageRequest;
 
+import org.springframework.data.domain.Pageable;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
 /**
 
@@ -10,4 +13,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserNodeRepository extends JpaRepository<UserNode, Integer> {
 
     int countByNodeId(int nodeId);
 
     UserNode findByNodeIdAndUserId(int nodeId, int userId);
 
+    Page<UserNode> findByUserId(int userId, Pageable pageable);
 
 }

+ 4 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/service/UserNodeService.java
Parādīt failu 

@@ -7,6 +7,7 @@ import cn.reghao.oss.console.app.model.dto.UserNodeDto;
 
 import cn.reghao.oss.console.app.model.po.StoreNode;
 
 import cn.reghao.oss.console.app.model.po.UploadChannel;
 
 import cn.reghao.oss.console.app.model.po.UserNode;
 
+import org.springframework.data.domain.PageRequest;
 
 import org.springframework.stereotype.Service;
 
 
 import java.util.Collections;
 
@@ -67,7 +68,9 @@ public class UserNodeService {
 
     }
 
 
     public List<StoreNode> getUserStoreNodes() {
 
-        List<UserNode> list = userNodeRepository.findAll();
 
+        int loginUser = UserContext.getUser().getId();
 
+        PageRequest pageRequest = PageRequest.of(0, 100);
 
+        List<UserNode> list = userNodeRepository.findByUserId(loginUser, pageRequest).getContent();
 
         if (list.isEmpty()) {
 
             return Collections.emptyList();
 
         }

+ 10 - 0
oss-console/src/main/resources/templates/usernode/detail.html
Parādīt failu 

@@ -0,0 +1,10 @@
 
+<!DOCTYPE html>
 
+<html xmlns:th="http://www.thymeleaf.org">
 
+<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})"></head>
 
+<body>
 
+    <div class="timo-detail-page">
 
+        <div class="timo-detail-title">我的节点信息</div>
 
+    </div>
 
+<script th:replace="/common/template :: script"></script>
 
+</body>
 
+</html>

+ 1 - 1
oss-console/src/main/resources/templates/usernode/index1.html
Parādīt failu 

@@ -47,7 +47,7 @@
 
                     <td th:text="${item.domain}">节点域名</td>
 
                     <td th:text="${item.nodeAddr}">节点地址</td>
 
                     <td>
 
-                        <a class="open-popup" data-title="我的节点详细信息" th:attr="data-url=@{'/app/config/app/detail/'+${item.id}}"
 
+                        <a class="open-popup" data-title="我的节点详细信息" th:attr="data-url=@{'/store/my/detail/'+${item.id}}"
 
                            data-size="640,480" href="#">详细</a>
 
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.domain}"
 
                            th:href="@{'/api/store/my/delete/' + ${item.id}}">删除</a>