From 65b30b7cac0a3fdcb8cec19c73411af0e2858766 Mon Sep 17 00:00:00 2001
From: 离歌笑 <137273278@qq.com>
Date: 星期二, 22 十月 2019 16:46:20 +0800
Subject: [PATCH] Merge branch 'tlhhup'
---
WebService/src/main/java/com/java110/web/smo/cache/impl/ListCachesSMOImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/cache/impl/ListCachesSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/cache/impl/ListCachesSMOImpl.java
index 87c5672..f4d67f7 100644
--- a/WebService/src/main/java/com/java110/web/smo/cache/impl/ListCachesSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/cache/impl/ListCachesSMOImpl.java
@@ -1,17 +1,15 @@
package com.java110.web.smo.cache.impl;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.Assert;
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.web.core.AbstractComponentSMO;
import com.java110.web.smo.cache.IListCachesSMO;
-import com.java110.web.smo.serviceRegister.IListServiceRegistersSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -50,6 +48,8 @@
Map paramMap = BeanConvertUtil.beanCovertMap(result);
paramIn.putAll(paramMap);
+ int page = paramIn.getInteger("page");
+ paramIn.put("page", ( page - 1)* paramIn.getInteger("row"));
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/query.console.caches" + mapToUrlParam(paramIn);
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
@@ -67,6 +67,8 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+
//鏍规嵁ID鏌ヨ缂撳瓨ID
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/query.console.cache" + mapToUrlParam(paramIn);
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
--
Gitblit v1.8.0