代码修改

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

@@ -43,7 +43,7 @@ public class StandardController extends EnvelopRestEndpoint {
    @ApiOperation(value = "根据标准ID获取集成标准信息",  produces = "application/json", notes = "获取标准")
    public ObjEnvelop getForStandardId(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId){
            @RequestParam(value = "standardId") Long standardId){
        return standardService.get(standardId);
    }
@@ -70,7 +70,7 @@ public class StandardController extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除标准",  produces = "application/json", notes = "删除标准")
    public Envelop delete(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId) {
            @RequestParam(value = "standardId") Long standardId) {
        return standardService.delete(standardId);
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.basic.standard.model.standard;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.LongIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +16,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "std_version")
public class StandardVersionModel extends IntegerIdentityEntity implements Serializable {
public class StandardVersionModel extends LongIdentityEntity implements Serializable {
    private String version;

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

@@ -56,7 +56,7 @@ public class StdDataSetModel implements Serializable {
    private Integer hashCode;
    @Column(name="std_id")
    private Integer standardId;
    private Long standardId;
    @Transient
    private String innerVersionId;
@@ -186,11 +186,11 @@ public class StdDataSetModel implements Serializable {
        this.innerVersionId = innerVersionId;
    }
    public Integer getStandardId() {
    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/standard/StandardService.java

@@ -112,7 +112,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    @Transactional
    public Envelop delete(Integer standardId) {
    public Envelop delete(Long standardId) {
        Boolean publishedFlg = false;
        Boolean existFlg = false;
        try {
@@ -189,7 +189,7 @@ public class StandardService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop get(Integer standardId) {
    public ObjEnvelop get(Long standardId) {
        try {
            StandardModel standardModel = getEntity(StandardModel.class, standardId);
            return ObjEnvelop.getSuccess("获取标准成功",standardModel);
@@ -371,7 +371,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    //TODO:TEST
    public StandardModel fork(Integer standardId) {
    public StandardModel fork(Long standardId) {
        try {
            ObjEnvelop objEnvelop = get(standardId);
            StandardModel baseStandard = (StandardModel) objEnvelop.getObj();

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

@@ -138,7 +138,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean versionNameValidate(Long standardId, Integer versionId, String versionName) throws Exception {
    public Boolean versionNameValidate(Long standardId, Long 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);
@@ -422,7 +422,7 @@ public class StandardVersionService extends SQLGeneralDAO {
            stdeDataset.setSummary(getNotNull(l.get(3)[1]));
            stdeDataset.setLanguage(getNotNull(l.get(4)[1]));
            stdeDataset.setClassModel(getNotNull(l.get(5)[1]));
            stdeDataset.setStandardId(standardId.intValue());
            stdeDataset.setStandardId(standardId);
            stdeDataset.setCatalog(0);
//            if(org.apache.commons.lang3.StringUtils.isNotBlank(getNotNull(l.get(2)[1]))){
//                stdeDataset.setCatalog(Integer.valueOf(getNotNull(l.get(2)[1])));

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

@@ -50,7 +50,7 @@ public class StdDatasetService extends SQLGeneralDAO {
    public StdDatasetService() {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
        super.finalize();
    }
@@ -95,10 +95,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdDataSetModel> list = this.getList(standardVersion, query, order, 1, 1);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Integer datasetId) {
@@ -123,10 +120,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", datasetId);
        String sql = sqlCreator.selectData(standardVersion.getDataSetTableName());
        List<StdDataSetModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDataSetModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String dataset) {
@@ -438,7 +432,7 @@ public class StdDatasetService extends SQLGeneralDAO {
                //插入数据集信息
                stdDataSetModel.setCode(dataSetCode);//code唯一
                stdDataSetModel.setName(dataSetNname);
                stdDataSetModel.setStandardId(2);
                stdDataSetModel.setStandardId(2L);
                //获取数据元信息
                Set<String> set = new HashSet<String>();