Forráskód Böngészése

update oss-console

reghao 1 éve
szülő
commit
04709a99f9

+ 0 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/StoreNodeRepository.java

@@ -10,7 +10,6 @@ import java.util.List;
  * @date 2024-07-02 18:15:11
  */
 public interface StoreNodeRepository extends BaseMapper<StoreNode> {
-    StoreNode getOne(int id);
     StoreNode findByNodeAddr(String nodeAddr);
     StoreNode findById(int id);
     List<StoreNode> findAllById(List<Integer> list);

+ 0 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UploadChannelRepository.java

@@ -10,7 +10,6 @@ import java.util.List;
  * @date 2024-07-02 18:15:27
  */
 public interface UploadChannelRepository extends BaseMapper<UploadChannel> {
-    UploadChannel getOne(int id);
     int countByCreateBy(int createBy);
     List<UploadChannel> findByNodeIdAndCreateBy(int nodeId, int createBy);
     UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);

+ 1 - 1
oss-console/src/main/java/cn/reghao/oss/console/app/db/mapper/UserNodeRepository.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @date 2024-07-02 18:15:42
  */
 public interface UserNodeRepository extends BaseMapper<UserNode> {
-    UserNode getOne(int id);
+    UserNode findById(int id);
     int countByNodeId(int nodeId);
     UserNode findByNodeIdAndUserId(int nodeId, int userId);
     UserNode findByDomain(String domain);

+ 1 - 0
oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/StoreNodeRepository.java

@@ -9,4 +9,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
  */
 public interface StoreNodeRepository extends JpaRepository<StoreNode, Integer> {
     StoreNode findByNodeAddr(String nodeAddr);
+    StoreNode findById(int id);
 }

+ 1 - 0
oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UploadChannelRepository.java

@@ -15,5 +15,6 @@ public interface UploadChannelRepository extends JpaRepository<UploadChannel, In
     UploadChannel findByChannelIdAndCreateBy(int channelId, int createBy);
     UploadChannel findByPrefixAndCreateByAndNodeId(String prefix, int createBy, int nodeId);
     UploadChannel findByPrefixAndNodeId(String prefix, int nodeId);
+    UploadChannel findById(int id);
     List<UploadChannel> findByCreateBy(int createBy);
 }

+ 1 - 0
oss-console/src/main/java/cn/reghao/oss/console/app/db/repository/UserNodeRepository.java

@@ -13,5 +13,6 @@ public interface UserNodeRepository extends JpaRepository<UserNode, Integer> {
     int countByNodeId(int nodeId);
     UserNode findByNodeIdAndUserId(int nodeId, int userId);
     UserNode findByDomain(String domain);
+    UserNode findById(int id);
     List<UserNode> findByUserId(int userId);
 }

+ 1 - 5
oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreChannelService.java

@@ -76,11 +76,7 @@ public class StoreChannelService {
     }
 
     public StoreNodeVO getStoreDetail(int nodeId) {
-        StoreNode storeNode = storeNodeRepository.getOne(nodeId);
-        if (storeNode == null) {
-            return null;
-        }
-
+        StoreNode storeNode = storeNodeRepository.findById(nodeId);
         int channelId = 1;
         StoreInfo storeInfo = storeServiceWrapper.getStoreInfo(channelId);
         List<StoreDiskDto> storeDiskDtos = storeInfo.getStoreDisks();

+ 5 - 4
oss-console/src/main/java/cn/reghao/oss/console/app/service/StoreNodeService.java

@@ -48,7 +48,7 @@ public class StoreNodeService {
     @Transactional(rollbackFor = Exception.class)
     public Result updateDomain(NodeUpdateDto nodeUpdateDto) {
         int id = nodeUpdateDto.getId();
-        StoreNode storeNode = storeNodeRepository.getOne(id);
+        StoreNode storeNode = storeNodeRepository.findById(id);
         if (storeNode == null) {
             return Result.fail(String.format("id %s not exist", id));
         }
@@ -66,7 +66,7 @@ public class StoreNodeService {
     }
 
     public Result delete(int nodeId) {
-        StoreNode storeNode = storeNodeRepository.getOne(nodeId);
+        StoreNode storeNode = storeNodeRepository.findById(nodeId);
         if (storeNode == null) {
             return Result.fail("node not exist");
         }
@@ -90,11 +90,12 @@ public class StoreNodeService {
 
     public StoreNode getByDomain(String domain) {
         UserNode userNode = userNodeRepository.findByDomain(domain);
-        return storeNodeRepository.getOne(userNode.getNodeId());
+        int id = userNode.getNodeId();
+        return storeNodeRepository.findById(id);
     }
 
     public StoreNode getById(int id) {
-        return storeNodeRepository.getOne(id);
+        return storeNodeRepository.findById(id);
     }
 
     public List<KeyValue> getNodeKeyValues() {

+ 3 - 3
oss-console/src/main/java/cn/reghao/oss/console/app/service/UploadChannelService.java

@@ -37,7 +37,7 @@ public class UploadChannelService {
     public void updateScope(ChannelScopeDto channelScopeDto) {
         int id = channelScopeDto.getId();
         int newScope = channelScopeDto.getNewScope();
-        UploadChannel uploadChannel = uploadChannelRepository.getOne(id);
+        UploadChannel uploadChannel = uploadChannelRepository.findById(id);
         if (uploadChannel != null) {
             int currentScope = uploadChannel.getScope();
             if (currentScope != newScope) {
@@ -49,7 +49,7 @@ public class UploadChannelService {
 
     public void updateSeturl(ChannelProcessDto channelProcessDto) {
         int id = channelProcessDto.getId();
-        UploadChannel uploadChannel = uploadChannelRepository.getOne(id);
+        UploadChannel uploadChannel = uploadChannelRepository.findById(id);
         if (uploadChannel != null) {
             boolean seturl = channelProcessDto.getSeturl();
             boolean current = uploadChannel.getSeturl();
@@ -76,7 +76,7 @@ public class UploadChannelService {
     }
 
     public UploadChannel getUploadChannel(int id) {
-        return uploadChannelRepository.getOne(id);
+        return uploadChannelRepository.findById(id);
     }
 
     public UploadChannel getByChannelIdAndCreateBy(int channelId, int createBy) {

+ 2 - 2
oss-console/src/main/java/cn/reghao/oss/console/app/service/UserNodeService.java

@@ -50,8 +50,8 @@ public class UserNodeService {
         return Result.success("node added");
     }
 
-    public Result delete(Integer id) {
-        UserNode userNode = userNodeRepository.getOne(id);
+    public Result delete(int id) {
+        UserNode userNode = userNodeRepository.findById(id);
         if (userNode != null) {
             int nodeId = userNode.getNodeId();