|
|
@@ -2,6 +2,11 @@ package com.template.controller;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
+import com.fasterxml.jackson.core.type.TypeReference;
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
+import com.google.common.reflect.TypeToken;
|
|
|
+import com.google.gson.Gson;
|
|
|
import com.template.annotation.PassToken;
|
|
|
import com.template.api.WelcomePayControllerAPI;
|
|
|
import com.template.api.WelcomeVisitorControllerAPI;
|
|
|
@@ -12,8 +17,10 @@ import com.template.model.query.WelcomeVisitorQuery;
|
|
|
import com.template.model.request.WelcomeVisitorRequest;
|
|
|
import com.template.model.result.CommonResult;
|
|
|
import com.template.model.result.PageUtils;
|
|
|
+import com.template.model.vo.JsonPayVo;
|
|
|
import com.template.model.vo.WelcomeVisitorVO;
|
|
|
import com.template.services.WelcomeVisitorService;
|
|
|
+import com.tencentcloudapi.tci.v20190318.models.Person;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
@@ -38,11 +45,10 @@ public class WelcomePayController implements WelcomePayControllerAPI {
|
|
|
String sds = querySign(timeStr);
|
|
|
|
|
|
Map<String, String> tokenParams = new HashMap<>();
|
|
|
- tokenParams.put("sign", sds);
|
|
|
- tokenParams.put("timestamp", timeStr);
|
|
|
|
|
|
+ String queryStr = "?token="+sds+"×tamp="+timeStr;
|
|
|
// wecode换取token
|
|
|
- String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataAll", tokenParams);
|
|
|
+ String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataAll"+queryStr, tokenParams);
|
|
|
|
|
|
return CommonResult.ok(respon);
|
|
|
}
|
|
|
@@ -50,22 +56,19 @@ public class WelcomePayController implements WelcomePayControllerAPI {
|
|
|
//根据学校及收费区间获取欠费
|
|
|
@Override
|
|
|
@PassToken
|
|
|
- public CommonResult getDataOne(String cardNo,String year) {
|
|
|
+ public CommonResult getDataOne(String cardNo,String year) throws JsonProcessingException {
|
|
|
String timeStr = String.valueOf(System.currentTimeMillis());
|
|
|
String token = querySign(timeStr);
|
|
|
|
|
|
Map<String, String> tokenParams = new HashMap<>();
|
|
|
-// tokenParams.put("sign", token);
|
|
|
-// tokenParams.put("timestamp", timeStr);
|
|
|
-// tokenParams.put("xh", cardNo);
|
|
|
-// tokenParams.put("sfqjdm", year);
|
|
|
|
|
|
- String queryStr = "?token="+token+"=×tamp="+timeStr+"&sfqjdm="+year+"&xh="+cardNo;
|
|
|
+ String queryStr = "?token="+token+"×tamp="+timeStr+"&sfqjdm="+year+"&xh="+cardNo;
|
|
|
|
|
|
// wecode换取token
|
|
|
String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataOne"+queryStr, tokenParams);
|
|
|
-
|
|
|
- return CommonResult.ok(respon);
|
|
|
+ Gson gson = new Gson();
|
|
|
+ List<JsonPayVo> travelers = gson.fromJson(respon, new TypeToken<List<JsonPayVo>>(){}.getType());
|
|
|
+ return CommonResult.ok(travelers);
|
|
|
}
|
|
|
|
|
|
//根据学号、入学年度和收费区间获取欠费
|
|
|
@@ -76,16 +79,18 @@ public class WelcomePayController implements WelcomePayControllerAPI {
|
|
|
String sds = querySign(timeStr);
|
|
|
|
|
|
Map<String, String> tokenParams = new HashMap<>();
|
|
|
- tokenParams.put("sign", sds);
|
|
|
- tokenParams.put("timestamp", timeStr);
|
|
|
- tokenParams.put("xh", cardNo);
|
|
|
- tokenParams.put("sfqjdm", year);
|
|
|
- tokenParams.put("rxnd", year);
|
|
|
+// tokenParams.put("sign", sds);
|
|
|
+// tokenParams.put("timestamp", timeStr);
|
|
|
+// tokenParams.put("xh", cardNo);
|
|
|
+// tokenParams.put("sfqjdm", year);
|
|
|
+// tokenParams.put("rxnd", year);
|
|
|
|
|
|
+ String queryStr = "?token="+sds+"×tamp="+timeStr+"&sfqjdm="+year+"&xh="+cardNo+"&rxnd="+year;
|
|
|
// wecode换取token
|
|
|
- String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataTwo", tokenParams);
|
|
|
-
|
|
|
- return CommonResult.ok(respon);
|
|
|
+ String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataTwo"+queryStr, tokenParams);
|
|
|
+ Gson gson = new Gson();
|
|
|
+ List<JsonPayVo> travelers = gson.fromJson(respon, new TypeToken<List<JsonPayVo>>(){}.getType());
|
|
|
+ return CommonResult.ok(travelers);
|
|
|
}
|
|
|
|
|
|
//根据入学年度及收费区间获取欠费
|
|
|
@@ -96,18 +101,37 @@ public class WelcomePayController implements WelcomePayControllerAPI {
|
|
|
String sds = querySign(timeStr);
|
|
|
|
|
|
Map<String, String> tokenParams = new HashMap<>();
|
|
|
- tokenParams.put("sign", sds);
|
|
|
- tokenParams.put("timestamp", timeStr);
|
|
|
- tokenParams.put("sfqjdm", year);
|
|
|
- tokenParams.put("rxnd", year);
|
|
|
-
|
|
|
+// tokenParams.put("sign", sds);
|
|
|
+// tokenParams.put("timestamp", timeStr);
|
|
|
+// tokenParams.put("sfqjdm", year);
|
|
|
+// tokenParams.put("rxnd", year);
|
|
|
+ String queryStr = "?token="+sds+"×tamp="+timeStr+"&sfqjdm="+year+"&rxnd="+year;
|
|
|
// wecode换取token
|
|
|
- String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataThree", tokenParams);
|
|
|
+ String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataThree"+queryStr, tokenParams);
|
|
|
|
|
|
return CommonResult.ok(respon);
|
|
|
}
|
|
|
|
|
|
- private String querySign(String timestr){
|
|
|
+ public static List<JsonPayVo> queryStudentPayInfo(String cardNo,String year) {
|
|
|
+ String timeStr = String.valueOf(System.currentTimeMillis());
|
|
|
+ String sds = querySign(timeStr);
|
|
|
+
|
|
|
+ Map<String, String> tokenParams = new HashMap<>();
|
|
|
+// tokenParams.put("sign", sds);
|
|
|
+// tokenParams.put("timestamp", timeStr);
|
|
|
+// tokenParams.put("xh", cardNo);
|
|
|
+// tokenParams.put("sfqjdm", year);
|
|
|
+// tokenParams.put("rxnd", year);
|
|
|
+
|
|
|
+ String queryStr = "?token="+sds+"×tamp="+timeStr+"&sfqjdm="+year+"&xh="+cardNo+"&rxnd="+year;
|
|
|
+ // wecode换取token
|
|
|
+ String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataTwo"+queryStr, tokenParams);
|
|
|
+ Gson gson = new Gson();
|
|
|
+ List<JsonPayVo> travelers = gson.fromJson(respon, new TypeToken<List<JsonPayVo>>(){}.getType());
|
|
|
+ return travelers;
|
|
|
+ }
|
|
|
+
|
|
|
+ private static String querySign(String timestr){
|
|
|
String devId = "ncjt00001";
|
|
|
|
|
|
Map<String, String> tokenParams = new HashMap<>();
|