feature(bu服务资源同步功能开发): bu服务资源同步功能开发

bu服务资源同步功能开发

dcuc-app-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.0-tjdsj-SNAPSHOT</version>
+        <version>2.2.1-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IServiceResourceFacade.java

@@ -37,7 +37,7 @@ public interface IServiceResourceFacade {
      * @return
      */
     @PostMapping(value = "getByCodes")
-    List<ServiceResource> getServiceByServiceCodes(@RequestBody List<String> list);
+    List<ServiceResourceDTO> getServiceByServiceCodes(@RequestBody List<String> list);
 
     /**
      * 服务资源列表分页查询

dcuc-app-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.0-tjdsj-SNAPSHOT</version>
+        <version>2.2.1-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/BuServiceAcceptDTO.java

@@ -0,0 +1,44 @@
+package com.dragoninfo.dcuc.app.dto;
+
+import lombok.Data;
+
+/**
+ * bu服务资源dto
+ * @author mazq
+ * @date 2021/6/21
+ */
+@Data
+public class BuServiceAcceptDTO {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 服务标识,相当于code值
+     */
+    private String serviceId;
+    /**
+     * 服务名称
+     */
+    private String serviceName;
+    /**
+     * 服务类型（第三方定义的类型）
+     */
+    private String serviceType;
+    /**
+     * 服务管理单位code
+     */
+    private String serviceManageDept;
+    /**
+     * 服务管理单位名称
+     */
+    private String serviceManageDeptName;
+    /**
+     * 服务资源类型
+     */
+    private String serviceResourcesType;
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+}

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/ResourceTypeEnum.java

@@ -10,6 +10,7 @@ public enum ResourceTypeEnum {
      */
     TJ_APP("tj_app", "dsjyyfwpt", "app"),
     TJ_SERVICE("tj_service", "dsjyyfwpt", "service"),
+    BU_SERVICE("bu_service","bu_service","bu_service"),
     TJ_APP_MENU("tj_app_menu", "dsjyyfwpt", "menu");
 
     private String resourceId;

dcuc-app-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.0-tjdsj-SNAPSHOT</version>
+        <version>2.2.1-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -32,6 +32,8 @@ import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.date.DateConst;
 import com.dragonsoft.duceap.commons.util.date.DateUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
+import com.dragonsoft.duceap.core.search.Searchable;
+import com.dragonsoft.duceap.core.search.enums.SearchOperator;
 import com.google.common.reflect.TypeToken;
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
@@ -93,7 +95,8 @@ public class ResourceBusiness implements IResourceBusiness {
         //再同步应用菜单数据
         String[] resourceIds = new String[]{ResourceTypeEnum.TJ_APP.getResourceId(),
                 ResourceTypeEnum.TJ_SERVICE.getResourceId(),
-                ResourceTypeEnum.TJ_APP_MENU.getResourceId()};
+                ResourceTypeEnum.TJ_APP_MENU.getResourceId(),
+                ResourceTypeEnum.BU_SERVICE.getResourceId()};
         List<ResourceSync> resourceSyncs;
         for (String resourceId : resourceIds) {
             resourceSyncs = syncService.getNotSyncResource(resourceId);
@@ -507,7 +510,7 @@ public class ResourceBusiness implements IResourceBusiness {
             Integer currentPageNo = requestParamDTO.getCurrentPageNo();
             List<String> resourceTypeList = requestParamDTO.getListAllResourceType();
             for (ResourceTypeEnum resourceEnum : ResourceTypeEnum.values()) {
-                if(!CollectionUtils.isEmpty(resourceTypeList)
+                if(CollectionUtils.isNotEmpty(resourceTypeList)
                     && !resourceTypeList.contains(resourceEnum.getResourceType())) {
                     continue;
                 }
@@ -692,10 +695,10 @@ public class ResourceBusiness implements IResourceBusiness {
      *
      * @param pageNo
      * @param pageSize
-     * @param url
      * @return
      */
-    private HttpResult getServiceResource(Integer pageNo, Integer pageSize, String url) {
+    private HttpResult getServiceResource(Integer pageNo, Integer pageSize) {
+        String url = resourceConfig.getResourceUrl();
         HttpResult httpResult = new HttpResult();
         Map<String, Object> map = new HashMap<>();
         map.put("page", String.valueOf(pageNo - 1));
@@ -714,6 +717,7 @@ public class ResourceBusiness implements IResourceBusiness {
                 .busSreIdcard(busSreIdcard)
                 .build();
         List<Header> headerList = getHeaders(busSendReqVO);
+        logger.info("-------------getServiceResource START -------------");
         logger.info("getServiceResource url:{}", url);
         String response = HttpUtil.postJSON(url, param, headerList, null);
         if (null == response) {
@@ -728,6 +732,7 @@ public class ResourceBusiness implements IResourceBusiness {
             httpResult.setPages(data.getInteger("totalPages"));
             httpResult.setTotals(data.getInteger("totalElements"));
         }
+        logger.info("-------------getServiceResource END -------------");
         return httpResult;
     }
 
@@ -787,12 +792,13 @@ public class ResourceBusiness implements IResourceBusiness {
      */
     private HttpResult getResourceFromRemote(ResourceTypeEnum resourceTypeEnum, Integer pageNo, Integer pageSize) {
         HttpResult httpResult;
-        String url = resourceConfig.getResourceUrl();
         //获取应用资源
         if (ResourceTypeEnum.TJ_APP.equals(resourceTypeEnum)) {
-            httpResult = getAppResource(pageNo, pageSize, url);
+            httpResult = getAppResource(pageNo, pageSize);
         } else if (ResourceTypeEnum.TJ_SERVICE.equals(resourceTypeEnum)) {
-            httpResult = getServiceResource(pageNo, pageSize, url);
+            httpResult = getServiceResource(pageNo, pageSize);
+        } else if (ResourceTypeEnum.BU_SERVICE.equals(resourceTypeEnum)) {
+            httpResult = getBuServiceResource(pageNo,pageSize);
         } else {
             httpResult = new HttpResult();
             httpResult.setCode(ResponseStatus.SUCCESS_CODE);
@@ -802,15 +808,46 @@ public class ResourceBusiness implements IResourceBusiness {
         return httpResult;
     }
 
+    /**
+     * 从大数据平台获取
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    private HttpResult getBuServiceResource(Integer pageNo, Integer pageSize) {
+        String resourceUrl = resourceConfig.getBuServiceUrl();
+        HttpResult httpResult = new HttpResult();
+        Searchable searchable = Searchable.newSearchable();
+        searchable.setPage(pageNo, pageSize);
+        searchable.addSearchFilter("isDeleted", SearchOperator.eq, BooleanEnum.FALSE.value);
+        String param = JSON.toJSONString(searchable);
+        logger.info("-------------getBuServiceResource START -------------");
+        logger.info("url:{}, param:{}", resourceUrl, param);
+        String response = HttpUtil.postForm(resourceUrl, param, null, null);
+        if (null == response) {
+            logger.info("get bu service fail,pageNo:{},pageSize:{}", pageNo, pageSize);
+            httpResult.setCode(ResponseStatus.FAIL_CODE);
+        } else {
+            logger.info("get app resource success,pageNo:{},pageSize:{}", pageNo, pageSize);
+            JSONObject parse = JSONObject.parseObject(response);
+            httpResult.setCode(ResponseStatus.SUCCESS_CODE);
+            httpResult.setPages(parse.getInteger("totalPages"));
+            httpResult.setTotals(parse.getInteger("totalElements"));
+            httpResult.setRecords(parse.getJSONArray("content"));
+        }
+        logger.info("-------------getBuServiceResource END -------------");
+        return httpResult;
+    }
+
     /**
      * 从总线分页查询应用资源
      *
      * @param pageNo
      * @param pageSize
-     * @param url
      * @return
      */
-    private HttpResult getAppResource(Integer pageNo, Integer pageSize, String url) {
+    private HttpResult getAppResource(Integer pageNo, Integer pageSize) {
+        String url = resourceConfig.getResourceUrl();
         HttpResult httpResult = new HttpResult();
         Map<String, Object> map = new HashMap<>();
         //应用目录从0页开始查
@@ -830,6 +867,7 @@ public class ResourceBusiness implements IResourceBusiness {
                 .build();
 
         List<Header> headerList = getHeaders(busSendReqVO);
+        logger.info("-------------getAppResource START -------------");
         logger.info("getAppResource url:{}", url);
         String response = HttpUtil.postForm(url, param, headerList, null);
         if (null == response) {
@@ -843,6 +881,7 @@ public class ResourceBusiness implements IResourceBusiness {
             httpResult.setTotals(parse.getInteger("total"));
             httpResult.setRecords(parse.getJSONArray("content"));
         }
+        logger.info("-------------getAppResource END -------------");
         return httpResult;
     }
 
@@ -919,15 +958,23 @@ public class ResourceBusiness implements IResourceBusiness {
                     resourceEnum.getResourceType(), resourceEnum.getResourceProvider());
             dto.setContent(jsonString);
             JSONObject jsonObject = JSONObject.parseObject(jsonString);
-            String appCode = jsonObject.getString("yyxtbh");
-            String serviceCode = jsonObject.getString("FWZYBSF");
-            String appName = jsonObject.getString("yyxtmc");
-            String serviceName = jsonObject.getString("FWZYMC");
+            if(ResourceTypeEnum.TJ_APP.equals(resourceEnum)) {
+                String appCode = jsonObject.getString("yyxtbh");
+                String appName = jsonObject.getString("yyxtmc");
+                dto.setAppCode(appCode);
+                dto.setAppName(appName);
+            } else if (ResourceTypeEnum.TJ_SERVICE.equals(resourceEnum)) {
+                String serviceCode = jsonObject.getString("FWZYBSF");
+                String serviceName = jsonObject.getString("FWZYMC");
+                dto.setServiceCode(serviceCode);
+                dto.setServiceName(serviceName);
+            } else if (ResourceTypeEnum.BU_SERVICE.equals(resourceEnum)) {
+                String serviceCode = jsonObject.getString("serviceId");
+                String serviceName = jsonObject.getString("serviceName");
+                dto.setServiceCode(serviceCode);
+                dto.setServiceName(serviceName);
+            }
             dto.setExtId(jsonObject.getString("id"));
-            dto.setAppCode(appCode);
-            dto.setAppName(appName);
-            dto.setServiceCode(serviceCode);
-            dto.setServiceName(serviceName);
             dto.setDeleted(BooleanEnum.FALSE.getValue());
             dto.setSync(BooleanEnum.FALSE.getValue());
             list.add(dto);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/config/DcucResourceConfig.java

@@ -19,6 +19,11 @@ public class DcucResourceConfig {
      */
     private String resourceUrl;
 
+    /**
+     * bu服务资源请求地址
+     */
+    private String buServiceUrl;
+
     /**
      * 每页获取数量
      */

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ServiceResourceFacade.java

@@ -7,12 +7,14 @@ import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author huangzqa
@@ -38,8 +40,13 @@ public class ServiceResourceFacade implements IServiceResourceFacade {
     }
 
     @Override
-    public List<ServiceResource> getServiceByServiceCodes(List<String> list) {
-        return serviceResourceService.getServiceByServiceCodes(list);
+    public List<ServiceResourceDTO> getServiceByServiceCodes(List<String> list) {
+        List<ServiceResource> services = serviceResourceService.getServiceByServiceCodes(list);
+        return services.stream().map(item -> {
+            ServiceResourceDTO dto = new ServiceResourceDTO();
+            BeanUtils.copyProperties(item, dto);
+            return dto;
+        }).collect(Collectors.toList());
     }
     /**
      * 服务资源列表分页查询

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

@@ -128,11 +128,24 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
 
     @Override
     public List<ServiceResource> batchInsertServiceResource(List<ServiceResourceDTO> list) {
+        return batchInsertServiceResource(list, true);
+    }
+
+    /**
+     * 重载方法
+     * 控制是否需要设置机构相关的信息
+     * @param list
+     * @param needOrgInfos
+     * @return
+     */
+    private List<ServiceResource> batchInsertServiceResource(List<ServiceResourceDTO> list , Boolean needOrgInfos) {
         List<ServiceResource> services = new ArrayList<>();
         if(CollectionUtils.isEmpty(list)){
             return services;
         }
-        setOrgsInfo(list);
+        if(needOrgInfos) {
+            setOrgsInfo(list);
+        }
         List<Object> objects = batchInsertResource(list);
         for (Object object : objects) {
             ServiceResource service = (ServiceResource) object;
@@ -141,6 +154,8 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return services;
     }
 
+
+
     private List<Object> batchInsertResource(List<? extends ResourceDTO> list) {
         List<Object> objects = new ArrayList<>();
         for (ResourceDTO dto : list) {
@@ -160,7 +175,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         //根据对方提供机构编码,设置事权单位、管理单位信息
         List<String> codes = list.stream()
                 .flatMap(item -> Stream.of(item.getManagerUnitCode(), item.getBuildUnitCode()))
-                .filter(s->StringUtils.isNotBlank(s))
+                .filter(StringUtils::isNotBlank)
                 .distinct()
                 .collect(Collectors.toList());
         Map<String, OrgInfo> orgInfoMap = getOrgInfos(codes);
@@ -178,14 +193,14 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         }
         list = list
                 .stream()
-                .filter(s->StringUtils.isNotBlank(s))
+                .filter(StringUtils::isNotBlank)
                 .distinct()
                 .collect(Collectors.toList());
         logger.info("get OrgIds by OrgCodes>> orgCodeList:{}",JSON.toJSONString(list));
         List<OrgInfo> orgInfos = orgInfoFacade.getOrgsByCodes(list);
         Map<String, OrgInfo> collect = orgInfos
                 .stream()
-                .collect(Collectors.toMap(item->item.getCode(), item->item,(old,last)->last));
+                .collect(Collectors.toMap(OrgInfo::getCode, item->item,(old, last)->last));
         logger.info("get OrgIds by OrgCodes>> orgIdsList:{}",collect.keySet());
         return collect;
     }
@@ -197,6 +212,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         List<ResourceSync> appList = resourceMap.get(ResourceTypeEnum.TJ_APP.getResourceId());
         List<ResourceSync> serviceList = resourceMap.get(ResourceTypeEnum.TJ_SERVICE.getResourceId());
         List<ResourceSync> menuList = resourceMap.get(ResourceTypeEnum.TJ_APP_MENU.getResourceId());
+        List<ResourceSync> buServiceList = resourceMap.get(ResourceTypeEnum.BU_SERVICE.getResourceId());
         //插入应用资源
         if(null!=appList){
             List<AppResourceDTO> apps = appList.stream().filter(item->StringUtils.isNotBlank(item.getAppCode()))
@@ -209,6 +225,13 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
                     .map(this::getServiceResourceDTO).collect(Collectors.toList());
             batchInsertServiceResource(services);
         }
+        //插入bu服务资源
+        if(null != buServiceList) {
+           List<ServiceResourceDTO> buServices = buServiceList.stream().filter(item->StringUtils.isNotBlank(item.getServiceCode()))
+                    .map(this::getFromBuService).collect(Collectors.toList());
+            batchInsertServiceResource(buServices, false);
+        }
+
         //插入菜单目录
         if(null!=menuList) {
             List<MenuResourceDTO> menus = menuList.stream().filter(item->StringUtils.isNotBlank(item.getAppCode())).
@@ -220,6 +243,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return true;
     }
 
+
     /**
      * 批量插入应用的菜单数据
      * @param menus MenuResourceDTO 菜单DTOs
@@ -295,6 +319,35 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return list;
     }
 
+    /**
+     * 将bu服务资源同步对象转为服务资源DTO
+     * @param resourceSync
+     * @return
+     */
+    private ServiceResourceDTO getFromBuService(ResourceSync resourceSync) {
+        String content = resourceSync.getContent();
+        BuServiceAcceptDTO acceptDTO = JSON.parseObject(content, BuServiceAcceptDTO.class);
+        ServiceResourceDTO dto = new ServiceResourceDTO();
+        ResourceTypeEnum resourceEnum = ResourceTypeEnum.BU_SERVICE;
+        dto.setResourceId(resourceEnum.getResourceId());
+        dto.setResourceType(resourceEnum.getResourceType());
+        dto.setResourceProvider(resourceEnum.getResourceProvider());
+        dto.setServiceCode(acceptDTO.getServiceId());
+        dto.setServiceName(acceptDTO.getServiceName());
+        dto.setBuildUnit(acceptDTO.getServiceManageDeptName());
+        dto.setBuildUnitCode(acceptDTO.getServiceManageDept());
+        dto.setManagerUnit(acceptDTO.getServiceManageDeptName());
+        dto.setManagerUnitCode(acceptDTO.getServiceManageDept());
+        String isDeleted = acceptDTO.getIsDeleted();
+        dto.setDeleted(isDeleted);
+        if(BooleanEnum.FALSE.value.equals(isDeleted)) {
+            dto.setServiceStatus(ServiceStatusCons.STATUS_START);
+        } else {
+            dto.setServiceStatus(ServiceStatusCons.STATUS_DELETED);
+        }
+        return dto;
+    }
+
     /**
      * 将资源同步对象转为服务资源DTO
      * @param resourceSync ResourceSync 资源同步数据
@@ -377,8 +430,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
     private <T extends ResourceDTO> Object insertResource(T dto) {
         //根据对方提供机构编码,承建单位编码,获取orgId和manufacturerId
         setOrgInfo(dto);
-        Object resource = doInsert(dto);
-        return resource;
+        return doInsert(dto);
     }
 
     /**

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/strategy/ServiceResourceStrategy.java

@@ -33,7 +33,8 @@ public class ServiceResourceStrategy implements ResourceOperateStrategy<ServiceR
         LambdaQueryWrapper<ServiceResource> wrapper = Wrappers.lambdaQuery();
         wrapper.select()
                .eq(ServiceResource::getServiceCode,serviceResourceDTO.getServiceCode())
-               .eq(ServiceResource::getDeleted,BooleanEnum.FALSE.getValue());
+               .eq(ServiceResource::getDeleted,BooleanEnum.FALSE.getValue())
+               .eq(ServiceResource::getResourceId, serviceResourceDTO.getResourceId());
         ServiceResource exist = serviceResourceMapper.selectOne(wrapper);
         ServiceResource serviceResource;
         if (null == exist) {
@@ -60,7 +61,8 @@ public class ServiceResourceStrategy implements ResourceOperateStrategy<ServiceR
 
     @Override
     public boolean canHandle(String resourceId) {
-        return ResourceTypeEnum.TJ_SERVICE.getResourceId().equals(resourceId);
+       return ResourceTypeEnum.TJ_SERVICE.getResourceId().equals(resourceId) ||
+                ResourceTypeEnum.BU_SERVICE.getResourceId().equals(resourceId);
     }
 
 }

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-app</artifactId>
-    <version>2.2.0-tjdsj-SNAPSHOT</version>
+    <version>2.2.1-tjdsj-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>dcuc-app-api</module>