集团属性池映射界面代码完善

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/GroupAttrPoolMappingController.java

@@ -87,7 +87,7 @@
     */
    @PostMapping("/getEnumAttrByClsOIdAndAttrId")
    public R<List<EnumVO>> getEnumAttrByClsOIdAndAttrId(@RequestBody GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException {
        return R.data(groupAttrPoolMappingService.getEnumAttrByClsOIdAndAttrId(groupAttrPoolMappingVO));
        return groupAttrPoolMappingService.getEnumAttrByClsOIdAndAttrId(groupAttrPoolMappingVO);
    }

}

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java

@@ -65,6 +65,6 @@
     * @param groupAttrPoolMappingVOS
     * @return
     */
    List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS);
    R getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS);

}

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java

 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java

@@ -206,7 +206,7 @@
     * @return
     */
    @Override
    public List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) {
    public R getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) {
        if(Func.isEmpty(groupAttrPoolMappingVOS.getClassifyId())){
            throw new ServiceException("必传参数分类oid不能为空！");
        }
@@ -217,16 +217,16 @@
        List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyClient.listCodeAttributeByClassId(groupAttrPoolMappingVOS.getClassifyId());
        // 筛选出模板属性中id等于codeMetaAttrKey的，并取出enumId
        if(attrVOS.isEmpty()){
            return new ArrayList<>();
            return R.fail("当前分类所使用模板的模板属性中未查询到相关的属性配置，请排查模板配置是否正确。");
        }
        List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOS = attrVOS.stream().filter(item -> item.getId().equalsIgnoreCase(groupAttrPoolMappingVOS.getCodeMetaAttrKey())).collect(Collectors.toList());
        // 根据上一步取出的enumId调用枚举服务查询出枚举并返回
        String enumId = codeClassifyTemplateAttrVOS.get(0).getEnumId();
        if(Func.isBlank(enumId)){
            return new ArrayList<>();
            return R.fail("在系统中根据当前配置的模板属性未查询到关于枚举的配置，请排查元数据上是否存在枚举属性！");
        }
        R<List<EnumVO>> list = enumClient.getList(enumId);
        return list.getData();
        return R.data(list.getData());
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java

@@ -49,12 +49,12 @@
     */
    @Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
    public void scheduled() {
        log.info("执行主数据集成数据推送 start:");
        log.info("执行主数据集成数据推送 start");
        if(DATA_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
            codeDuckingSyncServiceI.DockingDataSyncScheduing();
            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
            String time = formatter.format(new Date());
            String outinfo = "============ 执行了主数据集成数据推送";
            String outinfo = time+"============ 执行了主数据集成数据推送";
            log.info(outinfo);
        }
        log.info("执行主数据集成数据推送 end: "+ "开关是否开启:" +DATA_SYNC_PUSH_ISSTARE);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java

@@ -189,11 +189,9 @@

    @Override
    public void DockingDataSyncScheduing() {

        // insertCache2();
        initPushDataTaks(1);
        sendpushDataForService();

    }

    /***