Skip to content

Commit 829e3d1

Browse files
committed
fix: modified codes
1 parent 8cd65f5 commit 829e3d1

15 files changed

+245
-67
lines changed

src/main/java/com/jiaruiblog/DocumentSharingSiteApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* @Date 2022/6/2 10:58 下午
1616
* @Version 1.0
1717
**/
18+
//@EnableAsync(proxyTargetClass=true)
1819
@ServletComponentScan(basePackages = "com.jiaruiblog.filter")
1920
@SpringBootApplication
2021
public class DocumentSharingSiteApplication {

src/main/java/com/jiaruiblog/controller/CollectController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.jiaruiblog.entity.CollectDocRelationship;
44
import com.jiaruiblog.entity.dto.CollectDTO;
5-
import com.jiaruiblog.service.impl.CollectServiceImpl;
5+
import com.jiaruiblog.service.CollectService;
66
import com.jiaruiblog.util.BaseApiResult;
77
import io.swagger.annotations.Api;
88
import io.swagger.annotations.ApiOperation;
@@ -28,7 +28,7 @@
2828
public class CollectController {
2929

3030
@Resource
31-
CollectServiceImpl collectServiceImpl;
31+
CollectService collectService;
3232

3333
/**
3434
* @Author luojiarui
@@ -41,13 +41,13 @@ public class CollectController {
4141
@ApiOperation(value = "新增一个收藏文档", notes = "新增单个收藏文档")
4242
@PostMapping(value = "/auth/insert")
4343
public BaseApiResult insert(@RequestBody CollectDTO collect, HttpServletRequest request) {
44-
return collectServiceImpl.insert(setRelationshipValue(collect, request));
44+
return collectService.insert(setRelationshipValue(collect, request));
4545
}
4646

4747
@ApiOperation(value = "根据id移除某个收藏文档", notes = "根据id移除某个文档")
4848
@DeleteMapping(value = "/auth/remove")
4949
public BaseApiResult remove(@RequestBody CollectDTO collect, HttpServletRequest request) {
50-
return collectServiceImpl.remove(setRelationshipValue(collect, request));
50+
return collectService.remove(setRelationshipValue(collect, request));
5151
}
5252

5353
/**

src/main/java/com/jiaruiblog/service/CategoryService.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import com.jiaruiblog.entity.CateDocRelationship;
44
import com.jiaruiblog.entity.Category;
5-
5+
import com.jiaruiblog.entity.vo.CategoryVO;
66
import com.jiaruiblog.util.BaseApiResult;
77

8+
import java.util.List;
9+
810
/**
911
* @Author Jarrett Luo
1012
* @Date 2022/6/7 11:38
@@ -100,5 +102,28 @@ BaseApiResult getMyCollection(String cateId, String tagId, String keyword,
100102
BaseApiResult getMyUploaded(String cateId, String tagId, String keyword,
101103
Long pageNum, Long pageSize, String userId);
102104

105+
List<Category> getRandom();
106+
107+
void addRelationShipDefault(String categoryId, String docId);
108+
109+
void addRelationShipDefault(String categoryId, List<String> docIds);
110+
111+
112+
113+
List<CateDocRelationship> getRelateByCateId(String cateId);
114+
115+
long countAllFile();
116+
117+
String saveOrUpdateCate(String cateName);
118+
119+
void removeRelateByDocId(String docId);
120+
121+
List<String> fuzzySearchDoc(String keyWord);
122+
123+
Category queryById(String id);
124+
125+
List<String> queryDocListByCategory(Category categoryDb);
126+
127+
CategoryVO queryByDocId(String docId);
103128

104129
}

src/main/java/com/jiaruiblog/service/CollectService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,9 @@ public interface CollectService {
3232
* @return -> ApiResult
3333
*/
3434
BaseApiResult remove(CollectDocRelationship collect);
35+
36+
37+
void removeRelateByDocId(String docId);
38+
39+
Long collectNum(String docId);
3540
}

src/main/java/com/jiaruiblog/service/ICommentService.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,12 @@ public interface ICommentService {
6666
**/
6767
BaseApiResult queryAllComments(BasePageDTO pageDTO, String userId, Boolean isAdmin);
6868

69+
long countAllFile();
70+
71+
List<String> fuzzySearchDoc(String keyWord);
72+
73+
void removeByDocId(String docId);
74+
75+
Long commentNum(String docId);
76+
6977
}

src/main/java/com/jiaruiblog/service/IFileService.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,15 @@ BaseApiResult uploadByUrl(String category, List<String> tags, String name,
215215
**/
216216
String uploadFileToGridFs(String prefix, InputStream in, String contentType);
217217

218+
/**
219+
* @Author luojiarui
220+
* @Description // 通过文档id查询文档详情信息
221+
* @Date 22:28 2024/7/21
222+
* @Param [docId]
223+
* @return java.util.List<com.jiaruiblog.entity.FileDocument>
224+
**/
225+
List<FileDocument> queryByDocIds(String ...docId);
226+
218227
/**
219228
* @Author luojiarui
220229
* @Description 查询并删除某个文档
@@ -250,4 +259,8 @@ BaseApiResult uploadByUrl(String category, List<String> tags, String name,
250259
* @return com.jiaruiblog.util.BaseApiResult
251260
**/
252261
BaseApiResult queryFileDocumentResult(BasePageDTO pageDTO, boolean reviewing);
262+
263+
long countAllFile();
264+
265+
boolean isExist(String docId);
253266
}

src/main/java/com/jiaruiblog/service/IUserService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,7 @@ public interface IUserService {
8888
**/
8989
BaseApiResult resetUserPwd(String userId, String adminId);
9090

91+
92+
boolean isExist(String userId);
93+
9194
}

src/main/java/com/jiaruiblog/service/TagService.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.jiaruiblog.service;
22

3+
import com.jiaruiblog.entity.FileDocument;
34
import com.jiaruiblog.entity.Tag;
45
import com.jiaruiblog.entity.TagDocRelationship;
6+
import com.jiaruiblog.entity.vo.TagVO;
57
import com.jiaruiblog.util.BaseApiResult;
8+
import org.springframework.scheduling.annotation.Async;
69

710
import java.util.List;
811
import java.util.Map;
@@ -86,4 +89,25 @@ public interface TagService {
8689
**/
8790
boolean relateExist(String tagId, String fileId);
8891

92+
long countAllFile();
93+
94+
@Async
95+
void saveTagWhenSaveDoc(FileDocument fileDocument);
96+
97+
void removeRelateByDocId(String docId);
98+
99+
void addTagRelationShip(List<String> tags, List<String> docIds);
100+
101+
Tag queryByTagId(String id);
102+
103+
List<String> queryDocIdListByTagId(String tagId);
104+
105+
void clearInvalidTagRelationship(String tagId);
106+
107+
List<String> fuzzySearchDoc(String keyWord);
108+
109+
List<TagVO> queryByDocId(String id);
110+
111+
List<String> saveOrUpdateBatch(List<String> tags);
112+
89113
}

src/main/java/com/jiaruiblog/service/impl/CategoryServiceImpl.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public BaseApiResult update(Category category) {
9999
* @Param [cateName]
100100
* @return java.lang.String
101101
**/
102+
@Override
102103
public String saveOrUpdateCate(String cateName) {
103104
if (!StringUtils.hasText(cateName)) {
104105
return null;
@@ -229,6 +230,7 @@ private void addDocRelate(CateDocRelationship relationship) {
229230
}
230231

231232
@Async
233+
@Override
232234
public void addRelationShipDefault(String categoryId, String docId) {
233235
if (categoryId == null) {
234236
return;
@@ -241,6 +243,7 @@ public void addRelationShipDefault(String categoryId, String docId) {
241243
addDocRelate(relationship);
242244
}
243245

246+
@Override
244247
public void addRelationShipDefault(String categoryId, List<String> docIds) {
245248
for (String docId : docIds) {
246249
addRelationShipDefault(categoryId, docId);
@@ -267,6 +270,7 @@ public BaseApiResult cancelCategoryRelationship(CateDocRelationship relationship
267270
* @param categoryDb -> Category
268271
* @return -> List<String>
269272
*/
273+
@Override
270274
public List<String> queryDocListByCategory(Category categoryDb) {
271275
Query query = new Query(Criteria.where(CATEGORY_ID).is(categoryDb.getId()));
272276
List<CateDocRelationship> result = mongoTemplate.find(query, CateDocRelationship.class, RELATE_COLLECTION_NAME);
@@ -282,6 +286,7 @@ public List<String> queryDocListByCategory(Category categoryDb) {
282286
* @param id -> String
283287
* @return -> Category
284288
*/
289+
@Override
285290
public Category queryById(String id) {
286291
if (id == null || "".equals(id)) {
287292
return null;
@@ -296,6 +301,7 @@ public Category queryById(String id) {
296301
* @Date 10:52 下午 2022/6/22
297302
* @Param [docId]
298303
**/
304+
@Override
299305
public CategoryVO queryByDocId(String docId) {
300306

301307
Query query1 = new Query().addCriteria(Criteria.where(FILE_ID).is(docId));
@@ -320,6 +326,7 @@ public CategoryVO queryByDocId(String docId) {
320326
* @param keyWord 关键字
321327
* @return 文档的id信息
322328
*/
329+
@Override
323330
public List<String> fuzzySearchDoc(String keyWord) {
324331
if (!StringUtils.hasText(keyWord)) {
325332
return Lists.newArrayList();
@@ -342,6 +349,7 @@ public List<String> fuzzySearchDoc(String keyWord) {
342349
* @Date 11:20 上午 2022/6/25
343350
* @Param [docId]
344351
**/
352+
@Override
345353
public void removeRelateByDocId(String docId) {
346354
Query query = new Query(Criteria.where("fileId").is(docId));
347355
// 根据文档id进行文档关系的删除
@@ -355,6 +363,7 @@ public void removeRelateByDocId(String docId) {
355363
* @Date 4:58 下午 2022/6/26
356364
* @Param []
357365
**/
366+
@Override
358367
public List<Category> getRandom() {
359368
int pageIndex = 1;
360369
int pageSize = 3;
@@ -372,6 +381,7 @@ public List<Category> getRandom() {
372381
* @Date 5:00 下午 2022/6/26
373382
* @Param [cateId]
374383
**/
384+
@Override
375385
public List<CateDocRelationship> getRelateByCateId(String cateId) {
376386
long pageIndex = 0;
377387
int pageSize = 7;
@@ -390,6 +400,7 @@ public List<CateDocRelationship> getRelateByCateId(String cateId) {
390400
* @Date 4:40 下午 2022/6/26
391401
* @Param []
392402
**/
403+
@Override
393404
public long countAllFile() {
394405
return mongoTemplate.getCollection(COLLECTION_NAME).estimatedDocumentCount();
395406
}

src/main/java/com/jiaruiblog/service/impl/CollectServiceImpl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import com.jiaruiblog.common.MessageConstant;
44
import com.jiaruiblog.entity.CollectDocRelationship;
55
import com.jiaruiblog.service.CollectService;
6+
import com.jiaruiblog.service.IFileService;
7+
import com.jiaruiblog.service.IUserService;
68
import com.jiaruiblog.util.BaseApiResult;
79
import lombok.extern.slf4j.Slf4j;
810
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -31,10 +33,10 @@ public class CollectServiceImpl implements CollectService {
3133
MongoTemplate mongoTemplate;
3234

3335
@Resource
34-
UserServiceImpl userServiceImpl;
36+
IUserService userService;
3537

3638
@Resource
37-
FileServiceImpl fileServiceImpl;
39+
IFileService iFileService;
3840

3941
/**
4042
* @return com.jiaruiblog.utils.ApiResult
@@ -55,7 +57,7 @@ public BaseApiResult insert(CollectDocRelationship collect) {
5557
@Override
5658
public Boolean insertRelationShip(CollectDocRelationship collect) {
5759
// 必须经过userId和docId的校验,否则不予关注
58-
if (!userServiceImpl.isExist(collect.getUserId()) || !fileServiceImpl.isExist(collect.getDocId())) {
60+
if (!userService.isExist(collect.getUserId()) || !iFileService.isExist(collect.getDocId())) {
5961
return false;
6062
}
6163

@@ -110,6 +112,7 @@ private CollectDocRelationship getExistRelationship(CollectDocRelationship colle
110112
* @Date 22:35 2022/9/24
111113
* @Param [docId]
112114
**/
115+
@Override
113116
public Long collectNum(String docId) {
114117
Query query = new Query().addCriteria(Criteria.where(DOC_ID).is(docId));
115118
return mongoTemplate.count(query, CollectDocRelationship.class, COLLECTION_NAME);
@@ -121,6 +124,7 @@ public Long collectNum(String docId) {
121124
* @Date 11:17 上午 2022/6/25
122125
* @Param [docId]
123126
**/
127+
@Override
124128
public void removeRelateByDocId(String docId) {
125129
Query query = new Query(Criteria.where(DOC_ID).is(docId));
126130
List<CollectDocRelationship> relationships = mongoTemplate.find(query, CollectDocRelationship.class,

0 commit comments

Comments
 (0)