|  | @ -8,6 +8,7 @@ import com.yihu.hos.standard.dao.IStdDataSetModelDao;
 | 
												
													
														
															|  | import com.yihu.hos.standard.dao.IStdMetaDataModelDao;
 |  | import com.yihu.hos.standard.dao.IStdMetaDataModelDao;
 | 
												
													
														
															|  | import com.yihu.hos.standard.match.matchModel.MetadataMatchVO;
 |  | import com.yihu.hos.standard.match.matchModel.MetadataMatchVO;
 | 
												
													
														
															|  | import com.yihu.hos.standard.match.metadata.MetadataStrategyExecute;
 |  | import com.yihu.hos.standard.match.metadata.MetadataStrategyExecute;
 | 
												
													
														
															|  | 
 |  | import com.yihu.hos.standard.match.metadata.MetatdataStandardNameStrategy;
 | 
												
													
														
															|  | import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
 |  | import com.yihu.hos.standard.model.adapter.AdapterDatasetModel;
 | 
												
													
														
															|  | import com.yihu.hos.standard.model.adapter.AdapterDictModel;
 |  | import com.yihu.hos.standard.model.adapter.AdapterDictModel;
 | 
												
													
														
															|  | import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
 |  | import com.yihu.hos.standard.model.adapter.AdapterMetadataModel;
 | 
												
											
												
													
														
															|  | @ -16,6 +17,7 @@ import com.yihu.hos.standard.model.standard.StdDataSetModel;
 | 
												
													
														
															|  | import com.yihu.hos.standard.model.standard.StdMetaDataModel;
 |  | import com.yihu.hos.standard.model.standard.StdMetaDataModel;
 | 
												
													
														
															|  | import com.yihu.hos.standard.service.bo.AdapterVersion;
 |  | import com.yihu.hos.standard.service.bo.AdapterVersion;
 | 
												
													
														
															|  | import com.yihu.hos.standard.service.bo.StandardVersion;
 |  | import com.yihu.hos.standard.service.bo.StandardVersion;
 | 
												
													
														
															|  | 
 |  | import com.yihu.hos.standard.service.standard.StdMetadataService;
 | 
												
													
														
															|  | import com.yihu.hos.web.framework.constant.ErrorCode;
 |  | import com.yihu.hos.web.framework.constant.ErrorCode;
 | 
												
													
														
															|  | import com.yihu.hos.web.framework.constant.SqlConstants;
 |  | import com.yihu.hos.web.framework.constant.SqlConstants;
 | 
												
													
														
															|  | import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
 |  | import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
 | 
												
											
												
													
														
															|  | @ -55,6 +57,9 @@ public class AdapterDatasetService extends SQLGeneralDAO {
 | 
												
													
														
															|  |     @Autowired
 |  |     @Autowired
 | 
												
													
														
															|  |     private IStdDataSetModelDao stdDataSetModelDao;
 |  |     private IStdDataSetModelDao stdDataSetModelDao;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |     @Autowired
 | 
												
													
														
															|  | 
 |  |     private StdMetadataService stdMetadataService;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |     public AdapterDatasetService() {
 |  |     public AdapterDatasetService() {
 | 
												
													
														
															|  |     }
 |  |     }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
											
												
													
														
															|  | @ -640,6 +645,14 @@ public class AdapterDatasetService extends SQLGeneralDAO {
 | 
												
													
														
															|  |         MetadataMatchVO matchVO = new MetadataMatchVO();
 |  |         MetadataMatchVO matchVO = new MetadataMatchVO();
 | 
												
													
														
															|  |         matchVO.setCodeAdapter(matchVO.geNameGroup(adapterMetadataModel));
 |  |         matchVO.setCodeAdapter(matchVO.geNameGroup(adapterMetadataModel));
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         //設置匹配的机构数据緩存
 | 
												
													
														
															|  | 
 |  |         List<StdMetaDataModel> orgMetadatas = stdMetadataService.getList(adapter_std_version, null, null, null, null, null);//查找出机构所有的metadatas
 | 
												
													
														
															|  | 
 |  |         for (StdMetaDataModel stdMetadata:orgMetadatas){
 | 
												
													
														
															|  | 
 |  |             MetatdataStandardNameStrategy.getNameMap().put(stdMetadata.getName(),stdMetadata);
 | 
												
													
														
															|  | 
 |  |             MetatdataStandardNameStrategy.getRemarkMap().put(stdMetadata.getDefinition(),stdMetadata);
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         //执行匹配
 |  |         //执行匹配
 | 
												
													
														
															|  |         MetadataStrategyExecute.setFirst(version, unAdapterMetadataModels.size());//设置第一次匹配
 |  |         MetadataStrategyExecute.setFirst(version, unAdapterMetadataModels.size());//设置第一次匹配
 | 
												
													
														
															|  | 
 |  | 
 |