From 7335445c40f8bb594c5dc80857cd8c2173de6ab5 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 18 Aug 2022 10:52:16 +0800 Subject: [PATCH 1/5] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/document/enums/SearchEnum.java | 2 + .../LawsMonthlyReportManageEOServiceImpl.java | 151 +++++++++- .../LawsMonthlyReportSearchController.java | 37 +++ .../ILawsMonthlyReportSearchService.java | 19 ++ .../LawsMonthlyReportSearchServiceImpl.java | 261 ++++++++++++++++++ 5 files changed, 468 insertions(+), 2 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java index 3b1ea5267..b9f2359e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/SearchEnum.java @@ -8,6 +8,8 @@ package com.jero.modules.document.enums; public enum SearchEnum { INDEX_NAME_DOCUMENT("文档库索引名称","documentLibrary"), TYPE_NAME_DOCUMENT("文档库类型","document"), + INDEX_NAME_LAWS_MONTHLY_REPORT("法规月报索引名称","lawsMonthlyReportManage"), + TYPE_NAME_LAWS_MONTHLY_REPORT("法规月报类型名称","lawsMonthlyReport"), FULL_TEXT_SEARCH("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_CN("全部中文","fulltextsearchcn"), FULL_TEXT_SEARCH_EN("全部英文","fulltextsearchen"); 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 339832758..2665e9642 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 @@ -1,20 +1,32 @@ package com.jero.modules.report.service.impl; +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.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.es.JeroElasticsearchTemplate; 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.dummy.enums.InventoryStateEnum; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.report.entity.LawsMonthlyReportManageEO; import com.jero.modules.report.mapper.LawsMonthlyReportManageEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportManageEOService; +import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: 法规月报管理 @@ -25,6 +37,21 @@ import java.util.List; @Service public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl implements ILawsMonthlyReportManageEOService { + @Autowired + private ISysDictItemService sysDictItemService; + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + + @Autowired + private IOSSFileService iOSSFileService; + + @Value(value = "${jero.path.upload}") + private String uploadpath; + + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** * 保存 * @@ -110,6 +137,126 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl stringMapCn = new HashMap<>(); + Map stringMapEn = new HashMap<>(); + Map stringMapCnForSearch = new HashMap<>(); + Map stringMapEnForSearch = new HashMap<>(); + List> mapListTempCn = new ArrayList<>(); + List> mapListTempEn = new ArrayList<>(); + //文件相关封装中文的全文内容(es) 非搜索条件下的：flag---SEARCH_FLAG + putMap(id, "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG); + //文件相关封装英文的全文内容(es) 搜索条件下的: flag---null + putMap(id, "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG); + + //文件相关封装中文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "法规月报", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null); + //文件相关封装英文的全文内容(es) + putMap(id + monthlyReportManageEO.getFileId(), "monthly report", + fileText, monthlyReportManageEO.getName(), fileText, + ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null); + + mapListTempCn.add(stringMapCn); + mapListTempCn.add(stringMapCnForSearch); + mapListTempEn.add(stringMapEn); + mapListTempEn.add(stringMapEnForSearch); + + //添加es + JSONObject jsonObjectCn = JSON.parseObject(JSON.toJSONString(stringMapCn)); + JSONObject jsonObjectEn = JSON.parseObject(JSON.toJSONString(stringMapEn)); + JSONArray arrayCn = JSONArray.parseArray(JSON.toJSONString(mapListTempCn)); + JSONArray arrayEn = JSONArray.parseArray(JSON.toJSONString(mapListTempEn)); + + try { + // 法规月报 + jeroElasticsearchTemplate.saveOrUpdate(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id, jsonObjectCn); + //全部 + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), arrayCn); + jeroElasticsearchTemplate.saveBatch(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), arrayEn); + } catch (Exception e) { + log.error("文档库添加es失败"); + } + + } else if ("2".equals(issueStatus)) { // 待发布---撤回操作 + // 删除es中的月报 + try { + jeroElasticsearchTemplate.delete(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), id); + //删除全部中文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH.getValue(), SearchEnum.FULL_TEXT_SEARCH.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), id + monthlyReportManageEO.getFileId()); + //删除全部英文的 + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id); + jeroElasticsearchTemplate.delete(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), SearchEnum.FULL_TEXT_SEARCH_EN.getValue(), id + monthlyReportManageEO.getFileId()); + + } catch (Exception e) { + e.printStackTrace(); + log.error("文档库删除es失败"); + } + } + + } + + private void putMap(String id, String moduleType, + String content, String title , String fileText, + String fileName, String fileId, Date issueTime, String cut, + Map stringMap, + String flag){ + stringMap.put("id", id); + stringMap.put("module_type", moduleType); + stringMap.put("content", content); + stringMap.put("title", title); + stringMap.put("file_text", fileText); + stringMap.put("file_name", fileName); + stringMap.put("file_id", fileId); + stringMap.put("issue_time", issueTime); + stringMap.put("cut",cut); + stringMap.put("flag",flag); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java new file mode 100644 index 000000000..eaff9a3aa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java @@ -0,0 +1,37 @@ +package com.jero.modules.searchcenter.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description 搜索中心-法规月报 控制层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Api(tags="搜索中心") +@RestController +@RequestMapping("/search/lawsMonthlyReport") +@Slf4j +public class LawsMonthlyReportSearchController { + + @Autowired + private ILawsMonthlyReportSearchService lawsMonthlyReportSearchService; + + @ApiOperation(value="全部查询", notes="全部查询") + @PostMapping(value = "/page") +// @RequiresPermissions("lawsMonthlyReport:page") + public Result queryPageInfo(@RequestBody SearchVO searchVO) { + IPage pageInfo = lawsMonthlyReportSearchService.pageInfo(searchVO); + return Result.OK(pageInfo); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java new file mode 100644 index 000000000..a09e13032 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/ILawsMonthlyReportSearchService.java @@ -0,0 +1,19 @@ +package com.jero.modules.searchcenter.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.searchcenter.vo.SearchVO; + +/** + * @description 搜索中心-法规月报 接口 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +public interface ILawsMonthlyReportSearchService { + + /** + * 分页查询 + * @param searchVO + * @return + */ + IPage pageInfo(SearchVO searchVO); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java new file mode 100644 index 000000000..55375d65b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java @@ -0,0 +1,261 @@ +package com.jero.modules.searchcenter.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.es.JeroElasticsearchTemplate; +import com.jero.modules.document.enums.SearchEnum; +import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService; +import com.jero.modules.searchcenter.vo.SearchVO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @description 搜索中心-法规月报 服务层 + * @date 2022/8/17 15:03 + * @auth liyawei + */ +@Component +public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSearchService { + + @Autowired + private JeroElasticsearchTemplate jeroElasticsearchTemplate; + public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据) + + /** + * 全文 + * @param searchVO + * @return + */ + @Override + public IPage pageInfo(SearchVO searchVO) { + JSONArray queryJsonMustNot = new JSONArray(); +// if(StringUtils.isNotBlank(searchVO.getSelectValue())){ +// Map map = new HashMap<>(); +// Map map1 = new HashMap<>(); +// Map map2 = new HashMap<>(); +// map.put("query",SEARCH_FLAG); +// map1.put("flag",map); +// map2.put("match",map1); +// queryJsonMustNot.add(map2); +// } + if(StringUtils.isBlank(searchVO.getSelectValue())){ + searchVO.setSelectValue(SEARCH_FLAG); + } + + //判断索引是否存在 + boolean flagTemp = true; + flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue()); + if (!flagTemp) { + return new Page(searchVO.getPageNo(), searchVO.getPageSize()); + } + + String selectValue = searchVO.getSelectValue(); + String selectValueTwo = searchVO.getSelectValueTwo(); + //1. 需要查询的字段 + List fieldList = new ArrayList<>(); + fieldList.add("title");//权重5 + fieldList.add("file_text");//权重4 + fieldList.add("content");//权重3 + fieldList.add("file_name"); //权重2 + fieldList.add("module_type"); + fieldList.add("id"); + fieldList.add("flag"); + + JSONArray queryMapJson = new JSONArray(); + JSONArray queryMapJsonTwo = new JSONArray(); + JSONArray queryMapJsonThree = new JSONArray(); + JSONArray queryMapJsonAll = new JSONArray(); + + Map mapHighlight = new HashMap<>(); + Map mapHighlight1 = new HashMap<>(); + //封装首次的条件 + if (StringUtils.isNotBlank(selectValue)) { + for (String field : fieldList) { + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + if("title".equals(field)){ + map3.put("boost",1); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + map3.put("query",selectValue); + map2.put(field, map3); + map4.put("match",map2); + queryMapJson.add(map4); + + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJson)){ + JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson); + queryMapJsonAll.add(jsonObject); + } + //封装二次的条件 + if (StringUtils.isNotBlank(selectValueTwo)) { + for (String field : fieldList) { + Map queryMap = new HashMap<>(); + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + if("title".equals(field)){ + map3.put("boost",1); + }else if("file_text".equals(field)){ + map3.put("boost",0.01); + }else if("content".equals(field)){ + map3.put("boost",0.01); + }else if("file_name".equals(field)){ + map3.put("boost",1); + } + + //特殊处理编号字段 + map3.put("query",selectValueTwo); +// map3.put("minimum_should_match",2); + map2.put(field, map3); + queryMap.put("match", map2); + + queryMapJsonTwo.add(queryMap); + //高亮 + if(!"flag".equals(field)){ + highlight(mapHighlight, field); + } + } + mapHighlight1.put("fields",mapHighlight); + } + if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){ + JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo); + queryMapJsonAll.add(jsonObjectTwo); + } + //ids进行三次封装 + if (StringUtils.isNotBlank(searchVO.getIds())) { + for (String s : searchVO.getIds().split(",")) { + Map queryMap = new HashMap<>(); + Map queryMapTemp = new HashMap<>(); + queryMapTemp.put("id", s); + queryMap.put("match_phrase", queryMapTemp); + queryMapJsonThree.add(queryMap); + } + } + if(CollectionUtils.isNotEmpty(queryMapJsonThree)){ + JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree); + queryMapJsonAll.add(jsonObjectThree); + } + JSONObject sort = new JSONObject(); + Map issueTime = new HashMap<>(); + Map issueTime1 = new HashMap<>(); + issueTime.put("order","desc"); + issueTime1.put("issue_time",issueTime); + sort.putAll(issueTime1); + +// Map mapSort = new HashMap<>(); +// Map mapSortTemp = new HashMap<>(); +// mapSort.put("order","asc"); +// mapSortTemp.put("file_sort.keyword",mapSort); +// sort.putAll(mapSortTemp); + + Integer pageNo = searchVO.getPageNo(); + Integer pageSize = searchVO.getPageSize(); + IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null, + pageNo, pageSize, null,searchVO.getCut(),sort,queryJsonMustNot); + return page; + } + + @NotNull + private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map highlightMap, + JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag, + String cut,JSONObject querySort,JSONArray queryMustNot) { + JSONObject jsonObject = new JSONObject(); + //基础添加封装 + if ("paragraphFlag".equals(paragraphFlag)) { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } else { + jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null); + } + JSONArray jsonArraySort = new JSONArray(); + jsonArraySort.add(querySort); + + //1. 条件,分页 + JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null, + jsonObject, + highlightMap, + jsonArraySort, + pageNo-1, + pageSize); + //2. 数据查询 + JSONObject search = new JSONObject(); + search = jeroElasticsearchTemplate.search(SearchEnum.INDEX_NAME_LAWS_MONTHLY_REPORT.getValue(), + SearchEnum.TYPE_NAME_LAWS_MONTHLY_REPORT.getValue(), + queryObject); + + List> list = (List>) (((Map) search.get("hits")).get("hits")); + List> mapList = new ArrayList<>(); + for (Map map : list) { + Map mapSource = (Map) map.get("_source"); + Map mapHighlight = (Map) map.get("highlight"); + if(ObjectUtils.isNotEmpty(mapHighlight)){ + for (Map.Entry entry : mapHighlight.entrySet()) { + String key = entry.getKey(); + List value = (List) entry.getValue(); + String fieldConyent= ""; + for (String s : value) { + fieldConyent += s; + } + mapSource.put(key,fieldConyent); + } + //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋空值,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据 + String fileText = (String) mapSource.get("file_text"); + if(StringUtils.isNotBlank(fileText) && !fileText.contains("")){ + mapSource.put("file_text",""); + } + } + mapList.add(mapSource); + } + + //处理分页 + IPage page = new Page(pageNo, pageSize); + if (StringUtils.isNotBlank(selectValueTwo)) { + //二次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } else { + //首次搜索的结果 + page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total")))); + page.setRecords(mapList); + } + return page; + } + + private void highlight(Map mapHighlight, String key) { + Map mapTemp = new HashMap<>(); + List list = new ArrayList<>(); + list.add(""); + List list1 = new ArrayList<>(); + list1.add(""); + mapTemp.put("pre_tags", list); + mapTemp.put("post_tags", list1); + mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200 + mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段 + mapTemp.put("type", "plain"); + mapHighlight.put(key, mapTemp); + } + +} From 82f2ff886ad49c3f5f5ecfd837d27fffbeba207f Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 18 Aug 2022 10:59:48 +0800 Subject: [PATCH 2/5] =?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=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsMonthlyReportSearchController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java index eaff9a3aa..230c6e1fa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/LawsMonthlyReportSearchController.java @@ -7,6 +7,7 @@ import com.jero.modules.searchcenter.vo.SearchVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,9 +28,9 @@ public class LawsMonthlyReportSearchController { @Autowired private ILawsMonthlyReportSearchService lawsMonthlyReportSearchService; - @ApiOperation(value="全部查询", notes="全部查询") + @ApiOperation(value="法规月报查询", notes="法规月报查询") @PostMapping(value = "/page") -// @RequiresPermissions("lawsMonthlyReport:page") + @RequiresPermissions("document:search") public Result queryPageInfo(@RequestBody SearchVO searchVO) { IPage pageInfo = lawsMonthlyReportSearchService.pageInfo(searchVO); return Result.OK(pageInfo); From 93f19bf51a98f983e737167f39b788cdff7d86ad Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 12:31:29 +0800 Subject: [PATCH 3/5] =?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 --- .../components/AdjustareaSofrespon/index.vue | 10 +- jero-web/src/components/AssignedBy/index.vue | 10 +- .../SynchronousSubmissionLibrary/index.vue | 10 +- .../src/components/TaskCutOffTime/index.vue | 10 +- .../components/TaskCutOffTime/indexonekey.vue | 10 +- .../components/modules/fillTable.vue | 2 +- .../technologyAssessment/index.vue | 2 +- .../views/system/modules/RoleAssignment.vue | 11 +- .../system/modules/departmentAllocation.vue | 403 +++++++++--------- 9 files changed, 236 insertions(+), 232 deletions(-) diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index f88517b41..0ca263894 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -279,6 +279,11 @@ export default { /deep/.add-input{ min-height: 135px!important; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 8a81c237e..0346fa84c 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -240,6 +240,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue index a3f002ce2..31895648b 100644 --- a/jero-web/src/components/SynchronousSubmissionLibrary/index.vue +++ b/jero-web/src/components/SynchronousSubmissionLibrary/index.vue @@ -150,6 +150,11 @@ export default { display: flex; justify-content: center; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 691d36603..953e9aaa2 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/components/TaskCutOffTime/indexonekey.vue b/jero-web/src/components/TaskCutOffTime/indexonekey.vue index 1da4a4c82..51541571b 100644 --- a/jero-web/src/components/TaskCutOffTime/indexonekey.vue +++ b/jero-web/src/components/TaskCutOffTime/indexonekey.vue @@ -348,6 +348,11 @@ export default { border: 1px #00B3BE solid; color: #00B3BE; } + ::v-deep .page{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index cd49be66e..57e4d207a 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -37,7 +37,7 @@
\ No newline at end of file diff --git a/jero-web/src/views/system/modules/departmentAllocation.vue b/jero-web/src/views/system/modules/departmentAllocation.vue index cab173a3d..42f018b0d 100644 --- a/jero-web/src/views/system/modules/departmentAllocation.vue +++ b/jero-web/src/views/system/modules/departmentAllocation.vue @@ -41,236 +41,239 @@ \ No newline at end of file From ef520c42e1dff8c4c92fcb65d7ca7ce0dfbbf257 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 13:54:20 +0800 Subject: [PATCH 4/5] =?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/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 14e5ad760..de9942367 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 930ec0431..091f5af65 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -7,7 +7,7 @@ rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 230px)'}" + :scroll="{x: '100%',y:'calc(100vh - 330px)'}" :data-source="dataSource" :loading="loading" sticky From 5a48f697067d6292e84e1641c18d4fe0bf6bc5f8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 13:56:50 +0800 Subject: [PATCH 5/5] =?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 --- .../processCenter/processForm/evaluationProcess/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index bf371d414..7f95d69be 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -107,7 +107,8 @@ }, { title: this.$t('processBackground'), - value: 'processBackground' + value: 'processBackground', + type: 4 } ], evaluatorFeedback: [