From ff16d1213d5e43b21d3f72551c83dd007bec2261 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 十月 2023 15:41:28 +0800
Subject: [PATCH] 修改Rest帮助类
---
src/main/java/com/smartearth/poiexcel/service/EntService.java | 106 +++++++++++++++-------------------------------------
1 files changed, 31 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/smartearth/poiexcel/service/EntService.java b/src/main/java/com/smartearth/poiexcel/service/EntService.java
index 24b5270..8674363 100644
--- a/src/main/java/com/smartearth/poiexcel/service/EntService.java
+++ b/src/main/java/com/smartearth/poiexcel/service/EntService.java
@@ -1,9 +1,7 @@
package com.smartearth.poiexcel.service;
-import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.smartearth.poiexcel.entity.*;
-import com.smartearth.poiexcel.mapper.BasicMapper;
import com.smartearth.poiexcel.mapper.EntMapper;
import com.smartearth.poiexcel.utils.RestHelper;
import org.apache.commons.logging.Log;
@@ -11,13 +9,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 浼佷笟鏈嶅姟绫�
@@ -25,6 +21,7 @@
* @date 2023-10-05
*/
@Service
+@SuppressWarnings("ALL")
public class EntService {
@Resource
EntMapper entMapper;
@@ -40,27 +37,43 @@
private final static Log log = LogFactory.getLog(EntService.class);
- private final static String generateToken = "%s/yqfwg/app/generateToken";
+ private final static String GENERATE_TOKEN = "%s/yqfwg/app/generateToken";
- private final static String getEntBaseInfo = "%s/yqfwg/api/project/getEntBaseInfoForOtherSysListPage?ctoken=%s&showCount=%d¤tPage=%d";
+ private final static String GET_ENT_BASE_INFO = "%s/yqfwg/api/project/getEntBaseInfoForOtherSysListPage?ctoken=%s&showCount=%d¤tPage=%d";
/**
* 鑾峰彇浠ょ墝
*/
public String selectToken() {
try {
- String url = String.format(generateToken, host);
+ String url = String.format(GENERATE_TOKEN, host);
- Map<String, Object> map = new HashMap<>(2);
- map.put("userName", user);
- map.put("passWord", pwd);
+ //Map<String, String> map = new HashMap<>(2);
+ //map.put("userName", user);
+ //map.put("passWord", pwd);
- Result rs = postForRest(url, map, Result.class);
+ //String map = "userName=shikong001&passWord=123!@#qwe";
+
+ // 璇锋眰澶翠俊鎭�
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.valueOf("application/x-www-form-urlencoded"));
+
+ //璁剧疆涓鸿〃鍗曟彁浜わ紝鎸夐渶姹傚姞
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ // 缁勮璇锋眰淇℃伅
+ MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
+ map.add("userName", user);
+ map.add("passWord", pwd);
+ HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<MultiValueMap<String, String>>(map, headers);
+
+ // String str = RestHelper.postForRest(url, map)
+ Result rs = RestHelper.postForRest(url, map, Result.class);
if (null == rs || StaticData.I200 != rs.getCode()) {
return null;
}
- TokenResult tr = JSONObject.parseObject(rs.getData(), TokenResult.class);
+ // TokenResult tr = JSONObject.parseObject(rs.getData().toJSONString(), TokenResult.class)
+ TokenResult tr = rs.getData().toJavaObject(TokenResult.class);
return tr.getCtoken();
} catch (Exception ex) {
@@ -74,7 +87,7 @@
*/
public List<EntEntity> selectEnts(String token, String startDate, String endDate, String qylabel, Integer showCount, Integer currentPage) {
try {
- String url = String.format(getEntBaseInfo, host, token, showCount, currentPage);
+ String url = String.format(GET_ENT_BASE_INFO, host, token, showCount, currentPage);
if (null != startDate) {
url += "&buildDate_startdate=" + startDate;
}
@@ -85,12 +98,13 @@
url += "&qylabel=" + qylabel;
}
- Result rs = getForRest(url, Result.class);
+ Result rs = RestHelper.getForRest(url, Result.class);
if (null == rs || StaticData.I200 != rs.getCode()) {
return null;
}
- EntResult er = JSONObject.parseObject(rs.getData(), EntResult.class);
+ // EntResult er = JSONObject.parseObject(rs.getData().toJSONString(), EntResult.class)
+ EntResult er = rs.getData().toJavaObject(EntResult.class);
return er.getPd().getList();
} catch (Exception ex) {
@@ -119,63 +133,5 @@
log.error(ex.getMessage(), ex);
return 0;
}
- }
-
- /**
- * get璇锋眰锛圧est锛�
- */
- public <T> T getForRest(String url, Class<T> clazz) {
- RestTemplate rest = RestHelper.getRestTemplate();
-
- return rest.getForObject(url, clazz);
- }
-
- /**
- * post璇锋眰锛圧est锛�
- */
- public <T> T postForRest(String url, Map<String, Object> map, Class<T> clazz) {
- RestTemplate rest = RestHelper.getRestTemplate();
-
- return rest.postForObject(url, map, clazz);
- }
-
- /**
- * delete璇锋眰锛圧est锛�
- */
- public <T> T deleteForRest(String url, Map<String, T> map, Class<T> clazz) {
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
-
- HttpEntity<?> entity = new HttpEntity<>(map, headers);
-
- RestTemplate rest = RestHelper.getRestTemplate();
- ResponseEntity<T> rs = rest.exchange(url, HttpMethod.DELETE, entity, clazz);
-
- return rs.getBody();
- }
-
- /**
- * 鑾峰彇Map鏁版嵁
- */
- public <T> Map<String, Object> getMapData(T t) {
- Map<String, Object> map = new HashMap<>(1);
-
- Field[] fields = t.getClass().getDeclaredFields();
- for (Field field : fields) {
- try {
- if ("serialVersionUID".equals(field.getName())) {
- continue;
- }
-
- field.setAccessible(true);
- Object obj = field.get(t);
-
- map.put(field.getName(), obj);
- } catch (Exception ex) {
- //
- }
- }
-
- return map;
}
}
--
Gitblit v1.9.3