From 1cd37ba9db4b4b52b441978dfcaa37610418d98b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 25 九月 2023 09:32:20 +0800
Subject: [PATCH] 1、增加标准请码界面，授权了的才能查询到，编码分类树查询接口。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java | 3 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 23 ++++++++++++++++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml | 11 +++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java | 4 ++--
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
index 445c0b5..c82e622 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
@@ -78,8 +78,8 @@
}
/**
- * 缂栫爜鍒嗙被鏍戞煡璇㈡帴鍙�
- * @param paramMap systemOid绯荤粺鐨刼id,systemId绯荤粺鐨刬d
+ * 鏍囧噯璇风爜鐣岄潰锛屾巿鏉冧簡鐨勬墠鑳芥煡璇㈠埌锛岀紪鐮佸垎绫绘爲鏌ヨ鎺ュ彛
+ * @param paramMap systemOid绯荤粺鐨刼id,systemId绯荤粺鐨刬d,library缂栫爜鍒嗙被缂栧彿
* @return
*/
@GetMapping("/getAuthTree")
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java
index 6bd0191..9a452e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SystemClassifyRoleMapper.java
@@ -1,10 +1,13 @@
package com.vci.ubcs.code.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.SystemClassifyRole;
import java.util.List;
public interface SystemClassifyRoleMapper extends BaseMapper<SystemClassifyRole> {
public List<SystemClassifyRole> getListSystemClassifyRole(String systemOid, String systemId);
+
+ public List<CodeClassify> getListClassifyRole(String systemOid, String systemId,String library);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
index 16c825a..f43d83a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeClassify;
import com.vci.ubcs.code.entity.SystemClassifyRole;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
import com.vci.ubcs.code.mapper.SystemClassifyRoleMapper;
@@ -12,6 +13,7 @@
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import jodd.util.StringUtil;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
@@ -33,6 +35,8 @@
*/
@Resource
private RevisionModelUtil revisionModelUtil;
+ @Resource
+ private CodeClassifyServiceImpl classifyService;
@Override
@@ -87,10 +91,19 @@
@Override
public List<Tree> getAuthTree(HashMap<String, String> paramMap) {
- QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
- wrapper.eq("systemOid",paramMap.get("systemOid"));
- wrapper.eq("systemId",paramMap.get("systemId"));
-
- return null;
+ //鏌ヨ宸茬粡鎺堟潈浜嗙殑鍒嗙被
+ List<CodeClassify> listClassifyRole = baseMapper.getListClassifyRole(paramMap.get("systemOid"), paramMap.get("systemId"), paramMap.get("library"));
+ if(listClassifyRole.size() == 0){
+ throw new ServiceException("杩樻湭鎺堟潈锛岃鑱旂郴缂栫爜璧勬簮绠＄悊绯荤粺绠＄悊鍛樻巿鏉冿紒");
+ }
+ List<CodeClassifyVO> voList = classifyService.codeClassifyDO2VOs(listClassifyRole);
+ TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(classifyService.PARENT_FIELD_NAME);
+ //杞崲鎴愭爲褰㈢粨鏋�
+ List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
+ //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
+ return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
+ .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
+ });
+ return tree;
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
index 7a9e2ce..b71ab12 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
@@ -79,4 +79,15 @@
and '${systemId}' = pc.SYSTEMID(+)
</select>
+ <select id="getListClassifyRole" resultType="com.vci.ubcs.code.entity.CodeClassify">
+ select *
+ from PL_CODE_CLASSIFY
+ where oid in( select classifyoid
+ from PL_CODE_SYSTEM_CLASSIFY_ROLE
+ start with classifyid = #{library}
+ and SYSTEMID=#{systemId}
+ and SYSTEMOID = #{systemOid}
+ connect by prior classifyoid = classparentoid)
+ </select>
+
</mapper>
--
Gitblit v1.9.3