diff --git a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java index 5774c2b..7ccd8b4 100644 --- a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java +++ b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java @@ -9,20 +9,20 @@ */ ZZLLBC("", ""); - private String url; + private String cls; private String name; - DataInvokeEnum(String url, String name) { - this.url = url; + DataInvokeEnum(String cls, String name) { + this.cls = cls; this.name = name; } - public String getUrl() { - return url; + public String getCls() { + return cls; } - public void setUrl(String url) { - this.url = url; + public void setCls(String cls) { + this.cls = cls; } public String getName() { diff --git a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java index 5774c2b..7ccd8b4 100644 --- a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java +++ b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java @@ -9,20 +9,20 @@ */ ZZLLBC("", ""); - private String url; + private String cls; private String name; - DataInvokeEnum(String url, String name) { - this.url = url; + DataInvokeEnum(String cls, String name) { + this.cls = cls; this.name = name; } - public String getUrl() { - return url; + public String getCls() { + return cls; } - public void setUrl(String url) { - this.url = url; + public void setCls(String cls) { + this.cls = cls; } public String getName() { diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java index 4741b5c..88c7037 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java @@ -13,5 +13,13 @@ /** * 调用名称 */ - public static final String INVOKE_NAME= "casicInvokeName"; + public static final String INVOKE_NAME = "casicInvokeName"; + /** + * 分页参数 + */ + public static final String INVOKE_PAGE_NO = "casicPageNo"; + /** + * 分页size + */ + public static final String INVOKE_PAGE_SIZE = "casicPageSize"; } diff --git a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java index 5774c2b..7ccd8b4 100644 --- a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java +++ b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java @@ -9,20 +9,20 @@ */ ZZLLBC("", ""); - private String url; + private String cls; private String name; - DataInvokeEnum(String url, String name) { - this.url = url; + DataInvokeEnum(String cls, String name) { + this.cls = cls; this.name = name; } - public String getUrl() { - return url; + public String getCls() { + return cls; } - public void setUrl(String url) { - this.url = url; + public void setCls(String cls) { + this.cls = cls; } public String getName() { diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java index 4741b5c..88c7037 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java @@ -13,5 +13,13 @@ /** * 调用名称 */ - public static final String INVOKE_NAME= "casicInvokeName"; + public static final String INVOKE_NAME = "casicInvokeName"; + /** + * 分页参数 + */ + public static final String INVOKE_PAGE_NO = "casicPageNo"; + /** + * 分页size + */ + public static final String INVOKE_PAGE_SIZE = "casicPageSize"; } diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java index 4e6ecf9..535ceb4 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java @@ -21,4 +21,17 @@ * @return 调用结果返回 */ List queryDataList(DataInvokeEnum dataEnum, Map params, Class cls); + + /** + * 前置查询分页调用 + * + * @param dataEnum 主题调用枚举 + * @param params 请求参数 + * @param cls 处理结果泛型 + * @param pageNo 起始页 + * @param pageSize 分页大小 + * @param + * @return 调用结果返回 + */ + List queryDataListPage(DataInvokeEnum dataEnum, Map params, Class cls, String pageNo, String pageSize); } diff --git a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java index 5774c2b..7ccd8b4 100644 --- a/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java +++ b/casic-domain-cetc28/src/main/java/com/casic/missiles/modular/system/enums/DataInvokeEnum.java @@ -9,20 +9,20 @@ */ ZZLLBC("", ""); - private String url; + private String cls; private String name; - DataInvokeEnum(String url, String name) { - this.url = url; + DataInvokeEnum(String cls, String name) { + this.cls = cls; this.name = name; } - public String getUrl() { - return url; + public String getCls() { + return cls; } - public void setUrl(String url) { - this.url = url; + public void setCls(String cls) { + this.cls = cls; } public String getName() { diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java index 4741b5c..88c7037 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/constants/LsConstants.java @@ -13,5 +13,13 @@ /** * 调用名称 */ - public static final String INVOKE_NAME= "casicInvokeName"; + public static final String INVOKE_NAME = "casicInvokeName"; + /** + * 分页参数 + */ + public static final String INVOKE_PAGE_NO = "casicPageNo"; + /** + * 分页size + */ + public static final String INVOKE_PAGE_SIZE = "casicPageSize"; } diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java index 4e6ecf9..535ceb4 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/IDataInvokeService.java @@ -21,4 +21,17 @@ * @return 调用结果返回 */ List queryDataList(DataInvokeEnum dataEnum, Map params, Class cls); + + /** + * 前置查询分页调用 + * + * @param dataEnum 主题调用枚举 + * @param params 请求参数 + * @param cls 处理结果泛型 + * @param pageNo 起始页 + * @param pageSize 分页大小 + * @param + * @return 调用结果返回 + */ + List queryDataListPage(DataInvokeEnum dataEnum, Map params, Class cls, String pageNo, String pageSize); } diff --git a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/impl/DataInvokeServiceImpl.java b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/impl/DataInvokeServiceImpl.java index f3a0545..d388fd7 100644 --- a/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/impl/DataInvokeServiceImpl.java +++ b/casic-invoke/src/main/java/com/casic/missiles/modular/system/service/impl/DataInvokeServiceImpl.java @@ -22,9 +22,21 @@ public class DataInvokeServiceImpl implements IDataInvokeService { @Override public List queryDataList(DataInvokeEnum dataEnum, Map params, Class cls) { - String json = HttpUtils.sendPost(dataEnum.getUrl(), params, null, new DefaultHttpHeaderHandler()); params.put(LsConstants.INVOKE_CLS, cls.getName()); params.put(LsConstants.INVOKE_NAME, dataEnum.getName()); + String json = HttpUtils.sendPost(dataEnum.getUrl(), params, null, new DefaultHttpHeaderHandler()); + ResDTO resDTO = JSON.parseObject(json, new TypeReference>() { + }); + return resDTO.getData(); + } + + @Override + public List queryDataListPage(DataInvokeEnum dataEnum, Map params, Class cls, String pageNo, String pageSize) { + params.put(LsConstants.INVOKE_PAGE_NO, pageNo); + params.put(LsConstants.INVOKE_PAGE_SIZE, pageSize); + params.put(LsConstants.INVOKE_CLS, cls.getName()); + params.put(LsConstants.INVOKE_NAME, dataEnum.getName()); + String json = HttpUtils.sendPost(dataEnum.getUrl(), params, null, new DefaultHttpHeaderHandler()); ResDTO resDTO = JSON.parseObject(json, new TypeReference>() { }); return resDTO.getData();