代码修改

common/common-util/src/main/java/com/yihu/jw/util/sql/SqlCreator.java

@@ -153,7 +153,7 @@ public class SqlCreator {
    public String betweenCondition(String item, Object value1, Object value2) {
        String condition = item + SqlConstants.BETWEEN + SqlConstants.BEGIN + item + SqlConstants.AND + SqlConstants.END + item;
        String condition = item + SqlConstants.BETWEEN + SqlConstants.BEGIN + " '"+ value1 +"' " + SqlConstants.AND + SqlConstants.END + " '"+ value2 +"' ";
        keyValueMap.put(SqlConstants.BEGIN + item, value1);
        keyValueMap.put(SqlConstants.END + item, value2);
        conditionList.add(condition);
@@ -161,28 +161,28 @@ public class SqlCreator {
    }
    public String greaterAndEqualCondition(String item, Object value) {
        String condition = item + SqlConstants.GREATER_EQUAL_MARK + SqlConstants.COLON + item;
        String condition = item + SqlConstants.GREATER_EQUAL_MARK + " '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
    }
    public String greaterCondition(String item, Object value) {
        String condition = item + SqlConstants.GREATER_MARK + SqlConstants.COLON + item;
        String condition = item + SqlConstants.GREATER_MARK + " '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
    }
    public String lessAndEqualCondition(String item, Object value) {
        String condition = item + SqlConstants.LESS_EQUAL_MARK + SqlConstants.COLON + item;
        String condition = item + SqlConstants.LESS_EQUAL_MARK + " '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
    }
    public String lessCondition(String item, Object value) {
        String condition = item + SqlConstants.LESS_MARK + SqlConstants.COLON + item;
        String condition = item + SqlConstants.LESS_MARK +" '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
@@ -190,7 +190,7 @@ public class SqlCreator {
    public String equalCondition(String item, Object value) {
        String column = StringUtil.toString(transformer.propertyToColumn.get(item));
        String condition = column + SqlConstants.EQUAL_MARK + SqlConstants.COLON + item;
        String condition = column + SqlConstants.EQUAL_MARK + SqlConstants.COLON + " '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
@@ -198,7 +198,7 @@ public class SqlCreator {
    public String inCondition(String item, Object value) {
        String column = StringUtil.toString(transformer.propertyToColumn.get(item));
        String condition = column + SqlConstants.IN + SqlConstants.LEFT_BRACKET + SqlConstants.COLON + item + SqlConstants.RIGHT_BRACKET;
        String condition = column + SqlConstants.IN + SqlConstants.LEFT_BRACKET + " '"+ value +"' " + SqlConstants.RIGHT_BRACKET;
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
@@ -206,7 +206,7 @@ public class SqlCreator {
    public String equalConditionQue(String item, Object value) {
        String column = StringUtil.toString(transformer.propertyToColumn.get(item));
        String condition = column + SqlConstants.EQUAL_MARK + SqlConstants.QUESTION_MARK;
        String condition = column + SqlConstants.EQUAL_MARK +" '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;
@@ -216,9 +216,10 @@ public class SqlCreator {
        if (!StringUtil.isEmpty(value)) {
            String column1 = StringUtil.toString(transformer.propertyToColumn.get(item1));
            String column2 = StringUtil.toString(transformer.propertyToColumn.get(item2));
            String condition = SqlConstants.LEFT_BRACKET + column1 + SqlConstants.LIKE + SqlConstants.COLON + item1
                    + SqlConstants.OR + column2 + SqlConstants.LIKE + SqlConstants.COLON + item2 + SqlConstants.RIGHT_BRACKET;
            value = SqlConstants.PERCENT + value + SqlConstants.PERCENT;
            value = " '"+ SqlConstants.PERCENT + value + SqlConstants.PERCENT+"' ";
            String condition = SqlConstants.LEFT_BRACKET + column1 + SqlConstants.LIKE + value
                    + SqlConstants.OR + column2 + SqlConstants.LIKE + value + SqlConstants.RIGHT_BRACKET;
            keyValueMap.put(item1, value);
            keyValueMap.put(item2, value);
            conditionList.add(condition);
@@ -231,8 +232,8 @@ public class SqlCreator {
    public String likeCondition(String item, Object value) {
        String column = StringUtil.toString(transformer.propertyToColumn.get(item));
        String condition = column + SqlConstants.LIKE + SqlConstants.COLON + item;
        value = SqlConstants.PERCENT + value + SqlConstants.PERCENT;
        String condition = column + SqlConstants.LIKE + " '"+ value +"' ";
        keyValueMap.put(item, value);
        conditionList.add(condition);
        return condition;

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

@@ -32,7 +32,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取标准版本", produces = "application/json", notes = "获取标准版本")
    public ObjEnvelop getForVersionId(
            @ApiParam(name = "versionId", value = "标准版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
            @RequestParam(value = "versionId") Long versionId) {
        return standardVersionService.get(versionId);
    }
@@ -75,7 +75,7 @@ public class StandardVersionController 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") String publisher) throws Exception {
        return standardVersionService.publish(versionId, publisher);
@@ -91,7 +91,7 @@ public class StandardVersionController 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,
            @ApiParam(name = "version", value = "标准版本值")
            @RequestParam(value = "version") String version) throws Exception {
        return standardVersionService.delete(versionId,version);
@@ -107,7 +107,7 @@ public class StandardVersionController extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取标准版本列表",  produces = "application/json", notes = "获取标准版本列表")
    public ListEnvelop getVersions(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId,
            @RequestParam(value = "standardId") Long standardId,
            @ApiParam(name = "condition", value = "Must be Json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")

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

@@ -351,31 +351,30 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
            var13.printStackTrace();
        }
        String sql1 = sqlCreator.selectData(tableName);
        Query query1 = this.getQuery(sqlCreator, sql1);
        String sql = sqlCreator.selectData(tableName);
        if (limit != null) {
            query1.setMaxResults(limit.intValue());
            if (offset != null &&offset>0) {
                query1.setFirstResult(offset.intValue() * limit.intValue());
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return query1.list();
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public List getListByIdList(Class tClass, String tableName, String fieldName, List<Integer> idList) {
        SqlCreator sqlCreator = new SqlCreator(tClass);
        try {
            sqlCreator.inCondition(fieldName, idList);
            sqlCreator.inCondition(fieldName, StringUtils.join(idList,","));
        } catch (Exception var8) {
            var8.printStackTrace();
            return null;
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = this.getQuery(sqlCreator, sql);
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDataSetInt(Class tClass, String tableName, String condition) {
@@ -391,7 +390,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
                    String count = (String) query.next();
                    String value = sql.get(count).asText();
                    if (NumberUtil.isInteger(value)) {
                        sqlCreator.equalCondition(count, Integer.valueOf(Integer.parseInt(value)));
                        sqlCreator.equalCondition(count, Integer.parseInt(value));
                    } else {
                        sqlCreator.equalCondition(count, value);
                    }
@@ -403,7 +402,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
        String sql1 = sqlCreator.countData(tableName);
        Query query1 = this.getQuery(sqlCreator, sql1);
        Integer count1 = Integer.valueOf(Integer.parseInt(StringUtil.toString(query1.list().get(0))));
        Integer count1 = Integer.parseInt(StringUtil.toString(query1.list().get(0)));
        return count1;
    }
@@ -575,14 +574,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
            }
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (size != null) {
            query.setMaxResults(size);
            if (page != null) {
                query.setFirstResult((page - 1) * size);
            }
        }
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Long searchVersionCount(Class tClass, String stdVersion, String dataType, String condition) throws IOException {
@@ -796,14 +788,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
            }
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
            }
        }
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public boolean deleteByField(String field, Object[] ids, String dataType, String version) {

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

@@ -19,7 +19,7 @@ public class StandardVersionModel extends IntegerIdentityEntity implements Seria
    private String version;
    private Integer standardId;
    private Long standardId;
    private String versionName;
@@ -61,12 +61,12 @@ public class StandardVersionModel extends IntegerIdentityEntity implements Seria
        this.version = version;
    }
    @Column(name = "std_id")
    public Integer getStandardId() {
    @Column(name = "standard_id")
    public Long getStandardId() {
        return standardId;
    }
    public void setStandardId(Integer standardId) {
    public void setStandardId(Long standardId) {
        this.standardId = standardId;
    }

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

@@ -12,6 +12,7 @@ import com.yihu.jw.basic.standard.model.adapter.AdapterDatasetModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterDictModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.jw.basic.standard.model.standard.StandardVersionModel;
import com.yihu.jw.basic.standard.model.standard.StdDataSetModel;
import com.yihu.jw.basic.standard.model.standard.StdMetaDataModel;
import com.yihu.jw.basic.standard.service.bo.AdapterVersion;
@@ -35,6 +36,7 @@ import org.apache.commons.collections.CollectionUtils;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -170,14 +172,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            }
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
            }
        }
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDatasetInt(Class tClass, AdapterVersion adapterVersion, String condition) {
@@ -262,8 +257,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            String tableName = sVersion.getMetaDataTableName();
            SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
            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 stdMetaDataModel : stdMetaDataModelList) {
                List<StdMetaDataModel> stdMetaDataModels = stdDataSetModelMap.get(stdMetaDataModel.getDataSetId());
                if (stdMetaDataModels == null) {
@@ -385,8 +379,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
            sqlCreator.inCondition("id", newMetadataIdList);
            String sql = sqlCreator.selectData(sVersion.getMetaDataTableName());
            Query query = getQuery(sqlCreator, sql);
            metadataList = query.list();
            metadataList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        }
        List<Long> newDictdList = new ArrayList<>();
@@ -592,8 +585,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
            sqlCreator.inCondition("stdDatasetId", datasetIdList);
            String sql = sqlCreator.selectData(adapterVersion.getDataSetTableName());
            Query query = getQuery(sqlCreator, sql);
            return query.list();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class));
        } catch (Exception e) {
            e.printStackTrace();
            return null;
@@ -608,8 +600,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 (AdapterDatasetModel) query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class)).get(0);
        } catch (Exception e) {
            e.printStackTrace();
            return null;
@@ -624,8 +615,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
            sqlCreator.inCondition("adapterDatasetId", datasetIdList);
            String sql = sqlCreator.selectData(adapterVersion.getDataSetTableName());
            Query query = getQuery(sqlCreator, sql);
            return query.list();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class));
        } catch (Exception e) {
            e.printStackTrace();
            return null;

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

@@ -22,6 +22,7 @@ import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.SqlCreator;
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;
import org.springframework.util.CollectionUtils;
@@ -145,14 +146,14 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        List<AdapterDictEntryModel> modelList = query.list();
        List<AdapterDictEntryModel> modelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDictEntryModel.class));
        List<Long> idList = new ArrayList<>();
        Map<Long, StdDictionaryModel> stdDictModelMap = new HashMap<>();
        Long schemeId = null;
@@ -170,8 +171,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
            sqlCreator = new SqlCreator(StdDictionaryModel.class);
            sqlCreator.inCondition("id", idList);
            sql = sqlCreator.selectData(tableName);
            query = getQuery(sqlCreator, sql);
            List<StdDictionaryModel> stdDictModelList = query.list();
            List<StdDictionaryModel> stdDictModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
            for (StdDictionaryModel model : stdDictModelList) {
                stdDictModelMap.put(model.getId(), model);
            }
@@ -270,8 +270,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
                SqlCreator sqlCreator = new SqlCreator(AdapterDictModel.class);
                sqlCreator.inCondition("stdDictId", idList);
                String sql = sqlCreator.selectData(tableName);
                Query query = getQuery(sqlCreator, sql);
                List<AdapterDictModel> adapterDictModelList = query.list();
                List<AdapterDictModel> adapterDictModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDictModel.class));
                for (AdapterDictModel model : adapterDictModelList) {
                    AdapterDictEntryResultDetailModel dictentryModel = dictEntryResultMap.get(model.getStdDictId());
                    model.setAdapterDictId(dictentryModel.getAdapterDictId());
@@ -280,7 +279,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
                    JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(model));
                    sqlCreator = new SqlCreator(AdapterDictModel.class);
                    sql = sqlCreator.updateDataByTableKey(version.getDictTableName(), jsonNode);
                    query = getExeuteQuery(sqlCreator, sql);
                    Query query = getExeuteQuery(sqlCreator, sql);
                    query.executeUpdate();
                }
            }
@@ -328,8 +327,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
            sqlCreator.equalCondition("stdDictId", adapterDictT.getStdDictId());
            sqlCreator.equalCondition("stdEntryCode", dictCode);
            String sql = sqlCreator.selectData("std_dictionary_entry_"+version);
            Query query = getQuery(sqlCreator, sql);
            return (AdapterDictEntryModel)query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDictEntryModel.class)).get(0);
        } catch (Exception e) {
            return null;
        }
