From 4e570ea217f3ec9fb9324eb618126b447fb77c72 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 10 Aug 2022 22:49:49 +0800 Subject: [PATCH 01/39] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8E=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E6=95=B0=E6=8D=AE=E4=BA=A4=E4=BA=92=EF=BC=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 189 ++++++++++++------ 1 file changed, 126 insertions(+), 63 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index 55e6e2429..b1d6f2b43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -1,15 +1,29 @@ package com.jero.modules.feishu.service.impl; import cn.hutool.core.util.StrUtil; -import com.alibaba.druid.support.json.JSONUtils; 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.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; +import com.jero.modules.problemKnowledgeBase.enums.ShowPermissionsEnum; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.jero.modules.project.enums.JumpLinkEnum; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.HttpRequestUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -18,6 +32,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author: liyawei @@ -42,6 +57,17 @@ public class FeishuServiceImpl implements IFeishuService { @Value("${Feishu.translateTextUrl}") private String translateTextUrl; + @Value(value = "${jero.backUrl}") + private String backUrl; + @Autowired + private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService; + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; + @Autowired + private IProblemKnowledgeBaseUserEOService problemKnowledgeBaseUserEOService; + @Autowired + private ISysUserService sysUserService; + /** * 获取token * @return @@ -333,7 +359,8 @@ public class FeishuServiceImpl implements IFeishuService { " \"title\": {\n" + " \"tag\": \"plain_text\",\n" + " \"content\": \"点击下方的分类查看常见问题\"\n" + - " }\n" + + " },\n" + + " \"template\": \"green\"\n" + " }\n" + "}"; JSONObject jsonObject = JSONObject.parseObject(sendJson); @@ -342,56 +369,28 @@ public class FeishuServiceImpl implements IFeishuService { element.put("tag","action"); element.put("layout","bisected"); - JSONArray actions = new JSONArray(); - //组装推送过去的点击按钮 - for (int i=0; i<5; i++){ + //获取分类 + List problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(); + JSONArray actions = new JSONArray(); + + //组装推送过去的点击按钮 + for (ProblemKnowledgeBaseClassifyEO problemKnowledgeBaseClassifyEO : problemKnowledgeBaseClassifyEOList) { JSONObject buttonObject = new JSONObject(); JSONObject text = new JSONObject(); JSONObject value = new JSONObject(); buttonObject.put("tag","button"); - if(i==0){ - text.put("tag","plain_text"); - text.put("content","content1"); + text.put("tag","plain_text"); + text.put("content",problemKnowledgeBaseClassifyEO.getProblemLabel()); + value.put("chosen",problemKnowledgeBaseClassifyEO.getId()); - value.put("chosen","chosen1"); - } - if(i==1){ - text.put("tag","plain_text"); - text.put("content","content2"); - - value.put("chosen","chosen2"); - } - if(i==2){ - text.put("tag","plain_text"); - text.put("content","content3"); - - value.put("chosen","chosen3"); - } - if(i==3){ - text.put("tag","plain_text"); - text.put("content","content4"); - - value.put("chosen","chosen4"); - } - if(i==4){ - text.put("tag","plain_text"); - text.put("content","content5"); - - value.put("chosen","chosen5"); - } - if(i==5){ - text.put("tag","plain_text"); - text.put("content","content6"); - - value.put("chosen","chosen6"); - } buttonObject.put("text",text); buttonObject.put("type","primary"); buttonObject.put("value",value); actions.add(buttonObject); } + element.put("actions",actions); @@ -423,12 +422,94 @@ public class FeishuServiceImpl implements IFeishuService { String clickStr = JSONObject.toJSONString(JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("action"))).get("value")); log.info("用户点击的数据: " + clickStr); - String sendJson = " "; + String sendJsonStr = "{\n" + + " \"config\": {\n" + + " \"wide_screen_mode\": true\n" + + " },\n" + + " \"header\": {\n" + + " \"title\": {\n" + + " \"tag\": \"plain_text\",\n" + + " \"content\": \"问题知识库信息，点击下方标题即可跳转至详情页查看\"\n" + + " },\n" + + " \"template\": \"green\"\n" + + " }\n" + + "}"; + + JSONObject sendJson = JSONObject.parseObject(sendJsonStr); + JSONArray elements = new JSONArray(); + + //分隔行对象。 + JSONObject dividingLineJson = new JSONObject(); + dividingLineJson.put("tag","hr"); JSONObject clickJson = JSONObject.parseObject(clickStr); if(StringUtils.isNotEmpty(clickJson.getString("chosen"))){ - sendJson = clickJson.getString("chosen"); + String problemTypeId = clickJson.getString("chosen"); + String thirdId = userIds[0]; + SysUser currentOperatorUser = this.sysUserService.getBaseMapper().selectOne( + new QueryWrapper().lambda().eq(SysUser::getThirdId, thirdId) + ); + if(ObjectUtils.isNotEmpty(currentOperatorUser)){ + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentOperatorUser.getId()); + List problemKnowledgeBaseUserEOList = this.problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + QueryWrapper problemKnowledgeBaseEOQueryWrapper = new QueryWrapper<>(); + + problemKnowledgeBaseEOQueryWrapper.lambda().eq(ProblemKnowledgeBaseEO::getProblemType,problemTypeId); + problemKnowledgeBaseEOQueryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions, ShowPermissionsEnum.OPEN.getValue()). + or(o -> { + o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); + o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + }); + }); + + //根据发布日期倒序 查询出（公开、私密且自己是权限用户）最新的五条数据 + problemKnowledgeBaseEOQueryWrapper.orderByDesc("release_time"); + Integer pageNo = 1; + Integer pageSize = 5; + Page page = new Page(pageNo, pageSize); + IPage pageList = problemKnowledgeBaseEOService.page(page, problemKnowledgeBaseEOQueryWrapper); + List records = pageList.getRecords(); + + JSONObject element = new JSONObject(); + JSONArray actions = new JSONArray(); + + for (ProblemKnowledgeBaseEO record : records) { + String url = backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE_DETAIL.getLink() + "?id=" + record.getId(); + + JSONObject action = new JSONObject(); + JSONObject text = new JSONObject(); + action.put("tag","button"); + + text.put("tag","plain_text"); + text.put("content",record.getTitle()); + action.put("text",text); + action.put("type","primary"); + action.put("url",url); + actions.add(action); + } + + element.put("tag","action"); + element.put("actions",actions); + elements.add(element); + //添加一个分隔线。 + elements.add(dividingLineJson); + } } + JSONObject textFinally = new JSONObject(); + textFinally.put("tag","lark_md"); + textFinally.put("content","[以上都不是>>]("+backUrl + JumpLinkEnum.PROBLEM_KNOWLEDGE_BASE.getLink()+")"); + + JSONObject elementFinally = new JSONObject(); + elementFinally.put("tag","div"); + elementFinally.put("text",textFinally); + elements.add(elementFinally); + + sendJson.put("elements",elements); String token = null; try { @@ -440,30 +521,13 @@ public class FeishuServiceImpl implements IFeishuService { Map headerMap = new HashMap<>(); headerMap.put("Authorization", "Bearer " + token); headerMap.put("Content-Type", "application/json; charset=utf-8"); - // 设置消息标题 - JSONObject zh_cn = new JSONObject(); - zh_cn.put("title", "title"); - // 设置消息内容 - // 第一行 - JSONObject contentOne = new JSONObject(); - contentOne.put("tag", "text"); - contentOne.put("text", sendJson); - List contentList = new ArrayList<>(); - contentList.add(contentOne); - List> list = new ArrayList<>(); - list.add(contentList); - zh_cn.put("content", list); - - JSONObject post = new JSONObject(); - post.put("zh_cn", zh_cn); - JSONObject contentObj = new JSONObject(); - contentObj.put("post", post); // 设置请求参数 JSONObject paramsMap = new JSONObject(); paramsMap.put("user_ids", userIds); - paramsMap.put("msg_type", "post"); - paramsMap.put("content", contentObj); + paramsMap.put("msg_type", "interactive"); + paramsMap.put("card", sendJson); + // 发送请求给飞书 String response = null; try { @@ -471,7 +535,6 @@ public class FeishuServiceImpl implements IFeishuService { } catch (IOException e) { e.printStackTrace(); } - // 返回结果样例：{"code":0,"data":{"invalid_department_ids":[],"invalid_open_ids":[],"invalid_union_ids":[],"invalid_user_ids":[],"message_id":"bm-d595567e4f448fafe397bc916f0be646"},"msg":"ok"} // 获取返回结果 JSONObject tokenJson = JSONObject.parseObject(response); if(!tokenJson.get("code").toString().equals("0")) { From 862120ce1b3b73329665c9170cb3eb1254d5e7c1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Wed, 10 Aug 2022 23:32:06 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=80=E7=BA=A7=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoDataController.java | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 8d06ee3b3..c459fcc97 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -9,12 +9,11 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oss.CosBootUtil; -import com.jero.generater.modules.online.auth.entity.OnlAuthData; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoDataPage; +import com.jero.modules.extRepo.entity.ExtRepoFolder; import com.jero.modules.extRepo.service.IExtRepoDataService; import com.jero.modules.extRepo.service.IExtRepoFolderService; -import com.jero.modules.split.entity.SarFileSplitInfoEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -74,13 +73,13 @@ public class ExtRepoDataController extends JeroController result = new Result(); ExtRepoData erd = extRepoDataService.queryById(id); if (null != erd) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if (sysUser.getUsername().equals(erd.getCreateBy())) { - extRepoDataService.deleteById(id); - CosBootUtil.delete(erd.getFileKey()); + int count = getRootFolderCount(); + if (erd.getSupFolder().equals("root") && count <= 1) { if (CutEnum.CN.getValue().equals(cut)) { - result.success("删除成功!"); + result.error500("此文件夹不可删除！"); } else { - result.success("Data deletion successfully!"); + result.error500("This folder cannot be deleted!"); } } else { - if (CutEnum.CN.getValue().equals(cut)) { - result.error500("没有权限！"); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (sysUser.getUsername().equals(erd.getCreateBy())) { + extRepoDataService.deleteById(id); + CosBootUtil.delete(erd.getFileKey()); + if (CutEnum.CN.getValue().equals(cut)) { + result.success("删除成功!"); + } else { + result.success("Data deletion successfully!"); + } } else { - result.error500("You do not have permission!"); + if (CutEnum.CN.getValue().equals(cut)) { + result.error500("没有权限！"); + } else { + result.error500("You do not have permission!"); + } } } } else { @@ -212,6 +220,12 @@ public class ExtRepoDataController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExtRepoFolder::getSupFolder, "root"); + return extRepoFolderService.count(queryWrapper); + } + /** * 批量删除 * From 9cb0b88fcda6e8f1d286cc57366072a1cd2b1d2a Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 11 Aug 2022 00:22:11 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtRepoFolderController.java | 10 +- .../modules/extRepo/entity/ERFTreeData.java | 15 --- .../modules/extRepo/entity/ERFTreeDataVO.java | 27 +++++ .../impl/ExtRepoFolderServiceImpl.java | 105 ++++++------------ 4 files changed, 66 insertions(+), 91 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java index abb0c0d96..37be9b9e1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoFolderController.java @@ -4,7 +4,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.extRepo.entity.ERFTreeData; +import com.jero.modules.extRepo.entity.ERFTreeDataVO; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.extRepo.entity.ExtRepoFolder; import com.jero.modules.extRepo.service.IExtRepoDataService; @@ -44,9 +44,11 @@ public class ExtRepoFolderController extends JeroController> queryList() { - List list = extRepoFolderService.queryTreeList(); - return Result.OK(list); + public Result queryList() { + ERFTreeDataVO dataVO = new ERFTreeDataVO(); + dataVO.setManager(extRepoFolderService.isManager()); + dataVO.setList(extRepoFolderService.queryTreeList()); + return Result.OK(dataVO); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java index d9d65aecd..0b0152705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeData.java @@ -36,13 +36,6 @@ public class ERFTreeData implements Comparable { */ private int orderId; - - /** - * 是否显示 - */ - private boolean display = false; - - /** * 查看权限人员 */ @@ -119,14 +112,6 @@ public class ERFTreeData implements Comparable { this.orderId = orderId; } - public boolean isDisplay() { - return display; - } - - public void setDisplay(boolean display) { - this.display = display; - } - public String getFolderName() { return folderName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java new file mode 100644 index 000000000..ba073d51e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ERFTreeDataVO.java @@ -0,0 +1,27 @@ +package com.jero.modules.extRepo.entity; + +import java.util.List; + +public class ERFTreeDataVO { + boolean isManager; + List list; + + public ERFTreeDataVO() { + } + + public boolean isManager() { + return isManager; + } + + public void setManager(boolean manager) { + isManager = manager; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index aa6ea910a..baee6ebaa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -22,10 +22,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Description: 对外报告文件夹表 - * @Author: jero-boot - * @Date: 2022-07-25 - * @Version: V1.0 + * 对外报告文件夹表 */ @Service public class ExtRepoFolderServiceImpl extends ServiceImpl implements IExtRepoFolderService { @@ -38,9 +35,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl list = getListBySupFolder(extRepoFolder.getSupFolder()); for (ExtRepoFolder erf : list) { if (erf.getOrderId() >= extRepoFolder.getOrderId() && !erf.getId().equals(extRepoFolder.getId())) { @@ -90,9 +79,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl authManage_orig = getAuthMap(erf_orig.getAuthManageIdsName(), erf_orig.getAuthManageIds()); Map authManage_new = getAuthMap(erf_new.getAuthManageIdsName(), erf_new.getAuthManageIds()); @@ -132,20 +118,20 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl allSubFolder = getAllSubFolder(erf_orig.getId()); //存储变化的对象 - List updateFolder = new ArrayList(); + List updateFolder = new ArrayList<>(); for (ExtRepoFolder erf : allSubFolder) { boolean isChange = false; Map authManage_erf = getAuthMap(erf.getAuthManageIdsName(), erf.getAuthManageIds()); Map authView_erf = getAuthMap(erf.getAuthViewIdsName(), erf.getAuthViewIds()); for (String add : addManageRole.keySet()) { - if (!authManage_erf.keySet().contains(add)) { + if (!authManage_erf.containsKey(add)) { authManage_erf.put(add, addManageRole.get(add)); isChange = true; } } for (String del : delManageRole.keySet()) { //如果是创建人 不能删除管理权限 - if (authManage_erf.keySet().contains(del)) { + if (authManage_erf.containsKey(del)) { if (!del.equals(erf_orig.getCreateBy())) { authManage_erf.remove(del); isChange = true; @@ -153,13 +139,13 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getDefMap(Map mapA, Map mapB) { - Map res = new HashMap(); + Map res = new HashMap<>(); for (String s : mapA.keySet()) { - if (StringUtils.isNotBlank(s) && !mapB.keySet().contains(s)) { + if (StringUtils.isNotBlank(s) && !mapB.containsKey(s)) { res.put(s, mapA.get(s)); } } @@ -196,7 +178,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAllSubFolder(String folderId) { List resList = getListBySupFolder(folderId); - List subList = new ArrayList(); + List subList = new ArrayList<>(); for (ExtRepoFolder erf : resList) { subList.addAll(getAllSubFolder(erf.getId())); } @@ -206,9 +188,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryList() { @@ -243,14 +217,12 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1); + List res = getSubFolder(superFolder, list, 1, true); Collections.sort(res); return res; } catch (Exception ex) { @@ -262,34 +234,31 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level) throws Exception { - List resList = new ArrayList(); + private List getSubFolder(String supId, List list, int level, boolean needAuth) { + List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { - ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); - //检查有没有权限查看 - date.setDisplay(haveViewAuth(erf.getSupFolder())); - int childLevel = date.getLevel() + 1; - date.setAuthManageIdsName(erf.getAuthManageIdsName()); - date.setAuthManageIds(erf.getAuthManageIds()); - date.setAuthViewIdsName(erf.getAuthViewIdsName()); - date.setAuthViewIds(erf.getAuthViewIds()); - date.setChildren(getSubFolder(erf.getId(), list, childLevel)); - date.sortChildren(); - resList.add(date); + int childLevel = level + 1; + if (!needAuth || haveViewAuth(erf.getId())) { + ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); + date.setAuthManageIdsName(erf.getAuthManageIdsName()); + date.setAuthManageIds(erf.getAuthManageIds()); + date.setAuthViewIdsName(erf.getAuthViewIdsName()); + date.setAuthViewIds(erf.getAuthViewIds()); + date.setChildren(getSubFolder(erf.getId(), list, childLevel, false)); + date.sortChildren(); + resList.add(date); + } else { + resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + } } } return resList; } private List getStringList(String listStr) { - List res = new ArrayList(); + List res = new ArrayList<>(); if (null != listStr) { res = Arrays.asList(listStr.split(",")); } @@ -297,7 +266,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getAuthMap(String strKey, String strValue) { - Map resMap = new HashMap(); + Map resMap = new HashMap<>(); List keyList = getStringList(strKey); List valueList = getStringList(strValue); for (int i = 0; i < keyList.size(); i++) { @@ -308,19 +277,17 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl userRoles = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色 - List userRoleIds = new ArrayList<>(); // 用户管理员/对外报告管理员 + List userRoleIds; // 用户管理员/对外报告管理员 if (CollectionUtil.isNotEmpty(userRoles)) { List roleIdList = ExtRepoMamagerRoleIdEnum.getIdList(); List userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); - userRoleIds = roleIdList.stream().filter(e -> userRoleIdList.contains(e)).collect(Collectors.toList()); + userRoleIds = roleIdList.stream().filter(userRoleIdList::contains).collect(Collectors.toList()); return !CollectionUtil.isEmpty(userRoleIds); } return false; @@ -328,13 +295,10 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl Date: Thu, 11 Aug 2022 09:30:12 +0800 Subject: [PATCH 04/39] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardReleaseAdd.vue | 5 +++-- .../components/countryCardView.vue | 17 ++++++++++++----- .../components/problemKnowledgeBaseAdd.vue | 8 ++++++-- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue index 301721aff..5ba9e0e3c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue @@ -62,7 +62,8 @@ { this.contentList.forEach(res1 => { if (res1.name == val.lableName) { - res1.list.push({ - lableName: val.content, - lableType: val.lableType - }) + if (val.lableType == 3) { + res1.list.push({ + lableName: val.contentDropDownValue, + lableType: val.lableType + }) + } else { + res1.list.push({ + lableName: val.content, + lableType: val.lableType + }) + } } }) }) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 4b5d678f1..c954fe235 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -133,8 +133,9 @@
{{$t('content')}}
- + \ No newline at end of file From 8d009c6b15dcc072dc73ff2457040de8fb48e7bd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 Aug 2022 09:32:37 +0800 Subject: [PATCH 05/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/views/externalReports/index.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7596c76db..04fce3a33 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -475,7 +475,7 @@ module.exports = { away: 'Collapse', toDoProcess: 'To Do', processDone: 'Completed', - sentProcess: 'Create', + sentProcess: 'Initiated', monitoringProcess: 'Monitor', ConfirmDeployment: 'Confirm Deployment?', terminationProcess: 'Termination Process', diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index b714d81cd..82ea5c65e 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -40,7 +40,7 @@ {{title && title.length > 18?title.slice(0,17)+'...':title}} -