feature(服务授权结果查询新增接口): 服务授权结果查询新增接口

服务授权结果查询新增接口

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/business/impl/ResourceBusiness.java

@@ -489,7 +489,8 @@ public class ResourceBusiness implements IResourceBusiness {
         if(CollectionUtils.isEmpty(extAppIds)){
             return;
         }
-        String idcard = UserContextUtils.getCurrentUser().getIdcard();
+//        String idcard = UserContextUtils.getCurrentUser().getIdcard();
+        String idcard = resourceConfig.getBusSreIdcard();
         executor.submit(new MenuTask(extAppIds, idcard));
     }
 
@@ -558,7 +559,8 @@ public class ResourceBusiness implements IResourceBusiness {
         //获取服务资源
         //服务资源提供方一次查询所有服务资源,未采用分页获取方式
         String busSraId = resourceConfig.getBusSraId();
-        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
+//        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getServiceResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getServiceResource().getBusServiceFunc();
         List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
@@ -664,7 +666,8 @@ public class ResourceBusiness implements IResourceBusiness {
         map.put("size",pageSize);
         String param = JSON.toJSONString(map);
         String busSraId = resourceConfig.getBusSraId();
-        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
+//        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getAppResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getAppResource().getBusServiceFunc();
         List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ResourceServiceImpl.java

@@ -186,7 +186,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         Map<String, OrgInfo> collect = orgInfos
                 .stream()
                 .collect(Collectors.toMap(item->item.getCode(), item->item,(old,last)->last));
-        logger.info("get OrgIds by OrgCodes>> orgIdsList:{}",collect.values());
+        logger.info("get OrgIds by OrgCodes>> orgIdsList:{}",collect.keySet());
         return collect;
     }
 
@@ -199,17 +199,20 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         List<ResourceSync> menuList = resourceMap.get(ResourceTypeEnum.TJ_APP_MENU.getResourceId());
         //插入应用资源
         if(null!=appList){
-            List<AppResourceDTO> apps = appList.stream().map(this::getAppResourceDTO).collect(Collectors.toList());
+            List<AppResourceDTO> apps = appList.stream().filter(item->StringUtils.isNotBlank(item.getAppCode()))
+                    .map(this::getAppResourceDTO).collect(Collectors.toList());
             batchInsertAppResource(apps);
         }
         //插入服务资源
         if(null!=serviceList){
-            List<ServiceResourceDTO> services = serviceList.stream().map(this::getServiceResourceDTO).collect(Collectors.toList());
+            List<ServiceResourceDTO> services = serviceList.stream().filter(item->StringUtils.isNotBlank(item.getServiceCode()))
+                    .map(this::getServiceResourceDTO).collect(Collectors.toList());
             batchInsertServiceResource(services);
         }
         //插入菜单目录
         if(null!=menuList) {
-            List<MenuResourceDTO> menus = menuList.stream().map(this::getMenuResourceDTOs)
+            List<MenuResourceDTO> menus = menuList.stream().filter(item->StringUtils.isNotBlank(item.getAppCode())).
+                    map(this::getMenuResourceDTOs)
                     .flatMap(Collection::stream)
                     .collect(Collectors.toList());
             batchInsertMenu(menus);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ResourceSyncServiceImpl.java

@@ -11,6 +11,7 @@ import com.dragoninfo.dcuc.app.service.IResourceSyncService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.mybaitsplus.core.services.BaseMybatisService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -20,6 +21,7 @@ import java.util.List;
  * @author mazq
  * @date 2020/11/26
  */
+@Slf4j
 @Service
 public class ResourceSyncServiceImpl extends BaseMybatisService<ResourceSync,String> implements IResourceSyncService {
 
@@ -38,6 +40,10 @@ public class ResourceSyncServiceImpl extends BaseMybatisService<ResourceSync,Str
                 .eq(ResourceSync::getDeleted,BooleanEnum.FALSE.getValue());
         String appCode = dto.getAppCode();
         String serviceCode = dto.getServiceCode();
+        if(StringUtils.isBlank(appCode) && StringUtils.isBlank(serviceCode)){
+            log.info("insertRemoteResourceSync appCode is null and serviceCode is null");
+            return null;
+        }
         if (!StringUtils.isBlank(appCode)) {
             wrapper.eq(ResourceSync::getAppCode,appCode);
         } else {

dcuc-app-service/src/main/resources/config/mysql/V4_1_0003__Update_Tables.sql

@@ -4,4 +4,11 @@ ALTER TABLE `t_apply_info` ADD `manager_org_name` VARCHAR(255) DEFAULT NULL;
 -- 更新服务表
 ALTER TABLE `t_service_resource` ADD `manager_unit_id` VARCHAR(100) DEFAULT NULL;
 ALTER TABLE `t_service_resource` ADD `manager_unit` VARCHAR(255) DEFAULT NULL;
-ALTER TABLE `t_service_resource` ADD `manager_unit_code` VARCHAR(100) DEFAULT NULL;
+ALTER TABLE `t_service_resource` ADD `manager_unit_code` VARCHAR(100) DEFAULT NULL;
+-- 修改字段长度
+ALTER TABLE `t_service_resource` MODIFY `service_name` VARCHAR(500);
+ALTER TABLE `t_service_resource` MODIFY `service_url` VARCHAR(500);
+ALTER TABLE `t_resource_sync` MODIFY `service_name` VARCHAR(500);
+ALTER TABLE `t_resource_sync` MODIFY `app_name` VARCHAR(500);
+-- 添加主键索引
+ALTER TABLE `t_apply_info` ADD PRIMARY KEY(`id`);

dcuc-app-service/src/main/resources/config/sql/V4_1_0004__Update_Table.sql

@@ -4,4 +4,11 @@ ALTER TABLE "T_APPLY_INFO" ADD "manager_org_name" VARCHAR2(765 BYTE)  NULL;
 -- 更新服务表
 ALTER TABLE "T_SERVICE_RESOURCE" ADD "manager_unit_id" VARCHAR2(765 BYTE)  NULL;
 ALTER TABLE "T_SERVICE_RESOURCE" ADD "manager_unit" VARCHAR2(765 BYTE)  NULL;
-ALTER TABLE "T_SERVICE_RESOURCE" ADD "manager_unit_code" VARCHAR2(300 BYTE)  NULL;
+ALTER TABLE "T_SERVICE_RESOURCE" ADD "manager_unit_code" VARCHAR2(300 BYTE)  NULL;
+-- 修改字段长度
+ALTER TABLE "T_SERVICE_RESOURCE" MODIFY "SERVICE_NAME" VARCHAR2(800);
+ALTER TABLE "T_SERVICE_RESOURCE" MODIFY "SERVICE_URL" VARCHAR2(800);
+ALTER TABLE "T_RESOURCE_SYNC" MODIFY "SERVICE_NAME" VARCHAR2(800);
+ALTER TABLE "T_RESOURCE_SYNC" MODIFY "APP_NAME" VARCHAR2(800);
+-- 添加主键索引
+ALTER TABLE "T_APPLY_INFO" ADD PRIMARY KEY("ID");