@@ -341,8 +339,7 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
            sqlCreator.equalCondition("stdDictId", adapterDictT.getStdDictId());
            sqlCreator.equalCondition("stdEntryValue", dictValue);
            String sql = sqlCreator.selectData("std_dictionary_entry_"+version);
            Query query = getQuery(sqlCreator, sql);
            return (AdapterDictEntryModel)query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDictEntryModel.class)).get(0);
        } catch (Exception e) {
            return null;
        }
@@ -351,20 +348,14 @@ public class AdapterDictEntryService extends SQLGeneralDAO {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        StringBuffer sql = new StringBuffer();
        sql.append("SELECT m.*").append(" FROM "+adapterVersion.getDictEntryTableName()).append(" m where m.adapter_entry_id is null");
        Query query = getCurrentSession().createSQLQuery(sql.toString());
        query.setResultTransformer(new BeanTransformer(AdapterDictEntryModel.class));
        List<AdapterDictEntryModel> list = query.list();
        return list;
        return jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper<>(AdapterDictEntryModel.class));
    }
    public List<AdapterDictEntryModel> getAllAdaptDictEntry(String version) {
        AdapterVersion adapterVersion = new AdapterVersion(version);
        StringBuffer sql = new StringBuffer();
        sql.append("SELECT m.*").append(" FROM "+adapterVersion.getDictEntryTableName()).append(" m where m.adapter_entry_id is not null");
        Query query = getCurrentSession().createSQLQuery(sql.toString());
        query.setResultTransformer(new BeanTransformer(AdapterDictEntryModel.class));
        List<AdapterDictEntryModel> list = query.list();
        return list;
        return jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper<>(AdapterDictEntryModel.class));
    }
    public void saveAdapt(AdapterDictEntryModel adapterDictEntryModel, StdDictionaryEntryModel stdDictionaryEntryModel, String version,String adapterInfo) throws  Exception{

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

@@ -26,6 +26,7 @@ import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -169,14 +170,15 @@ public class AdapterDictService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDictInt(Class tClass, String adapterVersion, String condition) {
@@ -282,8 +284,7 @@ public class AdapterDictService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(AdapterDictModel.class);
            sqlCreator.equalCondition("stdDictCode", dictCode);
            String sql = sqlCreator.selectData("adapter_dict_" + version);
            Query query = getQuery(sqlCreator, sql);
            return (AdapterDictModel) query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDictModel.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

@@ -26,6 +26,7 @@ import com.yihu.jw.util.sql.SqlCreator;
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;
import org.springframework.util.CollectionUtils;
@@ -152,14 +153,15 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                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));
        List<Long> idList = new ArrayList<>();
        Map<Long, StdDataSetModel> stdDatasetModelMap = new HashMap<>();
