From 4494a005613728c9dc22d018bca42ef5d3ebcf69 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 14 一月 2025 20:41:47 +0800
Subject: [PATCH] 产品型号集成，类型转换，人员组织加日志，申请接口引用码段值校验
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
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 fd899e0..a0be413 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,14 +13,14 @@
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;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class CodeApplyWebManagementServiceImpl extends ServiceImpl<SystemClassifyRoleMapper, SystemClassifyRole> implements ICodeApplyWebManagementService {
@@ -34,6 +35,8 @@
*/
@Resource
private RevisionModelUtil revisionModelUtil;
+ @Resource
+ private CodeClassifyServiceImpl classifyService;
@Override
@@ -45,24 +48,31 @@
QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
wrapper.eq("systemOid",systemOid);
wrapper.eq("systemId",systemId);
+ List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));
this.remove(wrapper);
+ List<SystemClassifyRole> newSCRoles = new ArrayList<>();
//鏁版嵁澶勭悊
+ systemClassifyRoles.stream().forEach(classifyRole ->{
+ classifyRole.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyRole.setCreateTime(new Date());
+ classifyRole.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyRole.setLastModifyTime(new Date());
+ classifyRole.setTs(new Date());
+ });
+ newSCRoles.addAll(systemClassifyRoles);
+ //澶勭悊鏂伴�夋嫨鐨勬暟鎹�
roleList.stream().forEach(systemClassifyRole -> {
if(StringUtil.isBlank(systemClassifyRole.getOid())){
DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole");
systemClassifyRole.setSystemId(systemId);
systemClassifyRole.setSystemOid(systemOid);
- }else{
- systemClassifyRole.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- systemClassifyRole.setCreateTime(new Date());
- systemClassifyRole.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
- systemClassifyRole.setLastModifyTime(new Date());
- systemClassifyRole.setTs(new Date());
+ systemClassifyRole.setTenantId(AuthUtil.getTenantId());
+ systemClassifyRole.setSelected(true);
+ newSCRoles.add(systemClassifyRole);
}
- systemClassifyRole.setTenantId(AuthUtil.getTenantId());
});
//淇濆瓨
- this.saveBatch(roleList);
+ this.saveBatch(newSCRoles);
return R.success("鎿嶄綔鎴愬姛");
}
@@ -78,4 +88,22 @@
});
return tree;
}
+
+ @Override
+ public List<Tree> getAuthTree(HashMap<String, String> paramMap) {
+ //鏌ヨ宸茬粡鎺堟潈浜嗙殑鍒嗙被
+ 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;
+ }
}
--
Gitblit v1.9.3