Merge branch 'master' of chenyongxing/esb into master

src/main/java/com/yihu/hos/standard/match/dictionary/DictitemStandardExistStrategy.java

@@ -75,26 +75,27 @@ public class DictitemStandardExistStrategy {
            Integer unAdaptDicId = adapterDictEntryModel.getStdDictId();
            StdDictionaryModel stdDictionaryModel = stdDictionaryDao.getDictionaryName(std_version,unAdaptDicId);
            StdDictionaryModel adapterDictionaryModel = stdDictionaryDao.getDictionaryName(adapter_std_version,unAdaptDicId);
            String orgName = stdDictionaryModel.getName();
            for (AdapterDictEntryModel adapterDictEntry : matchList) {
                if(adapterDictEntry.getStdEntryValue().contains(adapterDictEntryModel.getStdEntryValue())){
                    String orgDicEntryValue= adapterDictEntry.getAdapterEntryValue();
                    //根据值查找出 该项目下面的字典项
                    List<StdDictionaryEntryModel> dictionaryEntryTemps = stdDictionaryEntryDao.getDictionaryEntry(adapter_std_version,orgDicEntryValue,orgName);
                    if(dictionaryEntryTemps!=null&&dictionaryEntryTemps.size()>0){
                        String adapterInfo = "1";//查找到就默认疑似适配
                        if(dictionaryEntryTemps.size()==1){//查找到的条数为1,则为完全适配
                            adapterInfo = "2";
            if(stdDictionaryModel!=null){
                String orgName = stdDictionaryModel.getName();
                for (AdapterDictEntryModel adapterDictEntry : matchList) {
                    if(adapterDictEntry.getStdEntryValue().contains(adapterDictEntryModel.getStdEntryValue())){
                        String orgDicEntryValue= adapterDictEntry.getAdapterEntryValue();
                        //根据值查找出 该项目下面的字典项
                        List<StdDictionaryEntryModel> dictionaryEntryTemps = stdDictionaryEntryDao.getDictionaryEntry(adapter_std_version,orgDicEntryValue,orgName);
                        if(dictionaryEntryTemps!=null&&dictionaryEntryTemps.size()>0){
                            String adapterInfo = "1";//查找到就默认疑似适配
                            if(dictionaryEntryTemps.size()==1){//查找到的条数为1,则为完全适配
                                adapterInfo = "2";
                            }
                            StdDictionaryEntryModel stdDictionaryEntryModel = dictionaryEntryTemps.get(0);
                            //保存适配
                            adapterDictEntryService.saveAdapt(adapterDictEntryModel, stdDictionaryEntryModel, version,adapterInfo);
                            flag=true;
                            break;
                        }
                        StdDictionaryEntryModel stdDictionaryEntryModel = dictionaryEntryTemps.get(0);
                        //保存适配
                        adapterDictEntryService.saveAdapt(adapterDictEntryModel, stdDictionaryEntryModel, version,adapterInfo);
                        flag=true;
                        break;
                    }
                }
            }
            if (adapterDictionaryModel != null) {
                adapterDictService = SpringBeanUtil.getService(AdapterDictService.BEAN_ID);
                AdapterDictModel entity = adapterDictService.getAdapterDictByCode(version, adapterDictionaryModel.getCode());

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

@@ -88,24 +88,26 @@ public class MetatdataStandardExistStrategy extends SQLGeneralDAO {
                Integer unAdaptStdId = strategyMetadata.getStdDatasetId();
                StdDataSetModel stdDataset = stdDataSetModelDao.getDatasetName(std_version, unAdaptStdId);
                StdDataSetModel adapterDataset = stdDataSetModelDao.getDatasetName(adapter_std_version, unAdaptStdId);
                String stdDatasetName = stdDataset.getName();
                for (AdapterMetadataModel stdeMetadataTemp : adapterMetadatas) {
                    //利用名字來匹配
                    if (stdeMetadataTemp.getStdMetadataName().contains(strategyMetadata.getStdMetadataName())) {
                        String orgMetadataName = stdeMetadataTemp.getAdapterMetadataName();
                        //根据名字查找出 该项目下面的数据元名称
                        List<StdMetaDataModel> metadataTemps = stdMetaDataModelDao.getMetadata(adapter_std_version, orgMetadataName, stdDatasetName);
                        if (metadataTemps != null && metadataTemps.size() > 0) {
                            String adapterInfo = "1";//找到默认为疑似适配
                            if (metadataTemps.size() == 1) {//找到条数为1,默认为完全适配
                                adapterInfo = "2";
                if(stdDataset!=null){
                    String stdDatasetName = stdDataset.getName();
                    for (AdapterMetadataModel stdeMetadataTemp : adapterMetadatas) {
                        //利用名字來匹配
                        if (stdeMetadataTemp.getStdMetadataName().contains(strategyMetadata.getStdMetadataName())) {
                            String orgMetadataName = stdeMetadataTemp.getAdapterMetadataName();
                            //根据名字查找出 该项目下面的数据元名称
                            List<StdMetaDataModel> metadataTemps = stdMetaDataModelDao.getMetadata(adapter_std_version, orgMetadataName, stdDatasetName);
                            if (metadataTemps != null && metadataTemps.size() > 0) {
                                String adapterInfo = "1";//找到默认为疑似适配
                                if (metadataTemps.size() == 1) {//找到条数为1,默认为完全适配
                                    adapterInfo = "2";
                                }
                                StdMetaDataModel orgMetadata = metadataTemps.get(0);
                                //保存适配
                                adapterMetadataService.saveAdapt(strategyMetadata, orgMetadata, version, adapterInfo);
                                flag = true;
                                break;
                            }
                            StdMetaDataModel orgMetadata = metadataTemps.get(0);
                            //保存适配
                            adapterMetadataService.saveAdapt(strategyMetadata, orgMetadata, version, adapterInfo);
                            flag = true;
                            break;
                        }
                    }
                }