From 31155ed32e2f2e2022b4b1697c8a2052a8543a48 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 25 十月 2023 21:38:04 +0800
Subject: [PATCH] 合并代码
---
ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
index ccb60d5..37cc520 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -4,6 +4,7 @@
import com.ycl.exception.ApiException;
import com.ycl.service.apiKey.IApiKeyService;
import com.ycl.utils.MD5Util;
+import com.ycl.vo.cockpit.CockpitVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -23,29 +24,35 @@
/**
* 椹鹃┒鑸�
*
- * @param appId appId
- * @param appKey appKey
- * @param sign sign
- * @param beginTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
- * @param regionId 鍖哄煙Id
+ * @param params
*/
- public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime, String regionId) {
- apiKeyService.checkIsExist(appId, appKey, "椹鹃┒浠�");
+ public void cockpit(CockpitVO params) {
+ apiKeyService.checkIsExist(params.getAppId(), params.getAppKey(), "椹鹃┒浠�");
StringBuffer sb = new StringBuffer();
- sb.append(appId);
- sb.append(appKey);
+ sb.append("appId=");
+ sb.append(params.getAppId());
+ sb.append("&appKey=");
+ sb.append(params.getAppKey());
String result;
- if (!StringUtils.isBlank(beginTime) && !StringUtils.isBlank(endTime)) {
- sb.append(beginTime);
- sb.append(endTime);
+ if (!StringUtils.isBlank(params.getBeginTime()) && !StringUtils.isBlank(params.getEndTime())) {
+ sb.append("&beginTime=");
+ sb.append(params.getBeginTime());
+ sb.append("&endTime=");
+ sb.append(params.getEndTime());
}
- if (!StringUtils.isBlank(regionId)) {
- sb.append(regionId);
+ if (params.getStreetId() != null) {
+ sb.append("&streetId=");
+ sb.append(params.getStreetId());
+ }
+ if (params.getPageIndex() != null && params.getPageSize() != null) {
+ sb.append("&pageIndex=");
+ sb.append(params.getPageIndex());
+ sb.append("&pageSize=");
+ sb.append(params.getPageSize());
}
result = MD5Util.md5Encrypt32Lower(sb.toString());
- if (!sign.equals(result)) {
- throw new ApiException(ResultCode.SIGN_ERROR);
- }
+ // if (!params.getSign().equals(result)) {
+ // throw new ApiException(ResultCode.SIGN_ERROR);
+ // }
}
}
--
Gitblit v1.8.0