浏览代码

自动适配→适配过程中,出现wait_timeout问题

chendi 8 年之前
父节点
当前提交
66a1cf0f3f

+ 6 - 6
src/main/java/com/yihu/hos/standard/match/metadata/MetadataStrategyExecute.java

@ -56,12 +56,6 @@ public class MetadataStrategyExecute implements Runnable {
    @Override
    public void run() {
        try {
            //按名字相似度来适配
            if (standardNameStrategy.match(metadata, version)) {
                updateAdapt(version);
                return;
            }
            if (matchVO != null) {
                //项目间学习
                if (standardExistStrategy.match(metadata, matchVO,std_version,adapter_std_version, version)) {
@ -70,6 +64,12 @@ public class MetadataStrategyExecute implements Runnable {
                }
            }
            //按名字相似度来适配
            if (standardNameStrategy.match(metadata, version)) {
                updateAdapt(version);
                return;
            }
            updateAdapt(version);
        } catch (Exception e) {
            e.printStackTrace();

+ 8 - 8
src/main/java/com/yihu/hos/standard/match/metadata/MetatdataStandardExistStrategy.java

@ -107,20 +107,20 @@ public class MetatdataStandardExistStrategy extends SQLGeneralDAO {
                                }
                                StdMetaDataModel orgMetadata = metadataTemps.get(0);
                                //保存适配
//                                adapterMetadataService.saveAdapt(strategyMetadata, orgMetadata, version, adapterInfo);
                                String strSql = adapterMetadataService.saveAdaptSql(strategyMetadata, orgMetadata, version, adapterInfo);
                                if(null != strSql && !"".equals(strSql)){
                                    sqlList.add(strSql);
                                }
                                adapterMetadataService.saveAdapt(strategyMetadata, orgMetadata, version, adapterInfo);
//                                String strSql = adapterMetadataService.saveAdaptSql(strategyMetadata, orgMetadata, version, adapterInfo);
//                                if(null != strSql && !"".equals(strSql)){
//                                    sqlList.add(strSql);
//                                }
                                flag = true;
                                break;
                            }
                        }
                    }
                    if(CollectionUtils.isNotEmpty(sqlList)){
                        adapterMetadataService.insertBatch(sqlList);
                    }
//                    if(CollectionUtils.isNotEmpty(sqlList)){
//                        adapterMetadataService.insertBatch(sqlList);
//                    }
                }
//                if (adapterDataset != null) {
//                    adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);

+ 7 - 2
src/main/java/com/yihu/hos/standard/service/adapter/AdapterDatasetService.java

@ -659,7 +659,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        //执行匹配
        MetadataStrategyExecute.setFirst(version, unAdapterMetadataModels.size());//设置第一次匹配
        List<String> sqlList = new ArrayList<String>();
        Set<String> sqlList = new HashSet<String>();
        for (AdapterMetadataModel unAdapterMetadataModel : unAdapterMetadataModels) {
            threadPoolTaskExecutor.execute(new MetadataStrategyExecute(unAdapterMetadataModel, matchVO, std_version,adapter_std_version,version, stdMetaDataModelDao,stdDataSetModelDao,adapterMetadataService));
@ -685,7 +685,12 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        }
        if(CollectionUtils.isNotEmpty(sqlList)){
            super.insertBatch(sqlList);
            List list=new ArrayList();
            Iterator it=sqlList.iterator();
            while(it.hasNext()){
                list.add((String) it.next());
            }
            super.insertBatch(list);
        }
    }