From 2c0ed4be589005d3b3787422267ce923e843885f Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Wed, 27 Dec 2023 17:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BF=9C=E7=A8=8B=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?;=E5=8E=BB=E9=99=A4=E6=A0=87=E7=AD=BE;=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lionwebsite/Configuration/CustomBean.java | 2 +- .../Controller/GalleryManageController.java | 47 ++----- .../lionwebsite/Controller/TagController.java | 47 ------- .../lionwebsite/Dao/normal/TagMapper.java | 60 --------- .../java/com/lion/lionwebsite/Domain/Tag.java | 14 -- .../com/lion/lionwebsite/Domain/TagMark.java | 11 -- .../Service/GalleryManageService.java | 37 +----- .../lionwebsite/Service/RemoteService.java | 7 - .../lion/lionwebsite/Service/TagService.java | 125 ------------------ src/main/resources/LionWebsite.db | Bin 442368 -> 442368 bytes 10 files changed, 15 insertions(+), 335 deletions(-) delete mode 100644 src/main/java/com/lion/lionwebsite/Controller/TagController.java delete mode 100644 src/main/java/com/lion/lionwebsite/Dao/normal/TagMapper.java delete mode 100644 src/main/java/com/lion/lionwebsite/Domain/Tag.java delete mode 100644 src/main/java/com/lion/lionwebsite/Domain/TagMark.java delete mode 100644 src/main/java/com/lion/lionwebsite/Service/TagService.java diff --git a/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java b/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java index f7f1882..1345411 100644 --- a/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java +++ b/src/main/java/com/lion/lionwebsite/Configuration/CustomBean.java @@ -16,7 +16,7 @@ import com.pengrad.telegrambot.model.User; @Configuration @RegisterReflectionForBinding(classes = {CustomConfiguration.class, GidToKey.class, ImageKeyCache.class, GalleryForQuery.class, Gallery.class, GalleryTask.class, HikariConfig.class, - PageNameCache.class, ShareFile.class, Tag.class, TagMark.class, User.class, + PageNameCache.class, ShareFile.class, User.class, SendResponse.class, Message.class, com.pengrad.telegrambot.model.User.class, Chat.class, MessageEntity.class, AbstractMethodError.class, DeleteGalleryMessage.class, DownloadPostMessage.class, DownloadStatusMessage.class, diff --git a/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java b/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java index bdb9e35..c799af5 100644 --- a/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java +++ b/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java @@ -9,8 +9,6 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/GalleryManage") @Slf4j @@ -28,11 +26,10 @@ public class GalleryManageController { } @PostMapping("") - public String create_task(String link, String targetResolution, String AuthCode, - @RequestParam(value = "tags", required = false) List tags){ + public String create_task(String link, String targetResolution, String AuthCode){ if(link == null || targetResolution == null) return Response._failure("参数不全"); - return galleryManageService.createTask(link, targetResolution, AuthCode, tags); + return galleryManageService.createTask(link, targetResolution, AuthCode); } @GetMapping("") @@ -41,37 +38,22 @@ public class GalleryManageController { if(type == null) return Response._failure("参数不全"); - switch (type) { - case "link" -> { - return galleryManageService.selectTaskByLink(param); - } - case "gid" -> { - return galleryManageService.selectTaskByGid(Integer.parseInt(param)); - } - case "all" -> { - return galleryManageService.selectAllGallery(userId); - } - case "name" -> { - return galleryManageService.selectGalleryByName(param); - } - case "undone" -> { - return galleryManageService.selectUnDoneGallery(); - } - case "downloader" -> { - return galleryManageService.selectGalleryByDownloader(AuthCode); - } - default -> { - return Response._failure("参数错误"); - } - } + return switch (type) { + case "link" -> galleryManageService.selectTaskByLink(param); + case "gid" -> galleryManageService.selectTaskByGid(Integer.parseInt(param)); + case "all" -> galleryManageService.selectAllGallery(userId); + case "name" -> galleryManageService.selectGalleryByName(param); + case "undone" -> galleryManageService.selectUnDoneGallery(); + case "downloader" -> galleryManageService.selectGalleryByDownloader(AuthCode); + default -> Response._failure("参数错误"); + }; } @DeleteMapping("") public String deleteTask(Integer gid, String AuthCode){ if(gid == null) return Response._failure("参数不全"); - - return galleryManageService.deleteGalleryByGid(gid, AuthCode); + return galleryManageService.deleteGalleryByGid(gid, AuthCode); } @@ -90,11 +72,6 @@ public class GalleryManageController { return galleryManageService.getWeekUsedAmount(); } -// @GetMapping("/onlineImage/{page}") -// public void getOnlineImage(Integer gid, @PathVariable("page") Short page, HttpServletRequest request, HttpServletResponse response){ -// galleryManageService.getOnlineImage(gid, page, request, response); -// } - @PostMapping("/cache") public String cacheImageKeys(String url){ return galleryManageService.cacheImagesKey(url); diff --git a/src/main/java/com/lion/lionwebsite/Controller/TagController.java b/src/main/java/com/lion/lionwebsite/Controller/TagController.java deleted file mode 100644 index 0078981..0000000 --- a/src/main/java/com/lion/lionwebsite/Controller/TagController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.lion.lionwebsite.Controller; - -import com.lion.lionwebsite.Service.TagService; -import com.lion.lionwebsite.Util.Response; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/GalleryManage") -public class TagController { - - TagService tagService; - - public TagController(TagService tagService) { - this.tagService = tagService; - } - - @PostMapping("/tag") - public String createTag(String tag){ - return tagService.createTag(tag); - } - - @PostMapping("/tagAndMark") - public String createTagAndMark(Integer gid, String tag){ - return tagService.createTagAndMark(gid, tag); - } - - @DeleteMapping("/tag") - public String deleteTag(Integer tid){ - return tid == null ? Response._failure("参数错误") : tagService.deleteTag(tid); - } - - @PostMapping("/mark") - public String markTag(Integer gid, Integer tid){ - return tagService.markTag(gid, tid); - } - - @PostMapping("/disMark") - public String disMarkTag(Integer gid, Integer tid){ - return tagService.disMarkTag(gid, tid); - } - - @GetMapping("/allTag") - public String allTag(){ - return tagService.selectAllTag(); - } -} diff --git a/src/main/java/com/lion/lionwebsite/Dao/normal/TagMapper.java b/src/main/java/com/lion/lionwebsite/Dao/normal/TagMapper.java deleted file mode 100644 index 731f722..0000000 --- a/src/main/java/com/lion/lionwebsite/Dao/normal/TagMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lion.lionwebsite.Dao.normal; - -import com.lion.lionwebsite.Domain.Tag; -import com.lion.lionwebsite.Domain.TagMark; -import org.apache.ibatis.annotations.*; - -import java.util.ArrayList; - -@Mapper -public interface TagMapper { - @Insert("insert into tag (tag) values (#{tag})") - @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") - void insertTag(Tag tag); - -// @Select("select id, tag, usage from tag where id=#{id}") -// Tag selectTagById(int id); -// -// @Select("select id from tag where tag=#{tag}") -// int selectTidByTag(String tag); - - @Select("select count(id) from tag where tag=#{tag}") - int selectTagExistByTag(String tag); - - @Select("select count(id) from tag where id=#{id}") - int selectTagExistById(int id); - - - @Select("select id, tag, usage from tag") - ArrayList selectAllTag(); - - @Delete("delete from tag where id=#{id}") - void deleteTagById(int id); - - @Select("select count(id) from galleryTag where tid=#{tid}") - int selectTagUsage(int tid); - - @Select("select count(id) from galleryTag where gid=#{gid} and tid=#{tid}") - int selectIsMark(@Param("gid") int gid, @Param("tid") int tid); - - @Select("select tid from galleryTag where gid=#{gid}") - ArrayList selectTagByGid(int gid); - - @Insert("insert into galleryTag (gid, tid) values (#{gid}, #{tid})") - int markTag(@Param("gid") int gid, @Param("tid") int tid); - - @Delete("delete from galleryTag where gid=#{gid} and tid=#{tid}") - int disMarkTag(@Param("gid") int gid, @Param("tid") int tid); - - @Select("select gid, tid from galleryTag") - ArrayList selectAllMark(); - - @Update("update tag set usage=usage+1 where id=#{tid}") - void incrTagUsage(int tid); - - @Update("update tag set usage=usage-1 where id=#{tid}") - void decrTagUsage(int tid); - - @Delete("delete from galleryTag where gid=#{gid}") - void disMarkTagByGid(int gid); -} diff --git a/src/main/java/com/lion/lionwebsite/Domain/Tag.java b/src/main/java/com/lion/lionwebsite/Domain/Tag.java deleted file mode 100644 index d83771d..0000000 --- a/src/main/java/com/lion/lionwebsite/Domain/Tag.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.lion.lionwebsite.Domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class Tag { - int id; - String tag; - int usage; -} diff --git a/src/main/java/com/lion/lionwebsite/Domain/TagMark.java b/src/main/java/com/lion/lionwebsite/Domain/TagMark.java deleted file mode 100644 index 64c5ced..0000000 --- a/src/main/java/com/lion/lionwebsite/Domain/TagMark.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lion.lionwebsite.Domain; - -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -public class TagMark { - int gid; - int tid; -} diff --git a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java index fd65a39..2109cfb 100644 --- a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java +++ b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java @@ -1,6 +1,5 @@ package com.lion.lionwebsite.Service; -import cn.hutool.core.io.FileUtil; import com.lion.lionwebsite.Dao.cache.ImageCacheMapper; import com.lion.lionwebsite.Dao.normal.*; import com.lion.lionwebsite.Domain.*; @@ -44,8 +43,6 @@ public class GalleryManageService { ShareFileMapper shareFileMapper; - TagMapper tagMapper; - ImageCacheMapper imageCacheMapper; RemoteService remoteService; @@ -53,13 +50,12 @@ public class GalleryManageService { PushService pushService; public GalleryManageService(GalleryMapper galleryMapper, CollectMapper collectMapper, CustomConfigurationMapper configurationMapper, UserMapper userMapper, ShareFileMapper shareFileMapper, - TagMapper tagMapper, RemoteService remoteService, PushService pushService, ImageCacheMapper imageCacheMapper) { + RemoteService remoteService, PushService pushService, ImageCacheMapper imageCacheMapper) { this.galleryMapper = galleryMapper; this.collectMapper = collectMapper; this.configurationMapper = configurationMapper; this.userMapper = userMapper; this.shareFileMapper = shareFileMapper; - this.tagMapper = tagMapper; this.remoteService = remoteService; this.pushService = pushService; this.imageCacheMapper = imageCacheMapper; @@ -72,7 +68,7 @@ public class GalleryManageService { * @param AuthCode 授权码（用于记录是谁下载的） * @return 提交结果 */ - public String createTask(String link, String targetResolution, String AuthCode, List tidS) { + public String createTask(String link, String targetResolution, String AuthCode) { Response response = Response.generateResponse(); User user = userMapper.selectUserByAuthCode(AuthCode); // return Response._failure("调试中，请勿提交任务"); @@ -136,10 +132,6 @@ public class GalleryManageService { long usedAmount = Long.parseLong(configurationMapper.selectConfiguration(CustomConfiguration.WEEK_USED_AMOUNT).getValue()); usedAmount += gallery.getFileSize(); configurationMapper.updateConfiguration(CustomConfiguration.WEEK_USED_AMOUNT, String.valueOf(usedAmount)); - if (tidS != null) - for (Integer tid : tidS) - if (tagMapper.selectTagExistById(tid) > 0) - tagMapper.markTag(gallery.getGid(), tid); } else { response.failure("提交失败，未知原因"); galleryMapper.deleteGalleryByGid(gallery.getGid()); @@ -238,23 +230,6 @@ public class GalleryManageService { } } - - HashMap> tagsMap = new HashMap<>(); - ArrayList tags = tagMapper.selectAllMark(); - - for (TagMark tagMark : tags) { //从数据库取出所有标记，然后筛选出 gid -> tids ，后面加个缓存 - tagsMap.computeIfAbsent(tagMark.getGid(), k -> new ArrayList<>()); - tagsMap.get(tagMark.getGid()).add(tagMark.getTid()); - } - - ArrayList temp; - for (Gallery gallery : galleries) { - if ((temp = tagsMap.get(gallery.getGid())) != null) { - gallery.setTags(new ArrayList<>()); - gallery.getTags().addAll(temp); - } - } - response.success(new ObjectMapper().valueToTree(galleries).toString()); return response.toJSONString(); } @@ -334,14 +309,6 @@ public class GalleryManageService { else { log.info("删除本子{}", gallery.getName()); galleryMapper.deleteGalleryByGid(gallery.getGid()); //删除本子记录 - ArrayList tidS = tagMapper.selectTagByGid(gallery.getGid()); - for (Integer tid : tidS) - tagMapper.decrTagUsage(tid); - - tagMapper.disMarkTagByGid(gallery.getGid()); //删除本子标记 - - if (new File(TargetPath + "/" + gallery.getName()).isDirectory()) //删除本地缓存 - FileUtil.del(TargetPath + "/" + gallery.getName()); } switch (remoteService.deleteGallery(gallery)) { case ErrorCode.IO_ERROR -> response.failure("本子:" + gallery.getName() + "删除失败，IO错误"); diff --git a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java index 13d7e13..3a8af80 100644 --- a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java +++ b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java @@ -5,7 +5,6 @@ import com.lion.lionwebsite.Domain.Gallery; import com.lion.lionwebsite.Domain.GalleryTask; import com.lion.lionwebsite.Message.*; -import com.lion.lionwebsite.Util.CustomUtil; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -18,14 +17,8 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.io.File; import java.io.IOException; import java.net.*; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; -import java.nio.file.StandardOpenOption; import java.util.HashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/lion/lionwebsite/Service/TagService.java b/src/main/java/com/lion/lionwebsite/Service/TagService.java deleted file mode 100644 index 59e7eea..0000000 --- a/src/main/java/com/lion/lionwebsite/Service/TagService.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.lion.lionwebsite.Service; - -import com.lion.lionwebsite.Dao.normal.GalleryMapper; -import com.lion.lionwebsite.Dao.normal.TagMapper; -import com.lion.lionwebsite.Domain.Gallery; -import com.lion.lionwebsite.Domain.Tag; -import com.lion.lionwebsite.Util.Response; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; - -@Service -public class TagService { - TagMapper tagMapper; - - GalleryMapper galleryMapper; - - public TagService(TagMapper tagMapper, GalleryMapper galleryMapper) { - this.tagMapper = tagMapper; - this.galleryMapper = galleryMapper; - } - - public String createTag(String tagStr){ - Response response = Response.generateResponse(); - //查看tag是否存在 - if(tagMapper.selectTagExistByTag(tagStr) != 0){ - response.failure("该tag:" + tagStr + "已存在"); - }else{ - Tag tag = new Tag(0, tagStr, 0); - tagMapper.insertTag(tag); - response.success("创建tag:" + tagStr + "成功"); - response.set("tid", String.valueOf(tag.getId())); - } - - return response.toJSONString(); - } - - public String selectAllTag(){ - Response response = Response.generateResponse(); - ArrayList tags = tagMapper.selectAllTag(); - HashMap tagHashMap = new HashMap<>(); - for (Tag tag : tags) { - tagHashMap.put(tag.getId(), tag); - } - - if(tags.isEmpty()) - response.failure("当前还没有标签"); - else - response.success(new ObjectMapper().valueToTree(tagHashMap).toString()); - - return response.toJSONString(); - } - - public String deleteTag(int tagId){ - Response response = Response.generateResponse(); - - if(tagMapper.selectTagUsage(tagId) == 0){ - tagMapper.deleteTagById(tagId); - response.success("标签删除成功"); - }else{ - response.failure("标签删除失败，还有本子引用该标签(如果还显示可以删除，请刷新)"); - } - - return response.toJSONString(); - } - - public String markTag(int gid, int tid){ - Response response = Response.generateResponse(); - - Gallery gallery = galleryMapper.selectGalleryByGid(gid); - if(gallery == null)//查看本子是否存在 - response.failure("本子不存在，无法标记标签"); - else if (tagMapper.selectTagExistById(tid) == 0) //查看标签是否存在 - response.failure("标签不存在，无法标记标签"); - else - if(tagMapper.selectIsMark(gid, tid) != 0) //查看是否已有该条记录 - response.failure("当前本子已有该标签"); - else { - if (tagMapper.markTag(gid, tid) == 1) { - response.success("标记本子成功"); - tagMapper.incrTagUsage(tid); - } - else - response.failure("未知错误"); - } - - return response.toJSONString(); - } - - public String createTagAndMark(int gid, String tagString){ - Response response = Response.generateResponse(); - Gallery gallery = galleryMapper.selectGalleryByGid(gid); - //查看tag是否存在 - if(tagMapper.selectTagExistByTag(tagString) != 0){ - response.failure("该tag:" + tagString + "已存在，请刷新再尝试"); - }else if(gallery == null) {//查看本子是否存在 - response.failure("本子不存在，取消创建标签，请刷新再尝试"); - }else{ - Tag tag = new Tag(0, tagString, 0); - tagMapper.insertTag(tag); - if (tagMapper.markTag(gid, tag.getId()) == 1) { - response.success("创建标签并标记成功"); - response.set("tid", String.valueOf(tag.getId())); - tagMapper.incrTagUsage(tag.getId()); - } - } - - return response.toJSONString(); - } - - public String disMarkTag(int gid, int tid){ - Response response = Response.generateResponse(); - if(tagMapper.disMarkTag(gid, tid) == 0) - response.failure("取消标记失败，可能并没有标记"); - else { - response.success("取消标记成功"); - tagMapper.decrTagUsage(tid); - } - - return response.toJSONString(); - } - -} diff --git a/src/main/resources/LionWebsite.db b/src/main/resources/LionWebsite.db index 61bd9deab5890645c1c02fdb2bb148aecfae60f1..b7efde1d37a82b032391ca6ac027d0be84a64bfb 100644 GIT binary patch delta 201 zcmZo@kZx#@o**r_pMilP2Z;HB*c6B>Ch8a~?q|@;+ri6znSql%mw~^4?+Nd3-jzJR zxh=R@*>l;ivtQrX5X{cRy<+oK_RGvH3=E9Hlh<&s05TYsZ;s$uX)MZro`HpbB?JFA z{u}%|_*a7A{W3F4qb581*f&S;tTYw{8pOuGl7asl z|5N@O{O9?1@UP^byjih9pMSD}fZycF{x(wVEX=};C5h?M+|10qIjPAd>ikU1 wikn~h%S~W3n#}Rw1V?&iUSf`!sb2Gq2kkc=Faj|X5HkZY%k~=&ST*hg0Fl5yZ2$lO