From 02140980f6b899d7b0d1618a12e804a991284c8d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 25 九月 2023 09:53:29 +0800
Subject: [PATCH] webservice标准接口增加

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 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..16c825a 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
@@ -17,9 +17,8 @@
 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 {
@@ -45,24 +44,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 +84,13 @@
 		});
 		return tree;
 	}
+
+	@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;
+	}
 }

--
Gitblit v1.9.3