代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/SchemeVersionController.java

@@ -24,7 +24,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "根据版本id获取适配方案信息",  produces = "application/json", notes = "获取适配版本")
    public ObjEnvelop get(
            @ApiParam(name = "versionId", value = "适配版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
            @RequestParam(value = "versionId") Long versionId) {
        return adapterSchemeVersion.get(versionId);
    }
@@ -51,7 +51,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "发布适配版本",  produces = "application/json", notes = "发布适配版本")
    public ObjEnvelop publish(
            @ApiParam(name = "versionId", value = "适配版本ID")
            @RequestParam(value = "versionId") Integer versionId,
            @RequestParam(value = "versionId") Long versionId,
            @ApiParam(name = "publisher", value = "发布者")
            @RequestParam(value = "publisher", required = false) String publisher) {
        return adapterSchemeVersion.publish(versionId, publisher);
@@ -62,7 +62,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除版本",  produces = "application/json", notes = "删除版本")
    public Envelop delete(
            @ApiParam(name = "versionId", value = "标准版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
            @RequestParam(value = "versionId") Long versionId) {
        return adapterSchemeVersion.delete(versionId);
    }
@@ -91,7 +91,7 @@ public class SchemeVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取适配方案版本列表", produces = "application/json", notes = "获取标准版本列表")
    public ListEnvelop getList(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId,
            @RequestParam(value = "schemeId") Long schemeId,
            @ApiParam(name = "condition", value = "Search param,Must be json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/SQLGeneralDAO.java

@@ -71,11 +71,11 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        DataGridResult dataGridResult = new DataGridResult();
        Query query = currentSession().createQuery(hql);
        if (page != null && rows != null) {
            dataGridResult.setPageSize(rows.intValue());
            dataGridResult.setCurrPage(page.intValue());
            dataGridResult.setPageSize(rows);
            dataGridResult.setCurrPage(page);
            dataGridResult.setTotalCount(query.list().size());
            query.setMaxResults(rows.intValue());
            query.setFirstResult((page.intValue() - 1) * rows.intValue());
            query.setMaxResults(rows);
            query.setFirstResult((page - 1) * rows);
            dataGridResult.setDetailModelList(query.list());
        } else {
            List list = query.list();
@@ -89,11 +89,11 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
    public DataGridResult getDataGridResult(Query query, Integer page, Integer rows) {
        DataGridResult dataGridResult = new DataGridResult();
        if (page != null && rows != null) {
            dataGridResult.setPageSize(rows.intValue());
            dataGridResult.setCurrPage(page.intValue());
            dataGridResult.setPageSize(rows);
            dataGridResult.setCurrPage(page);
            dataGridResult.setTotalCount(query.list().size());
            query.setMaxResults(rows.intValue());
            query.setFirstResult((page.intValue() - 1) * rows.intValue());
            query.setMaxResults(rows);
            query.setFirstResult((page - 1) * rows);
            dataGridResult.setDetailModelList(query.list());
        } else {
            List list = query.list();
@@ -110,14 +110,14 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        StandardVersion standardVersion = new StandardVersion(version);
        String tableName = standardVersion.getTableName(dataType);
        String hql =
                "DELETE FROM " + tableName +
                        " WHERE id in (:ids) ";
        Query query = this.getCurrentSession().createQuery(hql);
        query.setParameterList("ids", ids);
        return query.executeUpdate() > 0;
        StringBuffer sb = new StringBuffer("'");
        for ( int i= 0; i < ids.length; i++){
            sb.append(ids[i]).append("','");
        }
        String st = sb.toString();
        st = st.substring(1,st.length()-1);
        String sql ="DELETE FROM " + tableName +" WHERE id in ("+st+") ";
        return jdbcTemplate.update(sql) > 0;
    }
@@ -266,7 +266,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        return criteria.list();
    }
    public <T> List getEntityListByParentId(Class<T> cls, String parentFiledName, Integer patentId, String condition, String order, Integer limit, Integer offset) throws IOException {
    public <T> List<T> getEntityListByParentId(Class<T> cls, String parentFiledName, Long patentId, String condition, String order, Integer limit, Integer offset) throws IOException {
        Session session = this.getCurrentSession();
        Criteria criteria = session.createCriteria(cls);
        criteria.add(Restrictions.eq(parentFiledName, patentId));

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/XSQLGeneralDAO.java

@@ -56,7 +56,7 @@ public interface XSQLGeneralDAO {
    <T> List getEntityList(Class<T> var1, String var2, String var3, Integer var4, Integer var5) throws IOException;
    <T> List getEntityListByParentId(Class<T> var1, String var2, Integer var3, String var4, String var5, Integer var6, Integer var7) throws IOException;
    <T> List getEntityListByParentId(Class<T> var1, String var2, Long var3, String var4, String var5, Integer var6, Integer var7) throws IOException;
    <T> List getList(Class<T> var1, String var2, String var3, String var4, Integer var5, Integer var6);

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/adapter/AdapterDatasetModel.java

@@ -26,11 +26,26 @@ public class AdapterDatasetModel extends Result implements Serializable {
    @Column(name = "std_dataset_name")
    private String stdDatasetName;
    @Column(name = "adapter_dataset_id")
    private Long adapterDatasetId;
    private String adapterDatasetId;
    @Column(name = "adapter_dataset_code")
    private String adapterDatasetCode;
    @Column(name = "adapter_dataset_name")
    private String adapterDatasetName;
    @Column(name="main_dataset_code")
    private String mainDatasetCode;
    @Column(name="main_dataset_name")
    private String mainDatasetName;
    @Column(name="is_clone")
    private Integer isClone; //0 不是克隆(默认)   1是克隆
    @Column(name="need_crawer")
    private Integer needCrawer;//0不需要采集   1需要采集(默认)
    public static AdapterDatasetModel error(String message) {
        AdapterDatasetModel re= new AdapterDatasetModel();
        re.successFlg = false;
        re.message = message;
        return re;
    }
    public Long getId() {
        return id;
@@ -72,11 +87,11 @@ public class AdapterDatasetModel extends Result implements Serializable {
        this.stdDatasetName = stdDatasetName;
    }
    public Long getAdapterDatasetId() {
    public String getAdapterDatasetId() {
        return adapterDatasetId;
    }
    public void setAdapterDatasetId(Long adapterDatasetId) {
    public void setAdapterDatasetId(String adapterDatasetId) {
        this.adapterDatasetId = adapterDatasetId;
    }
@@ -95,4 +110,37 @@ public class AdapterDatasetModel extends Result implements Serializable {
    public void setAdapterDatasetName(String adapterDatasetName) {
        this.adapterDatasetName = adapterDatasetName;
    }
    public String getMainDatasetCode() {
        return mainDatasetCode;
    }
    public void setMainDatasetCode(String mainDatasetCode) {
        this.mainDatasetCode = mainDatasetCode;
    }
    public String getMainDatasetName() {
        return mainDatasetName;
    }
    public void setMainDatasetName(String mainDatasetName) {
        this.mainDatasetName = mainDatasetName;
    }
    public Integer getIsClone() {
        return isClone;
    }
    public void setIsClone(Integer isClone) {
        this.isClone = isClone;
    }
    public Integer getNeedCrawer() {
        return needCrawer;
    }
    public void setNeedCrawer(Integer needCrawer) {
        this.needCrawer = needCrawer;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/adapter/AdapterMetadataModel.java

@@ -43,6 +43,12 @@ public class AdapterMetadataModel extends Result implements Serializable {
    private Long adapterDictId;
    @Column(name = "adapter_info")
    private String adapterInfo;
    @Column(name = "belong_adapter_id")
    private Long belongAdapterId;
    @Column(name = "adapter_default")
    private String adapterDefault;
    @Column(name="need_crawer")
    private Integer needCrawer;//0不需要采集   1需要采集(默认)
    public String getAdapterInfo() {
        return adapterInfo;
@@ -155,4 +161,28 @@ public class AdapterMetadataModel extends Result implements Serializable {
    public void setAdapterDictId(Long adapterDictId) {
        this.adapterDictId = adapterDictId;
    }
    public Long getBelongAdapterId() {
        return belongAdapterId;
    }
    public void setBelongAdapterId(Long belongAdapterId) {
        this.belongAdapterId = belongAdapterId;
    }
    public String getAdapterDefault() {
        return adapterDefault;
    }
    public void setAdapterDefault(String adapterDefault) {
        this.adapterDefault = adapterDefault;
    }
    public Integer getNeedCrawer() {
        return needCrawer;
    }
    public void setNeedCrawer(Integer needCrawer) {
        this.needCrawer = needCrawer;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterDatasetService.java

@@ -41,6 +41,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.*;
@Transactional
@@ -193,6 +194,81 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        }
    }
    public List<TreeView> getAdapterCustomize(String adapterVersion) throws IOException {
        List<AdapterDatasetModel> adapterDataSetList = searchPage(AdapterDatasetModel.class, AdapterVersion.DataSetTablePrefix,adapterVersion, "", null, null, null,false);
        List<TreeView> adapterCustomizeList = new ArrayList<>();
        int i = 0;//用于判断左侧根节点是否需要全选
        for (AdapterDatasetModel adapterDataset : adapterDataSetList) {
            TreeView parent = new TreeView();
            parent.setId("SD" + adapterDataset.getId());
            parent.setPid("S0");
            parent.setText(adapterDataset.getStdDatasetName());
            if(adapterDataset.getNeedCrawer()!=null && adapterDataset.getNeedCrawer()==1){
                i++;
                parent.setIschecked(true);
                //添加到右侧树形列表
                TreeView rightParent = new TreeView();
                rightParent.setId("AD" + adapterDataset.getId());
                rightParent.setPid("A0");
                rightParent.setText(adapterDataset.getStdDatasetName());
                rightParent.setIschecked(true);
                adapterCustomizeList.add(rightParent);
            }else{
                parent.setIschecked(false);
            }
            adapterCustomizeList.add(parent);
            Long belongDatasetId = adapterDataset.getId();
            List<AdapterMetadataModel> adapterMetaDataList = adapterMetadataService.searchPage(AdapterMetadataModel.class, AdapterVersion.MetaDataTablePrefix,adapterVersion, "belongAdapterId="+belongDatasetId, null, null, null,false) ;
            //数据元
            for (AdapterMetadataModel adapterMetadat : adapterMetaDataList) {
                TreeView child = new TreeView();
                child.setId("SM" + adapterMetadat.getId());
                child.setPid("SD" + belongDatasetId);
                child.setText(adapterMetadat.getStdMetadataName());
                if(adapterMetadat.getNeedCrawer()!= null && adapterMetadat.getNeedCrawer()==1){
                    child.setIschecked(true);
                    //添加到右侧树形列表
                    TreeView rightChild = new TreeView();
                    rightChild.setId("AM" + adapterMetadat.getId());
                    rightChild.setPid("AD" + adapterDataset.getId());
                    rightChild.setText(adapterMetadat.getStdMetadataName());
                    rightChild.setIschecked(true);
                    adapterCustomizeList.add(rightChild);
                } else {
                    child.setIschecked(false);
                }
                adapterCustomizeList.add(child);
            }
        }
        //添加左侧根节点
        TreeView leftParent = new TreeView();
        leftParent.setId("S0");
        leftParent.setPid("-1");
        leftParent.setText("数据集");
        if(i >= 1){
            //首先添加右侧根节点
            TreeView adapterRoot = new TreeView();
            adapterRoot.setId("A0");
            adapterRoot.setPid("-1");
            adapterRoot.setText("数据集");
            adapterRoot.setIschecked(true);
            adapterCustomizeList.add(adapterRoot);
        }
        if (i == adapterDataSetList.size()) {
            leftParent.setIschecked(true);
        } else {
            leftParent.setIschecked(false);
        }
        adapterCustomizeList.add(leftParent);
        return adapterCustomizeList;
    }
    public void getAdapterCustomize(String adapterVersion, List<TreeView> treeViewList, List<Long> hasCheckDatasetIdList, List<Long> hasCheckMetadataIdList) {
        boolean adapter = false;  //定制是否添加根节点
        //获取所有定制数据集
@@ -321,11 +397,13 @@ public class AdapterDatasetService extends SQLGeneralDAO {
    public ListEnvelop getDatasetCustomize(String adapterVersion, String stdVersion) {
        try {
            List<TreeView> treeViewList = new ArrayList<>();
            List<Long> hasCheckDatasetIdList = new ArrayList<>();
            List<Long> hasCheckMetadataIdList = new ArrayList<>();
            getAdapterCustomize(adapterVersion, treeViewList, hasCheckDatasetIdList, hasCheckMetadataIdList);
            getStdCustomize(stdVersion, treeViewList, hasCheckDatasetIdList, hasCheckMetadataIdList);
            List<TreeView> treeViewList = getAdapterCustomize(adapterVersion);
//            List<TreeView> treeViewList = new ArrayList<>();
//            List<Long> hasCheckDatasetIdList = new ArrayList<>();
//            List<Long> hasCheckMetadataIdList = new ArrayList<>();
//            getAdapterCustomize(adapterVersion, treeViewList, hasCheckDatasetIdList, hasCheckMetadataIdList);
//            getStdCustomize(stdVersion, treeViewList, hasCheckDatasetIdList, hasCheckMetadataIdList);
            ListEnvelop detailModelResult = ListEnvelop.getSuccess("获取定制数据集列表成功",treeViewList);
            return detailModelResult;
        } catch (Exception e) {
@@ -686,7 +764,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
    public void saveAdaptDataset(AdapterDatasetModel strategyDataset,StdDataSetModel orgDataset,String version) throws Exception {
        if(null != strategyDataset){
            strategyDataset.setAdapterDatasetId(orgDataset.getId());
            strategyDataset.setAdapterDatasetId(orgDataset.getId()+"");
            strategyDataset.setAdapterDatasetCode(orgDataset.getCode());
            strategyDataset.setAdapterDatasetName(orgDataset.getName());
            JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(strategyDataset));

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterMetadataService.java

@@ -326,7 +326,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                List<AdapterDatasetModel> adapterDatasetModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class));
                for (AdapterDatasetModel model : adapterDatasetModelList) {
                    ApiMetadataResultDetailModel metadataModel = metadataResultMap.get(model.getStdDatasetId());
                    model.setAdapterDatasetId(metadataModel.getAdapterDatasetId());
                    model.setAdapterDatasetId(metadataModel.getAdapterDatasetId()+"");
                    model.setAdapterDatasetCode(metadataModel.getAdapterDatasetCode());
                    model.setAdapterDatasetName(metadataModel.getAdapterDatasetName());
                    JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(model));

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterSchemeVersionService.java

@@ -45,7 +45,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
    public static final String BEAN_ID = "AdapterSchemeVersionService";
    public ListEnvelop getDictionaryResult(Integer schemeId, String condition, String order, Integer rows, Integer page) {
    public ListEnvelop getDictionaryResult(Long schemeId, String condition, String order, Integer rows, Integer page) {
        try {
            List<AdapterSchemeVersionModel> adapterSchemeVersionModelList = getEntityListByParentId(
                    AdapterSchemeVersionModel.class, "schemeId", schemeId, condition, order, rows, page);
@@ -147,7 +147,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return false;
    }
    public Envelop delete(Integer versionId) {
    public Envelop delete(Long versionId) {
        Boolean publishedFlg = false;
        try {
            AdapterSchemeVersionModel versionModel = getEntity(AdapterSchemeVersionModel.class, versionId);
@@ -168,7 +168,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop get(Integer versionId) {
    public ObjEnvelop get(Long versionId) {
        try {
            AdapterSchemeVersionModel versionModel = getEntity(AdapterSchemeVersionModel.class, versionId);
            return ObjEnvelop.getSuccess("获取适配版本方成功",versionModel);
@@ -211,7 +211,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop publish(Integer versionId, String publisher) {
    public ObjEnvelop publish(Long versionId, String publisher) {
        try {
            AdapterSchemeVersionModel adapterSchemeVersionModel = getEntity(AdapterSchemeVersionModel.class, versionId);
            //TODO:generate standard version file;
@@ -387,8 +387,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        String[] tables = {version.getDataSetTableName(),
                version.getMetaDataTableName(),
                version.getDictTableName(),
                version.getDictEntryTableName(),
                version.getDatasetRelationTableName()};
                version.getDictEntryTableName()};
        List<String> deleteSqlList = new ArrayList<>();
        boolean temp = false;
        for (int i = 0; i < tables.length; ++i) {
@@ -434,7 +433,8 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        List<String> sqlList = new ArrayList<>();
        SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
        String sql = sqlCreator.selectData(stdVersion.getMetaDataTableName());
        List<StdMetaDataModel> metadataList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        Query query = getQuery(sqlCreator, sql);
        List<StdMetaDataModel> metadataList = query.list();
        List<Long> newDictdList = new ArrayList<>();
        for (StdMetaDataModel stdMetaDataModel : metadataList) {
            if (stdMetaDataModel.getDictId() != null && !newDictdList.contains(stdMetaDataModel.getDictId())) {
@@ -448,8 +448,8 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
                "",
                null));
        sqlList.add(insertData(adapterVersion.getMetaDataTableName(), stdVersion.getMetaDataTableName(),
                new String[]{"id,std_metadata_id,std_metadata_code,std_metadata_name,std_dataset_id,std_dict_id"},
                new String[]{"id,id,code,name,dataset_id,dict_id"},
                new String[]{"id,std_metadata_id,std_metadata_code,std_metadata_name,std_dataset_id,std_dict_id,belong_adapter_id,adapter_info"},
                new String[]{"id,id,inner_code,name,dataset_id,dict_id,dataset_id,0"},
                scheme.getId(),
                "",
                null));
@@ -477,7 +477,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        adapterTableList.add(adapterVersion.MetaDataTablePrefix);
        adapterTableList.add(adapterVersion.DictTablePrefix);
        adapterTableList.add(adapterVersion.DictEntryTablePrefix);
        adapterTableList.add(adapterVersion.DatasetRelationTablePrefix);
//        adapterTableList.add(adapterVersion.DatasetRelationTablePrefix);
        for (String table : adapterTableList) {
            String sql = SqlConstants.CREATE_TABLE + table + SqlConstants.UNDERLINE + adapterVersion.getVersion() + SqlConstants.LIKE + table;
            sqlList.add(sql);

svr/svr-basic/src/main/resources/application.yml

@@ -128,7 +128,6 @@ fz-gateway:
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: mlwTest
@@ -207,3 +206,8 @@ express:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
#消息队列
activemq:
  username: admin
  password: admin
  url: tcp://172.26.0.116:61616