分页错误

src/main/java/com/yihu/hos/standard/controller/AdapterCenterEndPoint.java

@@ -11,9 +11,12 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JsonConfig;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -43,8 +46,10 @@ public class AdapterCenterEndPoint extends BaseController {
    private AdapterDictService adapterDictService;
    @Autowired
    private AdapterDictEntryService adapterDictEntryService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @RequestMapping(value="/schema/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value="/schema/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取版本号列表",  produces = "application/json", notes = "获取版本号列表")
    public String getSchema(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                              @RequestParam(value = "filters", required = false) String filters) throws ParseException {
@@ -54,7 +59,7 @@ public class AdapterCenterEndPoint extends BaseController {
    }
    @RequestMapping(value="/version/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value="/version/list", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取版本号列表",  produces = "application/json", notes = "获取版本号列表")
    public String getVersions(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                              @RequestParam(value = "filters", required = false) String filters) throws ParseException {
@@ -65,7 +70,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return json.toString();
    }
    @RequestMapping(value="/dataset/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value="/dataset/list", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取适配数据集列表",  produces = "application/json", notes = "获取适配数据集列表")
    public String getDatasetList(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                             @RequestParam(value = "filters", required = false) String filters,
@@ -76,7 +81,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return json.toString();
    }
    @RequestMapping(value = "/metadata/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = "/metadata/list", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取适配数据元列表",  produces = "application/json", notes = "获取适配数据元列表")
    public String getMetadataList(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                          @RequestParam(value = "filters", required = false) String filters,
@@ -87,7 +92,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return json.toString();
    }
    @RequestMapping(value = "/dict/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = "/dict/list", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取标准字典列表",  produces = "application/json", notes = "获取标准字典列表")
    public String getDictList(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                  @RequestParam(value = "filters", required = false) String filters,
@@ -98,7 +103,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return json.toString();
    }
    @RequestMapping(value = "/dictItem/list",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value = "/dictItem/list", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "获取标准字典项列表",  produces = "application/json", notes = "获取标准字典项列表")
    public String getDictItemList(@ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
                                  @RequestParam(value = "filters", required = false) String filters,
@@ -109,7 +114,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return json.toString();
    }
    @RequestMapping(value="/dataset/pageList",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value="/dataset/pageList", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "分页获取适配数据集列表",  produces = "application/json", notes = "分页获取适配数据集列表")
    public Collection<AdapterDatasetModel> datasetPageList(
            @ApiParam(name = "version", value = "版本", defaultValue = "")
@@ -133,7 +138,7 @@ public class AdapterCenterEndPoint extends BaseController {
        return convertToModels(ls, new ArrayList<>(ls.size()), AdapterDatasetModel.class, fields);
    }
    @RequestMapping(value="/metadata/pageList",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value="/metadata/pageList", method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "分页获取适配数据元列表",  produces = "application/json", notes = "分页获取适配数据元列表")
    public Collection<AdapterMetadataModel> metadataPageList(
            @ApiParam(name = "version", value = "版本", defaultValue = "")
@@ -158,5 +163,29 @@ public class AdapterCenterEndPoint extends BaseController {
    }
    @RequestMapping(value="/last/adapterVersion" ,method = RequestMethod.GET)
    @ApiOperation(value = "获取2家机构适配的最新版本号",  notes = "获取2家机构适配的最新版本号")
    public String getLastAdapterVersion(
                            @ApiParam(name = "originOrgCode", value = "源机构编码[eip的机构表]如,jkzl", defaultValue = "")
                            @RequestParam(value = "originOrgCode") String originOrgCode,
                            @ApiParam(name = "targetOrgCode", value = "目标机构编码[eip的机构表],如上传 江西省平台的机构编码", defaultValue = "")
                            @RequestParam(value = "targetOrgCode") String targetOrgCode){
        String sql = String.format("select id from adapter_scheme where adapter_publisher_org_code='%s' and std_publisher_org_code='%s'",originOrgCode,targetOrgCode);
        List<Long> idList = jdbcTemplate.queryForList(sql,Long.class);
        String version = "";
        if(CollectionUtils.isNotEmpty(idList)){
            String ids = "";
            for(Long id:idList){
                ids+=","+id;
            }
            ids = ids.substring(1,ids.length());
            List<String> versions = jdbcTemplate.queryForList("select version from adapter_scheme_version where scheme_id in ("+ids+") and publish_status=1 order by publish_time desc",String.class);
            if(CollectionUtils.isNotEmpty(versions)){
                version = versions.get(0);
            }
        }
        return version;
    }
}

src/main/java/com/yihu/hos/standard/controller/StdCenterEndPoint.java

@@ -153,6 +153,8 @@ public class StdCenterEndPoint extends BaseController {
                                   @RequestParam(value = "page", required = false) Integer page) throws IOException {
        List result = new ArrayList();
        String ver = standardService.getLastStandByOrgCode(defaultOrgCode);
        int total = 0;
        String condition = "";
        if(StringUtils.isNotBlank(ver)){
            List<StdDictionaryModel> list = stdDictService.searchPage(StdDictionaryModel.class, StandardVersion.DictTable,ver, "code="+code, null, null, null,true);
            if(CollectionUtils.isNotEmpty(list)){
@@ -162,19 +164,22 @@ public class StdCenterEndPoint extends BaseController {
                }
                ids = ids.substring(1,ids.length());
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, page, size,true);
                    condition = "dictId="+ids;
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                    condition = "dictId="+ids+";"+filters;
                }
                result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, condition, null, page, size,true);
            }
        }
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        if(size!=null && page!=null && size!=0){
            total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, StandardVersion.DictEntryTable,ver, condition, null, null, null,true).size();
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(result.size() % size > 0 ? result.size() / size + 1 : result.size() / size);
            envelop.setTotalPage(total % size > 0 ? total / size + 1 : total / size);
        }
        envelop.setTotalCount(result.size());
        return envelop;
@@ -188,6 +193,8 @@ public class StdCenterEndPoint extends BaseController {
                                @RequestParam(value = "page", required = false) Integer page) throws IOException {
        List result = new ArrayList();
        String ver = standardService.getLastStandByOrgCode(defaultOrgCode);
        int total = 0;
        String condition = "";
        if(StringUtils.isNotBlank(ver)){
            List<StdDictionaryModel> list = stdDictService.searchPage(StdDictionaryModel.class, StandardVersion.DictTable,ver, "code=STD_MEDICINE,CV08.50.301", null, null, null,true);
            if(CollectionUtils.isNotEmpty(list)){
@@ -199,19 +206,23 @@ public class StdCenterEndPoint extends BaseController {
                List<String> fileds = new ArrayList<>();
                fileds.add("value");
                if(StringUtils.isBlank(filters)){
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids, null, page, size,true);
                    condition = "dictId="+ids;
                }else{
                    result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, "dictId="+ids+";"+filters, null, page, size,true);
                    condition = "dictId="+ids+";"+filters;
                }
                result = stdDictEntryService.searchPage(StdDictionaryEntryModel.class,fileds, StandardVersion.DictEntryTable,ver, condition, null, page, size,true);
            }
        }
        Envelop envelop = new Envelop();
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(result);
        if(size!=null && page!=null && size!=0){
            List<String> fileds = new ArrayList<>();
            fileds.add("value");
            total = stdDictEntryService.searchPage(StdDictionaryEntryModel.class, fileds, StandardVersion.DictEntryTable, ver, condition, null, null, null, true).size();
            envelop.setCurrPage(page);
            envelop.setPageSize(size);
            envelop.setTotalPage(result.size() % size > 0 ? result.size() / size + 1 : result.size() / size);
            envelop.setTotalPage(total % size > 0 ? total / size + 1 : total / size);
        }
        envelop.setTotalCount(result.size());
        return envelop;