From 05de8d56860801abf2e6baafd6682044db8d736c Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 31 Aug 2022 14:36:46 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug5?= =?UTF-8?q?8761,58758-=E8=A7=A3=E5=86=B3sql=E4=B8=AD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 5e3a7e59d..5d53c71c0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -419,6 +419,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Wed, 31 Aug 2022 16:46:56 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E8=BD=AC=E5=8F=91=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOController.java | 9 ++ .../IProblemKnowledgeBaseEOService.java | 9 ++ .../ProblemKnowledgeBaseEOServiceImpl.java | 135 ++++++++++++++++++ 3 files changed, 153 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java index 41b5dcb78..ec31393a5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; @@ -172,4 +174,11 @@ public class ProblemKnowledgeBaseEOController extends JeroController forward(@RequestBody JSONObject json) { + return this.problemKnowledgeBaseEOService.forward(json); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java index 4b538190c..0c3131507 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -1,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -75,4 +77,11 @@ public interface IProblemKnowledgeBaseEOService extends IService queryWrapper,ProblemKnowledgeBaseEO problemKnowledgeBaseEO); + + /** + * 转发 + * @param json + * @return + */ + Result forward(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index ff9e0fa10..b7460d4c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -4,14 +4,21 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.WebsocketConst; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.es.JeroElasticsearchTemplate; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.enums.SearchEnum; import com.jero.modules.document.utils.ReadPdfUtil; import com.jero.modules.document.utils.ReadWordUtil; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.problemKnowledgeBase.entity.*; @@ -20,16 +27,24 @@ import com.jero.modules.problemKnowledgeBase.enums.PraiseStatusEnum; import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.*; +import com.jero.modules.project.enums.JumpLinkEnum; import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysAnnouncementService; +import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictService; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.IOException; import java.util.*; import java.util.stream.Collectors; @@ -37,6 +52,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; /** @@ -67,10 +83,23 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl forward(JSONObject json) { + String cut = json.getString("cut"); + + String userIds = json.getString("userIds"); + String departIds = json.getString("departIds"); + if(StringUtils.isEmpty(userIds) && StringUtils.isNotEmpty(departIds)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("至少选择一个人或部门进行转发！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Select at least one person or department to forward!"); + } + } + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + List userList = new ArrayList<>(); + + Set allDepartIds = new HashSet<>(); + if(StringUtils.isNotEmpty(departIds)){ + String[] departIdArr = departIds.split(","); + for (String departId : departIdArr) { + List subDepIdsByDepId = this.sysDepartService.getSubDepIdsByDepId(departId); + allDepartIds.addAll(subDepIdsByDepId); + } + + //查询部门下的人员 + if(allDepartIds.size() != 0){ + List userListByDepIds = this.sysUserService.getUserListByDepIds(new ArrayList<>(allDepartIds)); + userList.addAll(userListByDepIds); + } + } + + if(StringUtils.isNotEmpty(userIds)){ + List sysUsers = this.sysUserService.querySysUserListByIdList(Arrays.asList(userIds.split(","))); + userList.addAll(sysUsers); + } + + List userIdList = new ArrayList<>(); + List thirdIdList = new ArrayList<>(); + if (userList.size() != 0) { + userIdList.addAll(userList.stream().map(SysUser::getId).distinct().collect(Collectors.toList())); + thirdIdList.addAll(userList.stream().map(SysUser::getThirdId).distinct().collect(Collectors.toList())); + } + + //String msgType = json.getString("msgType"); + String problemKnowledgeBaseId = json.getString("problemKnowledgeBaseId"); + //问题知识库标题 + String problemKnowledgeBaseTitle = json.getString("problemKnowledgeBaseTitle"); + + //XXX向您推送了XXXXXXXXXX，请注意查看。 + String msgContentEN = currentUser.getUsername()+" pushed " + problemKnowledgeBaseTitle + " to you.Please be reminded to check it out."; + String msgTitle = problemKnowledgeBaseTitle + " has been shared with you, please check."; + + //飞书跳转链接 + String hrefFeishu = backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE_DETAIL.getLink() + "?id=" + problemKnowledgeBaseId; + //系统内部跳转链接 + String href = "" + " View details" + ""; + String contentInfo = msgContentEN + " " + href; + + //封装消息的实体类 + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContentEN, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); + this.sysAnnouncementService.saveAnnouncement(sysAnnouncement); + this.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo); + //飞书 + try { + this.iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), msgContentEN, MessageTypeEnum.PUSH.getName(), hrefFeishu); + } catch (IOException e) { + log.error("飞书推送失败"); + } + this.sendWebsocket(problemKnowledgeBaseId, contentInfo); + return Result.OK("转发成功！"); + } + + public void sendWebsocket(String msgId, String msgTet) { + JSONObject obj = new JSONObject(); + obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); + obj.put(WebsocketConst.MSG_ID, msgId); + obj.put(WebsocketConst.MSG_TXT, msgTet); + webSocket.sendMessage(obj.toJSONString()); + } + + @NotNull + public SysAnnouncement getSysAnnouncement(List userIdList, + String title, + String content, + String contentInfo, + String messageType, + String initiator) { + SysAnnouncement sysAnnouncement = new SysAnnouncement(); + sysAnnouncement.setInitiator(initiator); + sysAnnouncement.setDelFlag("0"); + sysAnnouncement.setSendStatus("0"); + sysAnnouncement.setSendTime(new Date()); + sysAnnouncement.setMsgCategory(messageType);//消息类型 + sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 + sysAnnouncement.setTitile(title); + sysAnnouncement.setMsgContent(content); + sysAnnouncement.setMsgContentInfo(contentInfo); + sysAnnouncement.setUserIds(StringUtils.join(userIdList, ",")); + return sysAnnouncement; + } } From a9d023c03683e378efe4009b57a1ad073bbebf7e Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 31 Aug 2022 16:53:47 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug5?= =?UTF-8?q?8763-=E6=B7=BB=E5=8A=A0=E5=B1=95=E7=A4=BA=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 3 +++ .../split/service/impl/FileSplitItemsEOServiceImpl.java | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c408ef57e..481865b1d 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -971,3 +971,6 @@ ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_genera -- 法规技术评估 条款项评估结果表增加字段。 2022-08-26 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; + +-- 表字段 英文修改 2022-08-31 +UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 5d53c71c0..8b487319b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -65,10 +65,7 @@ import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xssf.usermodel.*; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -790,8 +787,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Wed, 31 Aug 2022 17:03:04 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E7=9A=84=E8=BD=AC=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SelectedBy/index.vue | 15 +++++++---- .../components/problemKnowledgeBaseView.vue | 25 +++++++++++++++---- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue index 7ef8d1da8..a2bdebb61 100644 --- a/jero-web/src/components/SelectedBy/index.vue +++ b/jero-web/src/components/SelectedBy/index.vue @@ -48,10 +48,10 @@ type: Object, default: {} }, - title:{ + title: { type: String, - default:'' - }, + default: '' + } }, data() { return { @@ -102,7 +102,12 @@ this.visibleTree = false }, handleSubmit() { - this.$emit('SelectedByForm',this.userIds.join(',')) + if (this.userIds && this.userIds.length > 0) { + this.submitLoading = true + this.$emit('SelectedByForm', this.userIds.join(',')) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, onSearch(e) { this.gData = [] @@ -171,7 +176,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; - z-index:100; + z-index: 100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 9295b5ed9..50b3336ed 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -3,9 +3,9 @@
- - - + + + {{queryForm.title}}
@@ -156,8 +156,23 @@ }, methods: { ...mapGetters(['userInfo']), - SelectedByForm() { - + SelectedByForm(userIds) { + let query = { + userIds: userIds, + departIds: userIds, + problemKnowledgeBaseId: this.queryForm.id, + problemKnowledgeBaseTitle: this.queryForm.title + } + postAction('/problemKnowledgeBase/problemKnowledgeBaseEO/forward', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$refs.SelectedByRef.visible = false + this.$refs.SelectedByRef.submitLoading = false + } else { + this.$message.warning(this.$t('operationFailed')) + this.$refs.SelectedByRef.submitLoading = false + } + }) }, queryById() { let query = { From 9e8b1743a9ae3e44195746941d062b8ea6b00590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 17:09:15 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problemKnowledgeBase/components/countryCardRelease.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 74303385f..99ee4012a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -175,6 +175,12 @@ dataIndex: 'releaseStatus_dictText', ellipsis: true }, + { + title: this.$t('creater'), + align: 'center', + dataIndex: 'createBy', + ellipsis: true + }, { title: this.$t('operation'), align: 'center', From 0ea402aad3f900201e39b57ff9777a0edfefee27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 17:24:58 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BF=BB=E8=AF=91-=E4=B8=8A=E4=BC=A0-=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentTranslation/components/addModel.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue index 4298fc61f..770ab5732 100644 --- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue +++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue @@ -58,8 +58,9 @@ - - {{ item.dbFieldTxt }} + + {{ language == 'zh-cn' ? item.dbFieldTxt:item.dbFieldEnName }} @@ -94,7 +95,8 @@ - +
@@ -155,10 +157,12 @@ }, ids: [], translationResultsList: [], - LanguageList: [] + LanguageList: [], + language: '' } }, mounted() { + this.language = localStorage.getItem('language') this.getTextStatus() }, methods: { From 1926a9b10ff5848710fda954d41c701ef053ecd6 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 31 Aug 2022 17:30:46 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=B6=E8=97=8F=E9=97=AE=E9=A2=98=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oblemKnowledgeBaseCollectEOController.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java index f58424eb6..4e0dd880d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCollectEOController.java @@ -1,18 +1,25 @@ package com.jero.modules.problemKnowledgeBase.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseCollectEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseCollectEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,6 +42,8 @@ import com.jero.common.aspect.annotation.AutoLog; public class ProblemKnowledgeBaseCollectEOController extends JeroController { @Autowired private IProblemKnowledgeBaseCollectEOService problemKnowledgeBaseCollectEOService; + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; /** * 分页列表查询 @@ -167,4 +176,33 @@ public class ProblemKnowledgeBaseCollectEOController extends JeroController queryCollectPageList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper,problemKnowledgeBaseEO); + Page page = new Page(pageNo, pageSize); + + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + QueryWrapper collectEOQueryWrapper = new QueryWrapper<>(); + collectEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseCollectEO::getCollectUserId,currentUser.getId()); + List collectEOList = this.problemKnowledgeBaseCollectEOService.list(collectEOQueryWrapper); + + if(CollectionUtils.isNotEmpty(collectEOList)){ + List problemKnowledgeBaseIdList = collectEOList.stream().map(ProblemKnowledgeBaseCollectEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + queryWrapper.lambda().in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + IPage pageList = this.problemKnowledgeBaseEOService.page(page, queryWrapper); + this.problemKnowledgeBaseEOService.disposeData(pageList.getRecords(),problemKnowledgeBaseEO.getCut()); + + return Result.OK(pageList); + } + return Result.OK(); + } } From d1afece6a525c40a8cd0cf45993d94a3bfc626f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 17:58:01 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue index da44748fb..b998e89aa 100644 --- a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue @@ -10,8 +10,8 @@
{{$t('title')}}
- +
-
{{$t('CancelCollection')}}
+
{{$t('CancelCollection')}} +
@@ -98,7 +101,8 @@ loading: false, queryParams: {}, url: { - getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/queryCollectPageList', + deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseCollectEO/deleteBatch' } } }, @@ -107,7 +111,6 @@ }, watch: { checkboxText: function(value) { - console.log(value) this.conList.forEach(val => { val.checked = false }) @@ -159,9 +162,11 @@ this.$confirm({ content: _this.$t('BatchCancelCollection'), onOk() { - getAction('', {}).then((res) => { + let checkboxText = JSON.parse(JSON.stringify(_this.checkboxText)) + deleteAction(_this.url.deleteBatch, { ids: checkboxText.join(',') }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) + _this.checkboxText = [] _this.getList() } else { _this.$message.warning(res.message) @@ -178,7 +183,7 @@ this.$confirm({ content: _this.$t('confirmCancelCollection'), onOk() { - getAction('', {}).then((res) => { + deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -221,7 +226,7 @@ if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { if (val.content) { - val.contentOne = this.getText(val.content) + val.content = this.getText(val.content) } }) } From cae532d0b266bf2828e773dd0b2527910f5337b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Wed, 31 Aug 2022 18:08:23 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E3=80=81=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentManage/collection/index.vue | 14 +++++++------- .../src/views/documentTools/searchCenter/index.vue | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 0e0ba89a0..5bb40aa2b 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -1,8 +1,8 @@ diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 8270a0c4b..7e7cd2b69 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + + From 26374b1d214fc7606146c94bb25f85336a76b954 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 31 Aug 2022 18:12:22 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 85f26e2c4..b43b2b7a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Wed, 31 Aug 2022 18:37:13 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93-=E9=9B=86=E6=88=90=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index b7460d4c9..c9cb88cd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -129,7 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl> mapListTempCn = new ArrayList<>(); List> mapListTempEn = new ArrayList<>(); @@ -223,7 +223,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl targetMarketList){ From 21cea7644850f9fd9923d9ff83c5823eb90ef79f Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 31 Aug 2022 22:04:13 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/extRepo/entity/ExtRepoData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java index d83dc65a2..bb44aab7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java @@ -40,7 +40,7 @@ public class ExtRepoData implements Serializable { private java.lang.String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; @@ -50,7 +50,7 @@ public class ExtRepoData implements Serializable { private java.lang.String updateBy; /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; From 83b17d0a7b637f7ef361bd38d9d4eceb63b4338b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Thu, 1 Sep 2022 09:05:25 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E3=80=81=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentManage/collection/index.vue | 14 +++++++------- .../src/views/documentTools/searchCenter/index.vue | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index 5bb40aa2b..0e0ba89a0 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -1,8 +1,8 @@ diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 7e7cd2b69..8270a0c4b 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -65,10 +65,10 @@ - - - - + + + + From db53b943615755ab7488a2db51ce40e4b7c5fbf8 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 1 Sep 2022 09:08:42 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E6=94=BE=E5=BC=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93-=E9=9B=86=E6=88=90=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index c9cb88cd9..b7460d4c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -129,7 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl> mapListTempCn = new ArrayList<>(); List> mapListTempEn = new ArrayList<>(); @@ -223,7 +223,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl targetMarketList){ From 58dec85b9ae07c9f7c7a0e2b4456f36bdb6bfbb7 Mon Sep 17 00:00:00 2001 From: aoao <1085499399@qq.com> Date: Thu, 1 Sep 2022 09:12:09 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-=E8=A7=A3=E5=BC=80?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportManageEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index b43b2b7a6..85f26e2c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl Date: Thu, 1 Sep 2022 09:37:57 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/dashboard/components/myList.vue | 6 ++++-- .../views/documentManage/splitting/modules/SplitAddForm.vue | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 2ee3cfc6c..48c345398 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -10,7 +10,7 @@
- {{item.prcNum}} + {{item.prcName}} {{prcTypeName[item.prcType]}}
@@ -43,7 +43,9 @@ dataSource: [], loading: false, prcTypeName: { - 1: this.$t('taskConfirmationProcess') + 1: this.$t('taskConfirmationProcess'), + 5:this.$t('collectionOfRegulatoryOpinionsProcess'), + 6:this.$t('regulatoryTechnologyAssessmentProcess') } } }, diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index dc02a0bb9..8e8654af8 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -48,6 +48,7 @@
From 1b2c3fdeed8dddeff86df2d80d0cdc38bfa49a8b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 1 Sep 2022 09:48:29 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=AE=B5=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSearchServiceImpl.java | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index d0c86f0de..50f5c7846 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -328,9 +328,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { Map queryMapTemp = new HashMap<>(); if (key.equals("serial_number")){ + s = s.toLowerCase(); queryMap.put(key, "*" + s + "*"); map.put("wildcard", queryMap); } else { + s = s.toLowerCase(); queryMapTemp.put("query", s); queryMapTemp.put("minimum_should_match", 2); queryMap.put(key, queryMapTemp); @@ -919,8 +921,27 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { */ @Override public IPage getParagraphInfoList(Map map) { + //指定module_type_flag= WDK + JSONArray queryJsonMust = new JSONArray(); + Map mapModule = new HashMap<>(); + Map mapModule1 = new HashMap<>(); + Map mapModule2 = new HashMap<>(); + mapModule.put("query", "WDK"); + mapModule1.put("module_type_flag", mapModule); + mapModule2.put("match", mapModule1); + queryJsonMust.add(mapModule2); + //段落, 有条件的时候,查询的数据中不含有魑的数据 + JSONArray queryJsonMustNot = new JSONArray(); if(ObjectUtils.isEmpty(map.get("mapOne"))){ ((Map) map.get("mapOne")).put("flag",SEARCH_FLAG); + }else{ + Map mapTemp = new HashMap<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + mapTemp.put("query", SEARCH_FLAG); + map1.put("flag", mapTemp); + map2.put("match", map1); + queryJsonMustNot.add(map2); } String cut = (String) map.get("cut"); //module_type 代表文档库的段落 @@ -956,17 +977,20 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONArray queryMapJsonAll = new JSONArray(); //首次查询条件 if (ObjectUtils.isNotEmpty(mapOne)) { - if(StringUtils.isNotBlank((String)mapOne.get("title")) - || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){ - Map queryMap = new HashMap<>(); - Map queryMapTemp = new HashMap<>(); - queryMapTemp.put("flag",SEARCH_FLAG ); - queryMap.put("match_phrase", queryMapTemp); - queryMapJsonTemp.add(queryMap); - } +// if(StringUtils.isNotBlank((String)mapOne.get("title")) +// || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){ +// Map queryMap = new HashMap<>(); +// Map queryMapTemp = new HashMap<>(); +// queryMapTemp.put("flag",SEARCH_FLAG ); +// queryMap.put("match_phrase", queryMapTemp); +// queryMapJsonTemp.add(queryMap); +// } for (Map.Entry entry : mapOne.entrySet()) { String key = entry.getKey(); String value = (String) entry.getValue(); + if("serial_number".equals(key) || "title".equals(key) || "file_text".equals(key)){ + value = value.toLowerCase(); + } if (ObjectUtils.isNotEmpty(value)) { for (String s : value.split(",")) { Map queryMap = new HashMap<>(); @@ -1007,6 +1031,10 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null); queryMapJsonAll.add(jsonObject); } + if(CollectionUtils.isNotEmpty(queryJsonMust)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryJsonMust, null, null); + queryMapJsonAll.add(jsonObject); + } } String ids = (String) mapTwo.get("ids"); @@ -1113,7 +1141,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, - pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,null); + pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,queryJsonMustNot); return iPage; }