代码修改

svr/svr-basic/pom.xml

@@ -63,6 +63,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-activemq</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>

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

@@ -37,7 +37,7 @@ public class SchemeController extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取适配方案", produces = "application/json", notes = "获取适配方案")
    public ObjEnvelop get(
            @ApiParam(name = "schemeId", value = "标准版本ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
            @RequestParam(value = "schemeId") Long schemeId) {
        return adapterSchemeService.get(schemeId);
    }
@@ -64,7 +64,7 @@ public class SchemeController extends EnvelopRestEndpoint {
    @ApiOperation(value = "删除适配方案",  produces = "application/json", notes = "删除适配方案")
    public Envelop delete(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
            @RequestParam(value = "schemeId") Long schemeId) {
        return adapterSchemeService.delete(schemeId);
    }
}

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

@@ -86,6 +86,6 @@ public class StandardController extends EnvelopRestEndpoint {
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return standardService.getDictionaryResult( order, rows, page);
        return standardService.getDictionaryResult(condition, order, rows, page);
    }
}

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

@@ -40,6 +40,9 @@ public class AdapterSchemeModel extends Result implements Serializable {
    @Column(name="std_version")
    private String stdVersion;
    @Column(name="std_publisher_org_code")
    private String stdPublisherOrgCode;
    @Column(name="adapter_std_id")
    private Long adapterStdId;
@@ -136,4 +139,12 @@ public class AdapterSchemeModel extends Result implements Serializable {
    public void setAdapterPublisherOrgCode(String adapterPublisherOrgCode) {
        this.adapterPublisherOrgCode = adapterPublisherOrgCode;
    }
    public String getStdPublisherOrgCode() {
        return stdPublisherOrgCode;
    }
    public void setStdPublisherOrgCode(String stdPublisherOrgCode) {
        this.stdPublisherOrgCode = stdPublisherOrgCode;
    }
}

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

@@ -71,7 +71,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        return false;
    }
    public Envelop delete(Integer schemeId) {
    public Envelop delete(Long schemeId) {
        Boolean existFlg = false;
        try {
            AdapterSchemeModel model = getEntity(AdapterSchemeModel.class, schemeId);
@@ -121,7 +121,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        }
    }
    public ObjEnvelop get(Integer schemeId) {
    public ObjEnvelop get(Long schemeId) {
        try {
            AdapterSchemeModel model = getEntity(AdapterSchemeModel.class, schemeId);
            return ObjEnvelop.getSuccess("获取适配成功",model);
@@ -256,7 +256,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    }
    public boolean existSchemeVersionValid(Integer schemeId) {
    public boolean existSchemeVersionValid(Long schemeId) {
        String hql = "FROM AdapterSchemeVersionModel WHERE schemeId = :schemeId";
        Query query = getCurrentSession().createQuery(hql);
        query.setParameter("schemeId", schemeId);

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

@@ -40,10 +40,10 @@ public class StandardService extends SQLGeneralDAO {
    public static final String BEAN_ID = "StandardService";
    public ListEnvelop getDictionaryResult(String order, Integer limit, Integer offset) {
    public ListEnvelop getDictionaryResult(String condition,String order, Integer limit, Integer offset) {
        try {
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            List<StandardModel> standardModelList = getList(null, order, limit, offset);
            List<StandardModel> standardModelList = getList(condition, order, limit, offset);
            for (StandardModel standardModel : standardModelList) {
                DictItem items = new DictItem();
                Long id = standardModel.getId();

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

@@ -64,7 +64,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                DictItem items = new DictItem();
                String id = standardVersionModel.getVersion();
                String name = standardVersionModel.getVersionName();
                items.setCode(id.toString());
                items.setCode(id);
                items.setValue(name);
                detailModelList.add(items);
            }
@@ -87,7 +87,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                DictItem items = new DictItem();
                String  id = standardVersionModel.getVersion();
                String name = standardVersionModel.getVersionName();
                items.setCode(id.toString());
                items.setCode(id);
                items.setValue(name);
                detailModelList.add(items);
            }
@@ -135,10 +135,7 @@ public class StandardVersionService extends SQLGeneralDAO {
            Map<String, String> order = new HashMap<>();
            query.put("versionName", versionName);
            List<StandardVersionModel> list = getList(standardId, query, order, 1, 0);
            if (!CollectionUtils.isEmpty(list)) {
                return true;
            }
            return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean versionNameValidate(Long standardId, Integer versionId, String versionName) throws Exception {
@@ -156,8 +153,8 @@ public class StandardVersionService extends SQLGeneralDAO {
    @Transactional
    public Envelop delete(Long versionId, String version) throws Exception {
        Boolean existFlg = false;
        Boolean useredFlg = false;
        boolean existFlg = false;
        boolean useredFlg = false;
        try {
            ObjEnvelop objEnvelop = get(versionId);
            StandardVersionModel versionModel = (StandardVersionModel) objEnvelop.getObj();
@@ -284,7 +281,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    private StandardVersionModel myGet(Long versionId) {
        try {
            return (StandardVersionModel) getEntity(StandardVersionModel.class, versionId);
            return getEntity(StandardVersionModel.class, versionId);
        } catch (Exception e) {
            e.printStackTrace();
            return null;

svr/svr-statistics-es/pom.xml

@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>wlyy-parent-pom</artifactId>
        <version>2.0.0</version>
        <version>2.4.0</version>
        <relativePath>../../wlyy-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
@@ -27,9 +27,6 @@
        <version.commons-io>2.4</version.commons-io>
        <version.commons-lang3>3.2.1</version.commons-lang3>
        <version.commons-pool2>2.4.2</version.commons-pool2>
        <version.hibernate>5.0.12.Final</version.hibernate>
        <version.hibernate-annotations>4.0.5.Final</version.hibernate-annotations>
        <version.hibernate-jpa-api>1.0.0.Final</version.hibernate-jpa-api>
        <version.http-client>4.5.3</version.http-client>
        <version.http-core>4.4.8</version.http-core>
        <version.java>1.8</version.java>
@@ -40,8 +37,6 @@
        <version.joda-time>2.8.2</version.joda-time>
        <version.junit>4.12</version.junit>
        <version.logback>1.2.3</version.logback>
        <version.mysql>8.0.23</version.mysql>
        <version.quartz>2.2.3</version.quartz>
        <version.servlet-api>3.1.0</version.servlet-api>
        <version.slf4j>1.7.21</version.slf4j>
        <version.tomcat-embed>8.0.28</version.tomcat-embed>
@@ -53,7 +48,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <!--Jackson library-->
        <dependency>