更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/OpenAPIRegisterService.java

@@ -38,6 +38,7 @@ public class OpenAPIRegisterService {
         param.setPredicateArgs(String.format("/%s/**", sign));
         param.setOpenApiInfo(openAPIS);
         param.setApiType(ApiType.FullCard.name());
+        param.setApiDocs(OpenAPIScan.filterOpenApi(str, sign));
 
         ResultContent content = restTemplate.postForObject("http://openapiserver/manager/gateway/api/refresh", param, ResultContent.class);
         if (content == null) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/scene/RoleSceneInfoService.java

@@ -62,12 +62,11 @@ public class RoleSceneInfoService extends SuperService {
         if (ObjectUtils.isEmpty(role)) {
             return ResultContent.buildFail("角色不存在");
         }
-
-        RoleSceneInfo roleSceneInfo = roleSceneInfoDao.findTopByProjectSceneInfoIdAndRoleId(entity.getId(), role.getId());
-        if (ObjectUtils.isNotEmpty(roleSceneInfo)) {
-            return ResultContent.buildFail(String.format("角色已存在场景：%s", entity.getName()));
-        }
-        roleSceneInfo = buildProjectSceneInfo(entity);
+//        RoleSceneInfo roleSceneInfo = roleSceneInfoDao.findTopByProjectSceneInfoIdAndRoleId(entity.getId(), role.getId());
+//        if (ObjectUtils.isNotEmpty(roleSceneInfo)) {
+//            return ResultContent.buildFail(String.format("角色已存在场景：%s", entity.getName()));
+//        }
+        RoleSceneInfo roleSceneInfo = buildProjectSceneInfo(entity, role);
         roleSceneInfo.setSceneInfo(entity.getSceneInfo());
         roleSceneInfo.setSceneInfoId(entity.getId());
 
@@ -89,15 +88,17 @@ public class RoleSceneInfoService extends SuperService {
         if (ObjectUtils.isEmpty(role)) {
             return ResultContent.buildFail("角色不存在");
         }
-        roleSceneInfoDao.deleteByRoleId(role.getId());
+//        roleSceneInfoDao.deleteByRoleId(role.getId());
+
         List<RoleSceneInfo> list = new ArrayList<>();
         List<String> projectSceneInfoIds = param.getProjectSceneInfoIds();
         if (ObjectUtils.isNotEmpty(projectSceneInfoIds)) {
             long i = 1;
             for (String projectSceneInfoId : projectSceneInfoIds) {
+                // 项目的场景
                 ProjectSceneInfo projectSceneInfo = projectSceneInfoDao.findTopById(projectSceneInfoId);
                 if (ObjectUtils.isNotEmpty(projectSceneInfo)) {
-                    RoleSceneInfo roleSceneInfo = buildProjectSceneInfo(projectSceneInfo);
+                    RoleSceneInfo roleSceneInfo = buildProjectSceneInfo(projectSceneInfo, role);
                     roleSceneInfo.setRole(role);
                     roleSceneInfo.setRoleId(role.getId());
                     roleSceneInfo.setSort(i);
@@ -112,14 +113,19 @@ public class RoleSceneInfoService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
-    public RoleSceneInfo buildProjectSceneInfo(ProjectSceneInfo projectSceneInfo) {
-        RoleSceneInfo roleSceneInfo = new RoleSceneInfo();
-        roleSceneInfo.setSceneInfo(projectSceneInfo.getSceneInfo());
-        roleSceneInfo.setSceneInfoId(projectSceneInfo.getId());
-
-        roleSceneInfo.setProjectSceneInfo(projectSceneInfo);
-        roleSceneInfo.setProjectSceneInfoId(projectSceneInfo.getId());
-
+    public RoleSceneInfo buildProjectSceneInfo(ProjectSceneInfo projectSceneInfo, Role role) {
+        RoleSceneInfo roleSceneInfo = roleSceneInfoDao.findTopByProjectSceneInfoIdAndRoleId(projectSceneInfo.getId(), role.getId());
+        if (ObjectUtils.isEmpty(roleSceneInfo)) {
+            roleSceneInfo = new RoleSceneInfo();
+            initEntityNoCheckOid(roleSceneInfo);
+            roleSceneInfo.setSceneInfo(projectSceneInfo.getSceneInfo());
+            roleSceneInfo.setSceneInfoId(projectSceneInfo.getId());
+            roleSceneInfo.setProjectSceneInfo(projectSceneInfo);
+            roleSceneInfo.setProjectSceneInfoId(projectSceneInfo.getId());
+            roleSceneInfo.setProjectOid(projectSceneInfo.getProjectOid());
+        } else {
+            initUpdateEntity(roleSceneInfo);
+        }
         return roleSceneInfo;
     }
 
@@ -249,6 +255,7 @@ public class RoleSceneInfoService extends SuperService {
         RoleSceneInfoModel model = new RoleSceneInfoModel();
         if (ObjectUtils.isNotEmpty(entity)) {
             BeanUtils.copyProperties(entity, model);
+            model.setSceneInfo(sceneInfoService.toModel(entity.getSceneInfo()));
         }
         return model;
     }