中场休息

Author: nooblong

download/src/main/java/github/nooblong/download/controller/SubscribeController.java

@@ -1,7 +1,9 @@
 package github.nooblong.download.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
 import com.baomidou.mybatisplus.extension.toolkit.SimpleQuery;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -10,6 +12,7 @@
 import github.nooblong.common.util.CommonUtil;
 import github.nooblong.common.util.JwtUtil;
 import github.nooblong.download.bilibili.BilibiliClient;
+import github.nooblong.download.entity.IdName;
 import github.nooblong.download.entity.Subscribe;
 import github.nooblong.download.entity.UserVoicelist;
 import github.nooblong.download.job.UploadJob;
@@ -52,12 +55,44 @@ public SubscribeController(BilibiliClient bilibiliClient,
         this.uploadJob = uploadJob;
     }
 
-    @CacheEvict(value = {"subscribe/list", "subscribe/test"}, allEntries = true)
-    @PostMapping("/edit")
+    @GetMapping
+    public Result<IPage<Subscribe>> list(@RequestParam(name = "username", required = false) String username,
+                                         @RequestParam(name = "status", required = false) Integer status,
+                                         @RequestParam(name = "voiceListId", required = false) Long voiceListId,
+                                         HttpServletResponse response) {
+        Long selectUserId = null;
+        if (StrUtil.isNotBlank(username)) {
+            List<SysUser> selectUser = Db.list(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getUsername, username));
+            if (selectUser.isEmpty()) {
+                return Result.ok("ok", new Page<>(1L, 1000L));
+            }
+            selectUserId = selectUser.get(0).getId();
+        }
+        IPage<Subscribe> list = Db.page(new Page<>(1, Integer.MAX_VALUE),
+                Wrappers.lambdaQuery(Subscribe.class)
+                        .eq(selectUserId != null, Subscribe::getUserId, selectUserId)
+                        .eq(voiceListId != null, Subscribe::getVoiceListId, voiceListId)
+                        .eq(status != null, Subscribe::getEnable, status)
+                        .orderByDesc(Subscribe::getUpdateTime));
+        if (list.getRecords().isEmpty()) {
+            return Result.ok("ok", list);
+        }
+        List<SysUser> users = Db.list(SysUser.class);
+        Map<Long, SysUser> longSysUserMap = SimpleQuery.list2Map(users, SysUser::getId, i -> i);
+        list.getRecords().forEach(subscribe -> {
+            subscribe.setTypeDesc(subscribe.getType().getDesc());
+            subscribe.setUserName(longSysUserMap.get(subscribe.getUserId()).getUsername());
+            subscribe.setLog(subscribe.getLog());
+        });
+        response.addHeader("Content-Range", String.valueOf(Db.count(Subscribe.class)));
+        return Result.ok("ok", list);
+    }
+
+    @PutMapping
     public Result<Subscribe> edit(@RequestBody Subscribe subscribe) {
         SysUser user = JwtUtil.verifierFromContext();
         Subscribe byId = Db.getById(subscribe.getId(), Subscribe.class);
-        if (subscribe.getCrack() > 0) {
+        if (subscribe.getCrack() != null && subscribe.getCrack() > 0) {
             if (user.getIsAdmin() != 1) {
                 return Result.fail("fail: crack");
             }
@@ -67,8 +102,7 @@ public Result<Subscribe> edit(@RequestBody Subscribe subscribe) {
         return Result.ok("ok", subscribe);
     }
 
-    @CacheEvict(value = {"subscribe/list"}, allEntries = true)
-    @PostMapping("/add")
+    @PostMapping
     public Result<Subscribe> add(@RequestBody Subscribe subscribe) {
         SysUser user = JwtUtil.verifierFromContext();
         Long voiceListId = subscribe.getVoiceListId();
@@ -78,65 +112,42 @@ public Result<Subscribe> add(@RequestBody Subscribe subscribe) {
                 .eq(UserVoicelist::getVoicelistId, voiceListId).list();
         Assert.isTrue(!list.isEmpty(), "fail: not owner");
         subscribe.setUserId(user.getId());
-        if (subscribe.getCrack() > 0) {
+        if (subscribe.getCrack() != null && subscribe.getCrack() > 0) {
             if (user.getIsAdmin() != 1) {
                 return Result.fail("fail: crack");
             }
         }
-        subscribe.setChannelIds(CommonUtil.toCommaSeparatedString(subscribe.getChannelIdsList()));
+        List<IdName> channelIdsList = subscribe.getChannelIdsList();
+        if (channelIdsList != null && !channelIdsList.isEmpty()) {
+            ArrayList<String> sList = new ArrayList<>();
+            channelIdsList.forEach(channelId -> sList.add(channelId.getId()));
+            subscribe.setChannelIds(CommonUtil.toCommaSeparatedString(sList));
+        }
         JsonNode userInfo = bilibiliClient.getUserInfo(subscribe.getUpId(),
                 bilibiliClient.getAndSetBiliCookie());
         subscribe.setUpImage(userInfo.get("data").get("face").asText());
         subscribe.setUpName(userInfo.get("data").get("name").asText());
+        if (channelIdsList != null && !channelIdsList.isEmpty()) {
+            ArrayList<String> sList = new ArrayList<>();
+            channelIdsList.forEach(channelId -> sList.add(channelId.getName()));
+            String commaSeparatedString = CommonUtil.toCommaSeparatedString(sList);
+            subscribe.setUpName(subscribe.getUpName() + "(" + commaSeparatedString + ")");
+        }
         Db.save(subscribe);
         return Result.ok("ok", subscribe);
     }
 
-    @CacheEvict(value = {"subscribe/list"}, allEntries = true)
-    @GetMapping("/delete")
-    public Result<Subscribe> delete(@RequestParam(name = "id") Long id) {
+    @DeleteMapping("{id}")
+    public Result<Subscribe> delete(@PathVariable(name = "id") Long id) {
         SysUser user = JwtUtil.verifierFromContext();
         Subscribe byId = Db.getById(id, Subscribe.class);
         Assert.isTrue(byId.getUserId().equals(user.getId()), "fail: not owner");
         Db.removeById(byId);
         return Result.ok("ok", byId);
     }
 
-    @Cacheable(value = "subscribe/list", key = "#username + ':' + #status + ':' + #voiceListId")
-    @GetMapping("/list")
-    public Result<List<Subscribe>> subscribeList(@RequestParam(name = "username", required = false) String username,
-                                                 @RequestParam(name = "status", required = false) Integer status,
-                                                 @RequestParam(name = "voiceListId", required = false) Long voiceListId,
-                                                 HttpServletResponse response) {
-        Long selectUserId = null;
-        if (StrUtil.isNotBlank(username)) {
-            List<SysUser> selectUser = Db.list(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getUsername, username));
-            if (selectUser.isEmpty()) {
-                return Result.ok("ok", new ArrayList<>());
-            }
-            selectUserId = selectUser.get(0).getId();
-        }
-        List<Subscribe> list = Db.list(
-                Wrappers.lambdaQuery(Subscribe.class)
-                        .eq(selectUserId != null, Subscribe::getUserId, selectUserId)
-                        .eq(voiceListId != null, Subscribe::getVoiceListId, voiceListId)
-                        .eq(status != null, Subscribe::getEnable, status));
-        if (list.isEmpty()) {
-            return Result.ok("ok", list);
-        }
-        List<SysUser> users = Db.list(SysUser.class);
-        Map<Long, SysUser> longSysUserMap = SimpleQuery.list2Map(users, SysUser::getId, i -> i);
-        list.forEach(subscribe -> {
-            subscribe.setTypeDesc(subscribe.getType().getDesc());
-            subscribe.setUserName(longSysUserMap.get(subscribe.getUserId()).getUsername());
-            subscribe.setLog(subscribe.getLog());
-        });
-        response.addHeader("Content-Range", String.valueOf(Db.count(Subscribe.class)));
-        return Result.ok("ok", list);
-    }
-
-    @GetMapping("/detail")
-    public Result<Subscribe> subscribeList(@RequestParam(name = "id") Long id) {
+    @GetMapping("/{id}")
+    public Result<Subscribe> subscribeList(@PathVariable(name = "id") Long id) {
         Subscribe byId = Db.getById(id, Subscribe.class);
         return Result.ok("ok", byId);
     }

download/src/main/java/github/nooblong/download/controller/UploadDetailController.java

@@ -14,6 +14,7 @@
 import github.nooblong.download.api.AddQueueRequest;
 import github.nooblong.download.bilibili.BilibiliClient;
 import github.nooblong.download.bilibili.SimpleVideoInfo;
+import github.nooblong.download.entity.CidName;
 import github.nooblong.download.entity.Subscribe;
 import github.nooblong.download.entity.UploadDetail;
 import github.nooblong.download.entity.UserVoicelist;
@@ -34,7 +35,7 @@
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("/uploadDetail")
+@RequestMapping("/upload")
 public class UploadDetailController {
 
     final UploadDetailService uploadDetailService;
@@ -59,51 +60,7 @@ public UploadDetailController(UploadDetailService uploadDetailService,
         this.redisTemplate = redisTemplate;
     }
 
-    @Cacheable(value = "uploadDetail/listVoicelist")
-    @GetMapping("/listVoicelist")
-    public Result<List<UserVoicelist>> listVoicelist(@RequestParam(name = "username", required = false) String username) {
-        List<SysUser> userList = Db.list(Wrappers.lambdaQuery(SysUser.class)
-                .eq(username != null, SysUser::getUsername, username));
-        if (userList.isEmpty()) {
-            return Result.ok("ok", new ArrayList<>());
-        }
-        List<UserVoicelist> list = Db.list(Wrappers.lambdaQuery(UserVoicelist.class)
-                .in(UserVoicelist::getUserId, userList.stream().map(SysUser::getId).collect(Collectors.toList())));
-        for (UserVoicelist userVoicelist : list) {
-            String voiceNumKey = userVoicelist.getVoicelistId() + ":voiceNum";
-            String subscribeNumKey = userVoicelist.getVoicelistId() + ":subscribeNum";
-            if (Boolean.TRUE.equals(redisTemplate.hasKey(voiceNumKey))) {
-                String s = redisTemplate.opsForValue().get(voiceNumKey);
-                userVoicelist.setUploadCount(s == null ? 0 : Integer.parseInt(s));
-            } else {
-                long count = Db.count(Wrappers.lambdaQuery(UploadDetail.class)
-                        .eq(UploadDetail::getVoiceListId, userVoicelist.getVoicelistId()));
-                userVoicelist.setUploadCount((int) count);
-                redisTemplate.opsForValue().set(voiceNumKey, String.valueOf(count), 1, TimeUnit.MINUTES);
-            }
-            if (Boolean.TRUE.equals(redisTemplate.hasKey(subscribeNumKey))) {
-                String s = redisTemplate.opsForValue().get(subscribeNumKey);
-                userVoicelist.setSubscribeNum(s == null ? 0 : Integer.parseInt(s));
-            } else {
-                long count = Db.count(Wrappers.lambdaQuery(Subscribe.class)
-                        .eq(Subscribe::getVoiceListId, userVoicelist.getVoicelistId()));
-                userVoicelist.setSubscribeNum((int) count);
-                redisTemplate.opsForValue().set(subscribeNumKey, String.valueOf(count), 1, TimeUnit.MINUTES);
-            }
-        }
-        return Result.ok("ok", list);
-    }
-
-    @CacheEvict(value = "uploadDetail/listVoicelist", allEntries = true)
-    @GetMapping("/refreshVoiceList")
-    public Result<String> refreshVoiceList() {
-        SysUser sysUser = JwtUtil.verifierFromContext();
-        userVoicelistService.syncUserVoicelist(sysUser.getId());
-        return Result.ok("ok");
-    }
-
-    @Cacheable(value = "uploadDetail/list")
-    @GetMapping("/list")
+    @GetMapping
     public Result<IPage<UploadDetail>> list(@RequestParam(name = "pageNo") int pageNo,
                                             @RequestParam(name = "pageSize") int pageSize,
                                             @RequestParam(name = "column", required = false) String column,
@@ -169,13 +126,49 @@ public Result<IPage<UploadDetail>> list(@RequestParam(name = "pageNo") int pageN
         return Result.ok("查询成功", page);
     }
 
-    @GetMapping("/getById")
-    public Result<UploadDetail> get(@RequestParam(name = "id") Long id) {
-        return Result.ok("ok", Db.getById(id, UploadDetail.class));
+    @PostMapping
+    public Result<String> addQueue(@RequestBody UploadDetail req) {
+        Long userId = JwtUtil.verifierFromContext().getId();
+        List<SysUser> userList = SimpleQuery.list(Wrappers.lambdaQuery(SysUser.class)
+                .eq(SysUser::getId, userId), i -> i);
+        boolean isAdmin = !userList.isEmpty() && userList.get(0).getIsAdmin() == 1;
+        List<UserVoicelist> userVoicelistList = userVoicelistService.lambdaQuery()
+                .eq(UserVoicelist::getUserId, userId)
+                .list();
+        Map<Long, UserVoicelist> userVoicelistMap =
+                SimpleQuery.list2Map(userVoicelistList, UserVoicelist::getVoicelistId, i -> i);
+        if (req.getCidNames() != null && !req.getCidNames().isEmpty()) {
+            for (CidName cidName : req.getCidNames()) {
+                Assert.isTrue(StrUtil.isNotBlank(req.getBvid()), "bvid为空");
+                Assert.isTrue(req.getVoiceListId() != null && req.getVoiceListId() != 0, "voiceListId为空");
+                Assert.notNull(userVoicelistMap.get(req.getVoiceListId()), "不是你的voiceListId");
+                SimpleVideoInfo simpleVideoInfo = bilibiliClient.getSimpleVideoInfoByBvidOrUrl(req.getBvid());
+                UploadDetail uploadDetail = new UploadDetail();
+                uploadDetail.setBvid(simpleVideoInfo.getBvid());
+                uploadDetail.setCid(cidName.getCid());
+                uploadDetail.setVoiceListId(req.getVoiceListId());
+                uploadDetail.setUseVideoCover(req.getUseVideoCover());
+                uploadDetail.setBeginSec(req.getBeginSec());
+                uploadDetail.setEndSec(req.getEndSec());
+                uploadDetail.setOffset(req.getOffset());
+                uploadDetail.setUploadName(cidName.getName());
+                uploadDetail.setPrivacy(req.getPrivacy());
+                uploadDetail.setPriority(isAdmin ? 999L : 10L);
+                uploadDetail.setBitrate(req.getBitrate());
+                uploadDetail.setUserId(userId);
+                uploadDetail.setCrack(req.getCrack() == null ? 0L : 1L);
+                if (req.getCrack() != null && req.getCrack() == 1) {
+                    Assert.isTrue(isAdmin, "unsupported");
+                }
+                Db.save(uploadDetail);
+            }
+        } else {
+            throw new RuntimeException("没有分p信息");
+        }
+        return Result.ok("添加队列成功");
     }
 
-    @CacheEvict(value = "uploadDetail/list", allEntries = true)
-    @PostMapping("/edit")
+    @PutMapping
     public Result<UploadDetail> update(@RequestBody UploadDetail uploadDetail) {
         Long userId = JwtUtil.verifierFromContext().getId();
         UploadDetail byId = uploadDetailService.getById(uploadDetail.getId());
@@ -184,6 +177,43 @@ public Result<UploadDetail> update(@RequestBody UploadDetail uploadDetail) {
         return Result.ok("ok", byId);
     }
 
+    @GetMapping("/listVoicelist")
+    public Result<IPage<UserVoicelist>> listVoicelist(@RequestParam(name = "username", required = false) String username,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1", required = false) Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10", required = false) Integer pageSize) {
+        List<SysUser> userList = Db.list(Wrappers.lambdaQuery(SysUser.class)
+                .eq(username != null, SysUser::getUsername, username));
+        if (userList.isEmpty()) {
+            return Result.ok("ok", new Page<>());
+        }
+        IPage<UserVoicelist> page = Db.page(new Page<>(pageNo, pageSize),
+                Wrappers.lambdaQuery(UserVoicelist.class)
+                        .in(UserVoicelist::getUserId, userList.stream().map(SysUser::getId).collect(Collectors.toList()))
+                        .orderByDesc(UserVoicelist::getVoicelistId));
+        for (UserVoicelist userVoicelist : page.getRecords()) {
+            long count = Db.count(Wrappers.lambdaQuery(UploadDetail.class)
+                    .eq(UploadDetail::getVoiceListId, userVoicelist.getVoicelistId()));
+            userVoicelist.setUploadCount((int) count);
+            long count2 = Db.count(Wrappers.lambdaQuery(Subscribe.class)
+                    .eq(Subscribe::getVoiceListId, userVoicelist.getVoicelistId()));
+            userVoicelist.setSubscribeNum((int) count2);
+        }
+        return Result.ok("ok", page);
+    }
+
+    @CacheEvict(value = "uploadDetail/listVoicelist", allEntries = true)
+    @GetMapping("/refreshVoiceList")
+    public Result<String> refreshVoiceList() {
+        SysUser sysUser = JwtUtil.verifierFromContext();
+        userVoicelistService.syncUserVoicelist(sysUser.getId());
+        return Result.ok("ok");
+    }
+
+    @GetMapping("/getById")
+    public Result<UploadDetail> get(@RequestParam(name = "id") Long id) {
+        return Result.ok("ok", Db.getById(id, UploadDetail.class));
+    }
+
     @CacheEvict(value = "uploadDetail/list", allEntries = true)
     @GetMapping("/delete")
     public Result<Boolean> delete(@RequestParam(name = "id") Long id) {
@@ -194,45 +224,6 @@ public Result<Boolean> delete(@RequestParam(name = "id") Long id) {
         return Result.ok("ok");
     }
 
-    @CacheEvict(value = "uploadDetail/list", allEntries = true)
-    @PostMapping("/add")
-    public Result<String> addQueue(@RequestBody AddQueueRequest reqs) {
-        Long userId = JwtUtil.verifierFromContext().getId();
-        List<SysUser> userList = SimpleQuery.list(Wrappers.lambdaQuery(SysUser.class)
-                .eq(SysUser::getId, userId), i -> i);
-        boolean isAdmin = !userList.isEmpty() && userList.get(0).getIsAdmin() == 1;
-        List<UserVoicelist> userVoicelistList = userVoicelistService.lambdaQuery()
-                .eq(UserVoicelist::getUserId, userId)
-                .list();
-        Map<Long, UserVoicelist> userVoicelistMap =
-                SimpleQuery.list2Map(userVoicelistList, UserVoicelist::getVoicelistId, i -> i);
-        for (UploadDetail req : reqs.getUploadDetails()) {
-            Assert.isTrue(StrUtil.isNotBlank(req.getBvid()), "bvid empty");
-            Assert.isTrue(req.getVoiceListId() != null, "voiceListId empty");
-            Assert.notNull(userVoicelistMap.get(req.getVoiceListId()), "not owner");
-            SimpleVideoInfo simpleVideoInfo = bilibiliClient.getSimpleVideoInfoByBvidOrUrl(req.getBvid());
-            UploadDetail uploadDetail = new UploadDetail();
-            uploadDetail.setBvid(simpleVideoInfo.getBvid());
-            uploadDetail.setCid(req.getCid());
-            uploadDetail.setVoiceListId(req.getVoiceListId());
-            uploadDetail.setUseVideoCover(req.getUseVideoCover());
-            uploadDetail.setBeginSec(req.getBeginSec());
-            uploadDetail.setEndSec(req.getEndSec());
-            uploadDetail.setOffset(req.getOffset());
-            uploadDetail.setUploadName(req.getUploadName());
-            uploadDetail.setPrivacy(req.getPrivacy());
-            uploadDetail.setPriority(isAdmin ? 999L : 10L);
-            uploadDetail.setBitrate(req.getBitrate());
-            uploadDetail.setUserId(userId);
-            uploadDetail.setCrack(req.getCrack());
-            if (req.getCrack() == 1) {
-                Assert.isTrue(isAdmin, "crack error");
-            }
-            Db.save(uploadDetail);
-        }
-        return Result.ok("添加队列成功");
-    }
-
     @CacheEvict(value = "uploadDetail/list", allEntries = true)
     @GetMapping("/restartJob")
     public Result<String> restartJob(@RequestParam(name = "id") Long id) {

download/src/main/java/github/nooblong/download/entity/CidName.java

@@ -0,0 +1,9 @@
+package github.nooblong.download.entity;
+
+import lombok.Data;
+
+@Data
+public class CidName {
+    private String cid;
+    private String name;
+}

download/src/main/java/github/nooblong/download/entity/IdName.java

@@ -0,0 +1,9 @@
+package github.nooblong.download.entity;
+
+import lombok.Data;
+
+@Data
+public class IdName {
+    private String id;
+    private String name;
+}