From 92fbe2ee930bb15b3f44690962a368e44b251804 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 24 Feb 2022 10:22:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableDate/index.vue | 22 +++++++++--- .../views/documentManage/library/index.vue | 35 +++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 52afe750e..11cecda6c 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -14,10 +14,20 @@ > {{ ol.text instanceof Array ? ol.text[record.collectFlag || 0] : ol.text}} + @click="OperationClick(ol,record)"> + + {{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}} + + + {{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}} + + + {{ol.text}} + + - - {{text}} + + {{text}} @@ -174,8 +184,10 @@ OperationClick(ol, item) { this.$emit(ol.ClickEvent, item) }, - detailClick(item){ - this.$emit('detailClick',item) + detailClick(item,index){ + console.log(item) + console.log(index) + // this.$emit('detailClick',item) }, } } diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index e450d4bf7..d27cb878a 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -65,11 +65,11 @@ return { OperationList: [ { - text: ['收藏','取消收藏'], + text: '收藏', ClickEvent: 'Collection' }, { - text: ['订阅','取消订阅'], + text: '订阅', ClickEvent: 'subscribe' }, { @@ -171,12 +171,12 @@ Collection(val) { let _this = this this.$confirm({ - content: val.collectFlag == 0 || !val.collectFlag ? '确认收藏？':'确定取消收藏', + content: val.collectFlag == 0 || !val.collectFlag ? '确认收藏？' : '确定取消收藏？', onOk() { let url = '' - if (val.collectFlag == 0 || !val.collectFlag){ + if (val.collectFlag == 0 || !val.collectFlag) { url = 'document/bussDocumentLibraryEO/addCollect' - }else{ + } else { url = 'document/bussDocumentLibraryEO/cancelCollect' } getAction(url, { id: val.id }).then((res) => { @@ -192,17 +192,38 @@ }, //订阅按钮 subscribe(val) { - console.log('val222', val) + let _this = this + this.$confirm({ + content: val.subscribeFlag == 0 || !val.subscribeFlag ? '确认订阅？' : '确定取消订阅？', + onOk() { + let url = '' + if (val.subscribeFlag == 0 || !val.subscribeFlag) { + url = 'document/bussDocumentLibraryEO/addSubscribe' + } else { + url = 'document/bussDocumentLibraryEO/cancelSubscribe' + } + getAction(url, { id: val.id }).then((res) => { + if (res.success) { + _this.$message.success(res.message) + eventBUs.$emit('searchReset') + } else { + _this.$message.warning(res.message) + } + }) + } + }) }, + onSelectChange(value) { this.idList = value }, + detailClick(item) { this.$router.push({ path: '/docManage/library/detail', query: item }) - } + }, } } From cc8ba8a2b72a1ef2c5c5c10e66a046a53004e048 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 24 Feb 2022 10:26:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E9=98=85+=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OnlCgformCollection.java | 17 -------------- .../subscribe/entity/OnlCgformSubscribe.java | 23 ------------------- 2 files changed, 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java index a30264d40..481a2b536 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java @@ -60,21 +60,4 @@ public class OnlCgformCollection extends BussDocumentLibraryEO implements Serial @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id") @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id") private String documentId; - - /**状态*/ - @Excel(name = "状态", width = 15, dictTable = "buss_document_library", dicText = "state", dicCode = "state") - @Dict(dictTable = "buss_document_library", dicText = "state", dicCode = "state") - private String state; - - /**编号*/ - @Excel(name = "编号", width = 15, dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") - @Dict(dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") - private String serialNumber; - - /**标题*/ - @Excel(name = "标题", width = 15, dictTable = "buss_document_library", dicText = "title", dicCode = "title") - @Dict(dictTable = "buss_document_library", dicText = "title", dicCode = "title") - @ApiModelProperty(value = "标题") - private String title; - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java index 0bdee41a5..677b1d36a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/entity/OnlCgformSubscribe.java @@ -63,27 +63,4 @@ public class OnlCgformSubscribe implements Serializable { @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id") @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id") private String documentId; - - /**状态*/ - @Excel(name = "状态", width = 15, dictTable = "buss_document_library", dicText = "state", dicCode = "state") - @Dict(dictTable = "buss_document_library", dicText = "state", dicCode = "state") - private String state; - - /**编号*/ - @Excel(name = "编号", width = 15, dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") - @Dict(dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber") - private String serialNumber; - - /**标题*/ - @Excel(name = "标题", width = 15, dictTable = "buss_document_library", dicText = "title", dicCode = "title") - @Dict(dictTable = "buss_document_library", dicText = "title", dicCode = "title") - @ApiModelProperty(value = "标题") - private String title; - - /**技术领域*/ - @Excel(name = "技术领域", width = 15) - @Dict(dicCode = "technology_territory") - @ApiModelProperty(value = "技术领域") - private String technologyTerritory; - } From c6e525aaf0532c62c47af1f1aff10a6cd4760024 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 24 Feb 2022 10:35:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableDate/index.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 11cecda6c..b81c4e23a 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -26,8 +26,8 @@ - - {{text}} + + {{text}} @@ -98,10 +98,12 @@ } }) this.searchParmes = search + this.getData() this.getTableList() }) eventBUs.$on('searchReset', target => { this.searchParmes = {} + this.getData() this.getTableList() }) this.getData() @@ -129,9 +131,11 @@ } } }) - let width + let width = 0 if (this.OperationList.length > 0) { - width = this.OperationList.length * 55 + this.OperationList.forEach((res) => { + width += res.text.length * 8 + width + }) } if (this.showAction) { this.columns.push({ @@ -184,11 +188,9 @@ OperationClick(ol, item) { this.$emit(ol.ClickEvent, item) }, - detailClick(item,index){ - console.log(item) - console.log(index) - // this.$emit('detailClick',item) - }, + detailClick(item, index) { + this.$emit('detailClick',item) + } } } From d696be01e3b0a829736f26443c3b733866afa0d5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 24 Feb 2022 10:51:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=92=8C=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OnlCgformCollection.java | 2 +- .../BussDocumentLibraryEOServiceImpl.java | 43 ++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java index 481a2b536..d6c739c67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java @@ -28,7 +28,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="onl_cgform_collection对象", description="我的收藏") -public class OnlCgformCollection extends BussDocumentLibraryEO implements Serializable { +public class OnlCgformCollection implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 593990436..64476aa7c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -691,9 +691,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //下拉选处理数据字典 - List records = infoPage.getRecords(); - for (Object record : records) { + List records = infoPage.getRecords(); + List idList = new ArrayList<>(); + for (Map record : records) { Map record1 = (Map) record; + idList.add((String) record1.get("id")); for (Map.Entry entry : record1.entrySet()) { List collect = fieldList.stream() .filter(e -> entry.getKey().equals(e.getDictField())) @@ -702,8 +704,45 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl records, List idList) { + //收藏 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(OnlCgformCollection::getDocumentId,idList); + List collectList = iOnlCgformCollectionService.list(wrapper); + List collectIdList = collectList.stream().map(OnlCgformCollection::getDocumentId).collect(Collectors.toList()); + //订阅 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId,idList); + List subscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); + List subscribeIdList = subscribeList.stream().map(OnlCgformSubscribe::getDocumentId).collect(Collectors.toList()); + + for (Map record : records) { + Map record1 = (Map) record; + String id = (String) record1.get("id"); + //收藏标识(0-->未收藏 1-->已收藏) + if(collectIdList.contains(id)){ + record1.put("collectFlag","1"); + }else{ + record1.put("collectFlag","0"); + } + //订阅标识 + if(subscribeIdList.contains(id)){ + record1.put("subscribeFlag","1"); + }else{ + record1.put("subscribeFlag","0"); + } + } } /**