@@ -178,8 +180,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
            sqlCreator = new SqlCreator(StdDataSetModel.class);
            sqlCreator.inCondition("id", idList);
            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);
            }
@@ -255,8 +256,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);
            }
@@ -327,8 +327,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
                sqlCreator.inCondition("stdDatasetId", idList);
                String sql = sqlCreator.selectData(tableName);
                Query query = getQuery(sqlCreator, sql);
                List<AdapterDatasetModel> adapterDatasetModelList = query.list();
                List<AdapterDatasetModel> adapterDatasetModelList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdapterDatasetModel.class));
                for (AdapterDatasetModel model : adapterDatasetModelList) {
                    ApiMetadataResultDetailModel metadataModel = metadataResultMap.get(model.getStdDatasetId());
                    model.setAdapterDatasetId(metadataModel.getAdapterDatasetId());
@@ -338,7 +337,7 @@ public class AdapterMetadataService extends SQLGeneralDAO {
                    sqlCreator = new SqlCreator(AdapterDatasetModel.class);
                    sql = sqlCreator.updateDataByTableKey(version.getDataSetTableName(), jsonNode);
                    sqlList.add(sql);
                    query = getExeuteQuery(sqlCreator, sql);
                    Query query = getExeuteQuery(sqlCreator, sql);
                    query.executeUpdate();
                }
            }
