查询适配的最新版本

src/main/java/com/yihu/ehr/analyze/controller/PackQcReportEndPoint.java

@@ -44,11 +44,13 @@ public class PackQcReportEndPoint extends EnvelopRestEndPoint {
    @Autowired
    private DqDatasetWarningService dqDatasetWarningService;
    @Autowired
    private ElasticSearchUtil elasticSearchUtil;
    @Autowired
    private HosAdminServiceClient hosAdminServiceClient;
    @Value("${quality.cloud}")
    private String cloud;
    @Value("${quality.orgCode}")
    private String orgCode;
    @Value("${quality.uploadCode}")
    private String uploadCode;
    @Autowired
    private RedisClient redisClient;
@@ -332,7 +334,7 @@ public class PackQcReportEndPoint extends EnvelopRestEndPoint {
    @ApiOperation(value = "上传数据集列表")
    public Envelop adapterDatasetList(
            @ApiParam(name = "version", value = "版本号")
            @RequestParam(value = "version", required = true) String version,
            @RequestParam(value = "version", required = false) String version,
            @ApiParam(name = "filters", value = "过滤")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序")
@@ -346,6 +348,10 @@ public class PackQcReportEndPoint extends EnvelopRestEndPoint {
        }else{
            filters="needCrawer=1;";
        }
        if(StringUtils.isBlank(version)){
            //获取最新的适配版本号
            version = hosAdminServiceClient.getLastAdapterVersion(orgCode,uploadCode);
        }
        ResponseEntity<Collection<AdapterDatasetModel>> res = hosAdminServiceClient.adapterDatasetList(version, null, filters , sorts ,page, size);
        List<AdapterDatasetModel> list = (List<AdapterDatasetModel>)res.getBody();
        int totalCount = getTotalCount(res);
@@ -356,7 +362,7 @@ public class PackQcReportEndPoint extends EnvelopRestEndPoint {
    @ApiOperation(value = "上传数据元列表")
    public Envelop adapterMetadataList(
            @ApiParam(name = "version", value = "版本号")
            @RequestParam(value = "version", required = true) String version,
            @RequestParam(value = "version", required = false) String version,
            @ApiParam(name = "filters", value = "过滤")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序")
@@ -370,6 +376,10 @@ public class PackQcReportEndPoint extends EnvelopRestEndPoint {
        }else{
            filters="needCrawer=1;";
        }
        if(StringUtils.isBlank(version)){
            //获取最新的适配版本号
            version = hosAdminServiceClient.getLastAdapterVersion(orgCode,uploadCode);
        }
        ResponseEntity<Collection<AdapterMetadataModel>> res = hosAdminServiceClient.adapterMetadataList(version, null, filters , sorts ,page, size);
        List<AdapterMetadataModel> list = (List<AdapterMetadataModel>)res.getBody();
        int totalCount = getTotalCount(res);

src/main/java/com/yihu/ehr/analyze/controller/dataQuality/WarningSettingEndPoint.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jxl.Sheet;
import jxl.Workbook;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -517,6 +518,8 @@ public class WarningSettingEndPoint extends EnvelopRestEndPoint {
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "datasetCode", value = "数据集编码", defaultValue = "")
            @RequestParam(value = "datasetCode", required = false) String datasetCode,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "size", value = "分页大小", defaultValue = "15")
@@ -525,7 +528,21 @@ public class WarningSettingEndPoint extends EnvelopRestEndPoint {
            @RequestParam(value = "page", required = false) int page) {
        Envelop envelop = new Envelop();
        try {
            ResponseEntity<List<MStdMetaData>> res = standardServiceClient.searchOrgMetaDatas(fields,filters,sorts,size,page,defaultQualityVersion);
            String lastStandByOrgCode = standardServiceClient.getLastStandByOrgCode(defaultOrgCode);
            if(StringUtils.isNotBlank(datasetCode)){
                //查找datasetId
                String filter = "code="+datasetCode;
                ResponseEntity<List<MStdDataSet>> res = standardServiceClient.searchDataSets(null,filter,null,1,1,lastStandByOrgCode);
                List<MStdDataSet> mStdDataSetList = res.getBody();
                if(CollectionUtils.isNotEmpty(mStdDataSetList)){
                    if(StringUtils.isNotBlank(filters)){
                        filters = "dataSetId="+mStdDataSetList.get(0).getId()+";"+filters;
                    }else{
                        filters = "dataSetId="+mStdDataSetList.get(0).getId();
                    }
                }
            }
            ResponseEntity<List<MStdMetaData>> res = standardServiceClient.searchOrgMetaDatas(fields,filters,sorts,size,page,lastStandByOrgCode);
            List<MStdMetaData> mStdDataSetList = res.getBody();
            int totalCount = getTotalCount(res);
            return getPageResult(mStdDataSetList,totalCount,page,size);
@@ -552,7 +569,8 @@ public class WarningSettingEndPoint extends EnvelopRestEndPoint {
            @RequestParam(value = "page", required = false) int page) {
        Envelop envelop = new Envelop();
        try {
            ResponseEntity<List<MStdDataSet>> res = standardServiceClient.searchDataSets(fields,filters,sorts,size,page,defaultQualityVersion);
            String lastStandByOrgCode = standardServiceClient.getLastStandByOrgCode(defaultOrgCode);
            ResponseEntity<List<MStdDataSet>> res = standardServiceClient.searchDataSets(fields,filters,sorts,size,page,lastStandByOrgCode);
            List<MStdDataSet> mStdDataSetList = res.getBody();
            int totalCount = getTotalCount(res);
            return getPageResult(mStdDataSetList,totalCount,page,size);
@@ -598,7 +616,7 @@ public class WarningSettingEndPoint extends EnvelopRestEndPoint {
    public Envelop getLastStandByOrgCode(@ApiParam(value="机构code,不传则默认为jkzl",defaultValue = "jkzl")
                                        @RequestParam(value = "orgCode",required = false) String orgCode){
        if(StringUtils.isBlank(orgCode)){
            orgCode = "jkzl";
            orgCode = defaultOrgCode;
        }
        String lastStandByOrgCode = standardServiceClient.getLastStandByOrgCode(orgCode);
        Envelop envelop = new Envelop();

src/main/java/com/yihu/ehr/analyze/feign/HosAdminServiceClient.java

@@ -5,10 +5,6 @@ import com.yihu.ehr.analyze.model.AdapterMetadataModel;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.MicroServices;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.model.adaption.MAdapterDataSet;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.hos.model.standard.MStdMetaData;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -77,31 +73,24 @@ public interface HosAdminServiceClient {
    @RequestMapping(value = "/adapterCenter/dataset/pageList", method = RequestMethod.GET)
    ResponseEntity<Collection<AdapterDatasetModel>> adapterDatasetList(
            @ApiParam(name = "version", value = "版本号")
            @RequestParam(value = "version", required = true) String version,
            @ApiParam(name = "fields", value = "字段")
            @RequestParam(value = "fields", required = true) String fields,
            @ApiParam(name = "filters", value = "过滤")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size);
    @RequestMapping(value = "/adapterCenter/metadata/pageList", method = RequestMethod.GET)
    ResponseEntity<Collection<AdapterMetadataModel>> adapterMetadataList(
            @ApiParam(name = "version", value = "版本号")
            @RequestParam(value = "version", required = true) String version,
            @ApiParam(name = "fields", value = "字段")
            @RequestParam(value = "fields", required = true) String fields,
            @ApiParam(name = "filters", value = "过滤")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size);
    @RequestMapping(value="/last/adapterVersion" ,method = RequestMethod.GET)
    String getLastAdapterVersion(
            @RequestParam(value = "originOrgCode") String originOrgCode,
            @RequestParam(value = "targetOrgCode") String targetOrgCode);
}

src/main/resources/application.yml

@@ -52,6 +52,7 @@ analyze:
quality:
  orgCode : jkzl #默认机构
  uploadCode: SH_ORG #上传到某家机构
  version: 59083976eebd #默认版本号
  cloud: medicalCloud #默认云平台code
  cloudName: 上饶医疗云 #默认云平台name