标准适配错乱bug

hos-broker/src/main/resources/application.yml

@@ -79,7 +79,7 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/
      defaultZone: http://172.19.103.73:8761/eureka/
log:
  path: /usr/local/esb/logs/logback/broker
  level: info

hos-rest/src/main/resources/config/http.properties

@@ -1,11 +1,11 @@
#httpUrl = http://172.19.103.73:10140/api/v1.0
#httpCouldUrl = http://172.19.103.73:10400/api/v1.0
#httpAdminUrl = http://172.19.103.73:10000/api/v1.0
httpUrl = http://172.19.103.73:10140/api/v1.0
httpCouldUrl = http://172.19.103.73:10400/api/v1.0
httpAdminUrl = http://172.19.103.73:10000/api/v1.0
httpUrl = http://192.168.1.221:10140/api/v1.0
httpCouldUrl = http://192.168.1.221:10400/api/v1.0
httpAdminUrl = http://192.168.1.221:10000/api/v1.0
#httpUrl = http://192.168.1.221:10140/api/v1.0
#httpCouldUrl = http://192.168.1.221:10400/api/v1.0
#httpAdminUrl = http://192.168.1.221:10000/api/v1.0
#  http://172.19.103.73:1443/api/v1.0
#\uFFFD\uFFFDhttps://192.168.131.15:4432/api/v1.0

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

@@ -92,12 +92,12 @@ public class MetatdataStandardNameStrategy {
    public boolean match(AdapterMetadataModel metadata, String version, String std_version) throws Exception {
        StdDataSetModel stdDataset = stdDataSetModelDao.getDatasetName(schemaName,std_version, metadata.getStdDatasetId());
        String name = metadata.getStdMetadataName();
        StdMetaDataModel orgStdeMetadata = nameMap.get(name + "_" + stdDataset.getCode(), true);
        StdMetaDataModel orgStdeMetadata = nameMap.get(name + "_" + stdDataset.getName(), true);
        if (orgStdeMetadata != null) {
            adapterMetadataService.saveAdapt(schemaName,metadata, orgStdeMetadata, version, "2");
            return true;
        }
        orgStdeMetadata = remarkMap.get(name + "_" + stdDataset.getCode(), true);
        orgStdeMetadata = remarkMap.get(name + "_" + stdDataset.getName(), true);
        if (orgStdeMetadata != null) {
            adapterMetadataService.saveAdapt(schemaName,metadata, orgStdeMetadata, version, "2");
            return true;

src/main/java/com/yihu/hos/standard/service/adapter/AdapterDatasetService.java

@@ -673,10 +673,10 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        //設置匹配的机构数据緩存
        List<StdMetaDataModel> orgMetadatas = stdMetadataService.getList(schemaName,adapter_std_version, null, null, null, null, null);//查找出机构所有的metadatas
        for (StdMetaDataModel stdMetadata:orgMetadatas){
            StdDataSetModel stdDataset = stdDataSetModelDao.getDatasetName(schemaName,std_version, stdMetadata.getDatasetId());
            StdDataSetModel stdDataset = stdDataSetModelDao.getDatasetName(schemaName,adapter_std_version, stdMetadata.getDatasetId());
            if(null != stdDataset){
                MetatdataStandardNameStrategy.getNameMap().put(stdMetadata.getName() + "_" + stdDataset.getCode(),stdMetadata);
                MetatdataStandardNameStrategy.getRemarkMap().put(stdMetadata.getDefinition() + "_" + stdDataset.getCode(),stdMetadata);
                MetatdataStandardNameStrategy.getNameMap().put(stdMetadata.getName() + "_" + stdDataset.getName(),stdMetadata);
                MetatdataStandardNameStrategy.getRemarkMap().put(stdMetadata.getDefinition() + "_" + stdDataset.getName(),stdMetadata);
            }
        }

src/main/java/com/yihu/hos/system/dao/UserDao.java

@@ -44,7 +44,7 @@ public class UserDao extends SQLGeneralDAO {
    public void deleteUserRoleByUserId(String userId) throws Exception
    {
        String sql = "delete from system_user_role where user_id ='"+ userId + "'";
        String sql = "delete from system_role_user where user_id ='"+ userId + "'";
        super.execute(sql);
    }

src/main/resources/resource/SystemUserRole.hbm.xml

@@ -5,7 +5,7 @@
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.hos.system.model.SystemUserRole" table="system_user_role">
    <class name="com.yihu.hos.system.model.SystemUserRole" table="system_role_user">
        <id name="id" type="java.lang.String">
            <column name="id" length="50" />
            <generator class="uuid" />