@@ -413,8 +412,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

@@ -1,5 +1,6 @@
package com.yihu.jw.basic.standard.service.adapter;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.jw.basic.standard.model.adapter.resultModel.AdapterSchemeVersionResultDetailModel;
@@ -433,8 +434,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/StandardService.java

@@ -358,7 +358,7 @@ public class StandardService extends SQLGeneralDAO {
        }
        List<StandardVersionModel> versionModelList = new ArrayList<>();
        if (!CollectionUtils.isEmpty(idList)) {
            String versionHql = "select * from std_version  WHERE std_id in ("+ StringUtils.join(idList,",") +")";
            String versionHql = "select * from std_version  WHERE standard_id in ("+ StringUtils.join(idList,",") +")";
            versionModelList = jdbcTemplate.query(versionHql,new BeanPropertyRowMapper<>(StandardVersionModel.class));
        }

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

@@ -55,7 +55,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    @Autowired
    private StdDictEntryService stdDictEntryService;
    public ListEnvelop getDictionaryResult(Integer standardId, String condition, String order, Integer rows, Integer page) {
    public ListEnvelop getDictionaryResult(Long standardId, String condition, String order, Integer rows, Integer page) {
        try {
            List<DictItem> detailModelList = new ArrayList<>();
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
@@ -75,7 +75,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public ListEnvelop getDetailResultModelList(Integer standardId, String condition, String order, Integer rows, Integer page) {
    public ListEnvelop getDetailResultModelList(Long standardId, String condition, String order, Integer rows, Integer page) {
        try {
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
            List<DictItem> detailModelList = new ArrayList<DictItem>();
@@ -98,7 +98,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public List<StandardVersionModel> getVersionList(Integer standardId, String condition, String order, Integer limit, Integer offset) {
    public List<StandardVersionModel> getVersionList(Long standardId, String condition, String order, Integer limit, Integer offset) {
        try {
            Map queryMap = RequestParamTransformer.parseJsonToMap(condition);
            Map orderMap = RequestParamTransformer.parseJsonToMap(order);
@@ -130,7 +130,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public Boolean versionNameValidate(Integer standardId, String versionName) {
    public Boolean versionNameValidate(Long standardId, String versionName) {
            Map<String, Object> query = new HashMap<>();
            Map<String, String> order = new HashMap<>();
            query.put("versionName", versionName);
@@ -141,7 +141,7 @@ public class StandardVersionService extends SQLGeneralDAO {
            return false;
    }
    public Boolean versionNameValidate(Integer standardId, Integer versionId, String versionName) throws Exception {
    public Boolean versionNameValidate(Long standardId, Integer versionId, String versionName) throws Exception {
        String sql = "FROM StandardVersionModel WHERE versionName = :versionName and standardId = :standardId and id != :versionId";
        Query query = getCurrentSession().createQuery(sql);
        query.setParameter("standardId", standardId);
@@ -155,7 +155,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    @Transactional
    public Envelop delete(Integer versionId, String version) throws Exception {
    public Envelop delete(Long versionId, String version) throws Exception {
        Boolean existFlg = false;
        Boolean useredFlg = false;
        try {
@@ -209,7 +209,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop get(Integer versionId) {
    public ObjEnvelop get(Long versionId) {
        try {
            StandardVersionModel versionModel = this.myGet(versionId);
            return ObjEnvelop.getSuccess("获取标准版本信息成功",versionModel);
@@ -219,7 +219,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public StandardVersionModel fork(Integer versionId) throws Exception {
    public StandardVersionModel fork(Long versionId) throws Exception {
        try {
            return this.myFork(versionId);
@@ -229,7 +229,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    @Transactional
    public ObjEnvelop publish(Integer versionId, String publisher) throws Exception {
    public ObjEnvelop publish(Long versionId, String publisher) throws Exception {
        try {
            StandardVersionModel standardVersionModel = this.myPublish(versionId, publisher);
            return ObjEnvelop.getSuccess("发布标准版本成功",standardVersionModel);
@@ -239,7 +239,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        }
    }
    public StandardVersionModel getLastestVersion(Integer standardId) {
    public StandardVersionModel getLastestVersion(Long standardId) {
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        order.put("publisher", SqlConstants.DESC);
@@ -252,7 +252,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        return null;
    }
    public StandardVersionModel myPublish(Integer versionId, String publisher) throws Exception {
    public StandardVersionModel myPublish(Long versionId, String publisher) throws Exception {
        StandardVersionModel standardVersionModel = myGet(versionId);
        //TODO:generate standard version file;
        String path = "";
@@ -266,7 +266,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        return standardVersionModel;
    }
    private StandardVersionModel myFork(Integer versionId) throws Exception {
    private StandardVersionModel myFork(Long versionId) throws Exception {
        StandardVersionModel baseVersionModel = myGet(versionId);
        StandardVersionModel newVersionModel = new StandardVersionModel();
        newVersionModel.setBaseVersion(baseVersionModel.getVersion());
@@ -282,7 +282,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        return newVersionModel;
    }
    private StandardVersionModel myGet(Integer versionId) {
    private StandardVersionModel myGet(Long versionId) {
        try {
            return (StandardVersionModel) getEntity(StandardVersionModel.class, versionId);
        } catch (Exception e) {
@@ -317,7 +317,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        buildVersionTables(baseVersion, newVersion, standardVersionModel.getStandardId());
    }
    private List<StandardVersionModel> getList(Integer standardId, Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
    private List<StandardVersionModel> getList(Long standardId, Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardVersionModel.class);
        criteria.add(Restrictions.eq("standardId", standardId));
@@ -359,7 +359,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        insertBatch(deleteSql);
    }
    private void buildVersionTables(StandardVersion baseVersion, StandardVersion newVersion, Integer standardId) {
    private void buildVersionTables(StandardVersion baseVersion, StandardVersion newVersion, Long standardId) {
        String[] newTables = {newVersion.getDataSetTableName(),
                newVersion.getMetaDataTableName(),

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

@@ -12,6 +12,7 @@ import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
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;
@@ -185,15 +186,15 @@ public class StdCDADatasetService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getCDADatasetTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdCDADatasetModel>) sessionQuery.list();
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdCDADatasetModel.class));
    }
}//end CDADatasetRelationshipManager

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

@@ -12,6 +12,7 @@ import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
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;
@@ -159,14 +160,15 @@ public class StdCDAService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getCDATableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdCDAModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdCDAModel.class));
    }

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

@@ -10,6 +10,7 @@ import com.yihu.jw.basic.standard.model.standard.StdDatasetCatalogModel;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -132,13 +133,14 @@ public class StdDatasetCatalogService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(StdDatasetCatalogModel.TABLE_NAME);
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdDatasetCatalogModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDatasetCatalogModel.class));
    }
}

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

@@ -20,6 +20,7 @@ import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -121,8 +122,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        sqlCreator.equalCondition("code", code);
        sqlCreator.neCondition("id", datasetId);
        String sql = sqlCreator.selectData(standardVersion.getDataSetTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StdDataSetModel> list = sessionQuery.list();
        List<StdDataSetModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
@@ -186,8 +186,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        SqlCreator sqlCreator = new SqlCreator(StdDataSetModel.class);
        sqlCreator.equalCondition("id", datasetId);
        String sql = sqlCreator.selectData(dataSetTable);
        Query query = getQuery(sqlCreator, sql);
        return (StdDataSetModel) query.uniqueResult();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class)).get(0);
    }
    private void update(StandardVersion standardVersion, StdDataSetModel stdDataSetModel) throws IOException {
@@ -231,18 +230,15 @@ public class StdDatasetService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getDataSetTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                int tmp = 0;
                if((offset - 1) * limit>0){
                    tmp = (offset - 1) * limit;
                }
                sessionQuery.setFirstResult(tmp);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdDataSetModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
    }
    public PageEnvelop getDetailModelList(String stdVersion, String condition, String order, Integer rows, Integer page) {
@@ -292,14 +288,16 @@ public class StdDatasetService extends SQLGeneralDAO {
            }
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return query.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDatasetInt(Class tClass, String stdVersion, String condition) {
@@ -411,8 +409,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        SqlCreator sqlCreator = new SqlCreator(StdDictionaryModel.class);
        String sql = sqlCreator.selectData(dictTable);
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StdDictionaryModel> stdDictList = sessionQuery.list();
        List<StdDictionaryModel> stdDictList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
        Map<String, Long> stdDictMap = new HashMap<>();
        for (StdDictionaryModel dict : stdDictList) {
            stdDictMap.put(dict.getCode(), dict.getId());

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

@@ -3,6 +3,7 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.model.Select2;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -16,6 +17,7 @@ import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
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;
import org.springframework.util.CollectionUtils;
@@ -105,8 +107,7 @@ public class StdDictEntryService extends SQLGeneralDAO {
        sqlCreator.equalCondition("code", code);
        sqlCreator.neCondition("id", dictEntryId);
        String sql = sqlCreator.selectData(standardVersion.getDictEntryTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StdDictionaryEntryModel> list = sessionQuery.list();
        List<StdDictionaryEntryModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryEntryModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
@@ -209,15 +210,15 @@ public class StdDictEntryService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return query.list();
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDictEntryInt(Class tClass, String stdVersion, Long dictId, String condition) {
@@ -269,8 +270,7 @@ public class StdDictEntryService extends SQLGeneralDAO {
            sqlCreator.equalCondition("dictId", dictId);
            sqlCreator.equalCondition("code", entryCode);
            String sql = sqlCreator.selectData("std_dictionary_entry_" + version);
            Query query = getQuery(sqlCreator, sql);
            List<StdDictionaryEntryModel> list = query.list();
            List<StdDictionaryEntryModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryEntryModel.class));
            if (list == null || list.size() == 0) {
                return null;
            } else {
@@ -287,8 +287,7 @@ public class StdDictEntryService extends SQLGeneralDAO {
        SqlCreator sqlCreator = new SqlCreator(StdDictionaryEntryModel.class);
        sqlCreator.equalCondition("id", dictEntryId);
        String sql = sqlCreator.selectData(dictEntryTableName);
        Query query = getQuery(sqlCreator, sql);
        return (StdDictionaryEntryModel) query.uniqueResult();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryEntryModel.class)).get(0);
    }
    private void modify(StandardVersion standardVersion, StdDictionaryEntryModel stdDictionaryEntryModel) throws IOException {
@@ -319,14 +318,15 @@ public class StdDictEntryService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getDictEntryTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdDictionaryEntryModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryEntryModel.class));
    }
}//end DictEntryManager

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

@@ -18,6 +18,7 @@ import com.yihu.jw.basic.standard.model.DictItem;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -134,8 +135,7 @@ public class StdDictService extends SQLGeneralDAO {
        sqlCreator.equalCondition("code", code);
        sqlCreator.neCondition("id", dictId);
        String sql = sqlCreator.selectData(standardVersion.getDictTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StdDictionaryModel> list = sessionQuery.list();
        List<StdDictionaryModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
@@ -238,14 +238,15 @@ public class StdDictService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getDictTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdDictionaryModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
    }
    public List<StdDictionaryEntryModel> getDicEntryList(StandardVersion standardVersion, Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
@@ -262,14 +263,15 @@ public class StdDictService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getDictEntryTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdDictionaryEntryModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryEntryModel.class));
    }
    public ListEnvelop getDictionaryList(String stdVersion, String query, String order, Integer rows, Integer page) {
@@ -338,15 +340,15 @@ public class StdDictService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        if (limit != null) {
            query.setMaxResults(limit);
            if (offset != null &&offset>0) {
                query.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return query.list();
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(tClass));
    }
    public Integer getDictInt(Class tClass, String stdVersion, String condition) {
@@ -396,8 +398,7 @@ public class StdDictService extends SQLGeneralDAO {
            SqlCreator sqlCreator = new SqlCreator(StdDictionaryModel.class);
            sqlCreator.equalCondition("code", dictCode);
            String sql = sqlCreator.selectData("std_dictentry_"+version);
            Query query = getQuery(sqlCreator, sql);
            return (StdDictionaryModel)query.uniqueResult();
            return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class)).get(0);
        } catch (Exception e) {
            return null;
        }

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

@@ -111,8 +111,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        sqlCreator.equalCondition("code", code);
        sqlCreator.neCondition("id", metadataId);
        String sql = sqlCreator.selectData(standardVersion.getMetaDataTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        List<StdMetaDataModel> list = sessionQuery.list();
        List<StdMetaDataModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
@@ -145,8 +144,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                SqlCreator sqlCreator = new SqlCreator(StdMetaDataModel.class);
                sqlCreator.equalCondition("id", metadataId);
                String sql = sqlCreator.selectData(metaDataTableName);
                Query query = getQuery(sqlCreator, sql);
                StdMetaDataModel stdMetaDataModel = (StdMetaDataModel) query.uniqueResult();
                StdMetaDataModel stdMetaDataModel = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class)).get(0);
                if (stdMetaDataModel != null) {
                    stdMetaDataModel.checkValue();
                }
@@ -205,14 +203,15 @@ public class StdMetadataService extends SQLGeneralDAO {
        }
        String sql = sqlCreator.selectData(standardVersion.getMetaDataTableName());
        Query sessionQuery = getQuery(sqlCreator, sql);
        if (limit != null) {
            sessionQuery.setMaxResults(limit);
            if (offset != null &&offset>0) {
                sessionQuery.setFirstResult((offset - 1) * limit);
                sql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
            }
        }
        return (List<StdMetaDataModel>) sessionQuery.list();
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
    }
    public PageEnvelop getDetailModelList(String stdVersion, Long dictId, String condition, String order, Integer rows, Integer page) {