代码修改

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

@@ -416,7 +416,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        return Envelop.getError("获取标准数据元失败");
    }
    public Query getQuery(SqlCreator sqlCreator, String sql) {
    private Query getQuery(SqlCreator sqlCreator, String sql) {
        SQLQuery query = this.getCurrentSession().createSQLQuery(sql);
        Iterator var4 = sqlCreator.getKeyValueMap().keySet().iterator();

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

@@ -68,7 +68,7 @@ public interface XSQLGeneralDAO {
    Session openSession();
    Query getQuery(SqlCreator var1, String var2);
//    Query getQuery(SqlCreator var1, String var2);
    Query getExeuteQuery(SqlCreator var1, String var2);

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

@@ -489,8 +489,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        if(!StringUtils.isEmpty(dictIds)){
            jdbcTemplate.execute("update "+new AdapterVersion(adapterVersion).getDictTableName() +" set need_crawer=1 where id in ("+dictIds.substring(1,dictIds.length())+")");
        }
        envelop.setStatus(200);
        return envelop;
        return Envelop.getSuccess("克隆成功");
    }
    public String getInsertSql(AdapterVersion version, AdapterMetadataModel medata) throws IOException {
@@ -716,8 +715,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
        sqlCreator.equalCondition("stdDatasetCode", datasetCode);
        String sql = sqlCreator.selectData("adapter_dataset_" + version);
        Query query = getQuery(sqlCreator, sql);
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class));
    }
    public AdapterDatasetModel getAdapterDatasetByCode(String schemaName, String version, String datasetCode) {
@@ -732,8 +730,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            String myCatAnnotation = "/*#mycat:schema=" + schemaName + "*/ ";
            String completeSql = myCatAnnotation + sql;
            Query query = getQuery(sqlCreator, completeSql);
            return (AdapterDatasetModel) query.uniqueResult();
            return jdbcTemplate.query(completeSql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class)).get(0);
        } catch (Exception e) {
            e.printStackTrace();
            return null;

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

@@ -27,6 +27,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -162,14 +163,14 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null) {
                query.setFirstResult((offset - 1) * limit);
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        List<AdapterMetadataModel> modelList = query.list();
        List<AdapterMetadataModel> modelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterMetadataModel.class));
        String ids = "";
        Map<Long, StdDataSetModel> stdDatasetModelMap = new HashMap<>();
        Long schemeId = null;
@@ -187,8 +188,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            sqlCreator = new SqlCreator(StdDataSetModel.class);
            sqlCreator.inCondition("id", ids.substring(1, ids.length()));
            sql = sqlCreator.selectData(tableName);
            query = getQuery(sqlCreator, sql);
            List<StdDataSetModel> stdDatasetModelList = query.list();
            List<StdDataSetModel> stdDatasetModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
            for (StdDataSetModel model : stdDatasetModelList) {
                stdDatasetModelMap.put(model.getId(), model);
            }
@@ -245,14 +245,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                e.printStackTrace();
            }
        }
        String sql = sqlCreator.countData(tableName);
        Query query = getCurrentSession().createSQLQuery(sql);
        for (String key : sqlCreator.getKeyValueMap().keySet()) {
            query.setParameter(key, sqlCreator.getKeyValueMap().get(key));
        }
        Integer count = Integer.parseInt(StringUtil.toString(query.list().get(0)));
        return count;
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
    public List getInfoList(String adapterVersion, String condition, String order, Integer limit, Integer offset) throws Exception{
@@ -275,8 +269,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
            sqlCreator.inCondition("id", idList);
            String sql = sqlCreator.selectData(tableName);
            Query query = getQuery(sqlCreator, sql);
            List<StdMetaDataModel> stdMetadataModelList = query.list();
            List<StdMetaDataModel> stdMetadataModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
            for (StdMetaDataModel model : stdMetadataModelList) {
                stdMetaDataModelMap.put(model.getId(), model);
            }
@@ -380,8 +373,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            }
            sqlCreator.inCondition("id", ids.substring(1,ids.length()));
            sql = sqlCreator.selectData(tableName);
            Query query = getQuery(sqlCreator, sql);
            List<StdDataSetModel> stdDataSetModelList = query.list();
            List<StdDataSetModel> stdDataSetModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
            if(!CollectionUtils.isEmpty(stdDataSetModelList)){
                for(StdDataSetModel stdDataSetModel:stdDataSetModelList){
                    Long id = stdDataSetModel.getId();
@@ -428,8 +420,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            sqlCreator.equalCondition("stdDatasetId", stdDatasetId);
            sqlCreator.equalCondition("adapterDatasetId", adapterDatasetId);
            sql = sqlCreator.countData(version.getMetaDataTableName());
            query = getExeuteQuery(sqlCreator, sql);
            Integer count = Integer.parseInt(StringUtil.toString(query.list().get(0)));
            Integer count = jdbcTemplate.queryForObject(sql,Integer.class);
            if (count == 0) {
                sql = "delete from " + version.getDataSetTableName() + " where std_dataset_id = :stdDatasetId and adapter_dataset_id = :adapterDatasetId";
                query = session.createSQLQuery(sql);
@@ -476,8 +467,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(AdapterMetadataModel.class);
            sqlCreator.equalCondition("id", adapterMetadataId);
            String sql = sqlCreator.selectData("adapter_metadata_"+version);
            Query query = getQuery(sqlCreator, sql);
            return (AdapterMetadataModel)query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterMetadataModel.class)).get(0);
        } catch (Exception e) {
            return null;
        }

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

@@ -433,8 +433,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        List<String> sqlList = new ArrayList<>();
        SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
        String sql = sqlCreator.selectData(stdVersion.getMetaDataTableName());
        Query query = getQuery(sqlCreator, sql);
        List<StdMetaDataModel> metadataList = query.list();
        List<StdMetaDataModel> metadataList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        List<Long> newDictdList = new ArrayList<>();
        for (StdMetaDataModel stdMetaDataModel : metadataList) {
            if (stdMetaDataModel.getDictId() != null && !newDictdList.contains(stdMetaDataModel.getDictId())) {

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

@@ -2,6 +2,7 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -76,14 +77,14 @@ public class StdMetadataService extends SQLGeneralDAO {
        String myCatAnnotation = "/*#mycat:schema=" + schemaName + "*/ ";
        String completeSql = myCatAnnotation + sql;
        Query sessionQuery = getQuery(sqlCreator, completeSql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null) {
                sessionQuery.setFirstResult((offset - 1) * limit);
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdMetaDataModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
    }
    public List<StdMetaDataModel> getList(String stdVersion, Long datasetId, String condition, String order, Integer limit, Integer offset) {