From a471b20fe8075a663f32b3a2ee0cd70c1c63baf7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 21 十一月 2024 21:59:42 +0800 Subject: [PATCH] 业务类型查询:树查询修改,数据列表查询接口修改(处理模板套模板情况下freemarker表达式的替换处理)。 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 61 +++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 3 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java index 1030cb5..8f6454e 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java @@ -98,6 +98,7 @@ PLActionCls pac = new PLActionCls(); pac.name = pLActionCls.getName(); pac.pid = pLActionCls.getPid(); + pac.id = pLActionCls.getId(); pac.description = pLActionCls.getDescription() == null ? "" : pLActionCls.getDescription(); pac.creator = WebUtil.getCurrentUserId(); pac.createTime = System.currentTimeMillis(); @@ -131,7 +132,7 @@ Map<String, List<PLActionCls>> allDataMap = Arrays.stream(clses).collect(Collectors.groupingBy(pl -> pl.pid)); for (PLActionCls cls : clses) { - if (StringUtils.isBlank(cls.pid)) { + if (StringUtils.isBlank(cls.pid) || cls.pid.equals("root")) { PLActionClsDTO parentDto = new PLActionClsDTO(); parentDto.setId(cls.id); parentDto.setName(cls.name); @@ -185,7 +186,8 @@ @Override public BaseResult getActionTableData(PLActionQueryDTO dto) throws PLException { Constraint[] consArray ; - if(StringUtils.isNotBlank(dto.getPlactioncls())){ + //杩欏効瑕佺敤!=null鎺у埗锛屾煡璇㈡湭鍒嗙被鑺傜偣鐨勬椂鍊欎紶鐨�"" + if(dto.getPlactioncls() != null){ consArray = new Constraint[7]; consArray[6] = new Constraint("plactioncls", dto.getPlactioncls().equals("root") ? "": dto.getPlactioncls()); }else { @@ -566,6 +568,60 @@ } return BaseResult.success(); } + /** + * 鏌ヨAction鍙傛暟鍒楄〃鏁版嵁 + * actionOid 鍙傛暟涓婚敭 + * @return 淇濆瓨缁撴灉 + */ + @Override + public BaseResult getPLActionParam(String actionOid) throws PLException { + if (StringUtils.isBlank(actionOid)){ + throw new PLException("500", new String[]{"Action涓婚敭涓嶈兘涓虹┖锛�"}); + } + PLActionParam[] paramArrays = platformClientUtil.getUIService().getPLActionParamArrayByActionId(actionOid); + List<PLActionParamDTO> dtos = new ArrayList<>(); + for (PLActionParam paramArray : paramArrays) { + PLActionParamDTO dto = new PLActionParamDTO(); + dto.setAction(paramArray.action); + dto.setOid(paramArray.oid); + dto.setName(paramArray.name); + dto.setDescription(paramArray.description); + dto.setDefaultValue(paramArray.defaultValue); + dtos.add(dto); + } + return BaseResult.dataList(dtos); + } + + /** + * 鍒犻櫎鍒嗙被 + * @param dto 鍒嗙被瀵硅薄 + * @return 澶勭悊缁撴灉 + * @throws PLException + */ + @Override + public BaseResult deleteActionCls(PLActionClsDTO dto) throws PLException { + PLActionCls[] clses = platformClientUtil.getUIService().getPLActionClsArray(); + // 灏嗘墍鏈夊垎绫荤埗鍒嗙被淇濆瓨 + HashSet<String> clsPids = new HashSet<String>(); + for (PLActionCls plActionCls : clses) { + clsPids.add(plActionCls.pid); + } + if (dto.getName().equals("鏈垎绫�")) { + throw new PLException("500", new String[]{"鏈垎绫讳笉鑳藉垹闄�!"}); + } + if (clsPids.contains(dto.getId())) { + throw new PLException("500", new String[]{"璇ュ垎绫讳笅瀛樺湪瀛愬垎绫讳笉鑳藉垹闄わ紒\n璇峰垹闄ゆ鍒嗙被涓嬬殑瀛愬垎绫伙紒"}); + } + // 鎵ц鍒犻櫎鎿嶄綔 + PLActionCls actionCls = new PLActionCls(); + actionCls.id = dto.getId(); + actionCls.name = dto.getName(); + String message = platformClientUtil.getUIService().deletePLActionCls(actionCls); + if (message.startsWith("0")) { + throw new PLException("500", new String[]{"鍒犻櫎鍒嗙被澶辫触锛�" + message.substring(1)}); + } + return BaseResult.success("鍒嗙被鍒犻櫎鎴愬姛锛�" + message.substring(1)); + } public boolean isValidPageForamt(PLActionExpDTO plActionExpDTO) throws PLException { @@ -621,7 +677,6 @@ } return res; } - /** * 澶勭悊鍙傛暟鍒楄〃 -- Gitblit v1.9.3