From ac18247de1bf14b44fd438b35d783c1a313f5286 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 16:57:44 +0800
Subject: [PATCH] 数据预览
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 112 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
index 0942dd3..c43dd4b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
@@ -68,6 +68,19 @@
}
}
+
+ @RequestMapping(value = "getMoneyInfo")
+ public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);
+ if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+ MoneyStatisticVO dto = new Gson().fromJson(previewInfo.getContent(), MoneyStatisticVO.class);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
+ }
+
+
/**
* 淇濆瓨鎻愮幇璁板綍
*
@@ -92,6 +105,41 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
+ @RequestMapping(value = "getExtractRecord")
+ public void getExtractRecord(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ List<Extract> list = null;
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.extractRecord);
+ if (previewInfo != null && !StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ Gson gson = new Gson();
+ list = gson.fromJson(previewInfo.getContent(), new TypeToken<ArrayList<Extract>>() {}.getType());
+ }
+
+ if (list == null)
+ list = new ArrayList<>();
+
+ JSONArray JSONArray = new JSONArray();
+ for (Extract extract : list) {
+ Date receiveTime = extract.getReceiveTime();
+ if (receiveTime == null) {
+ receiveTime = new Date(extract.getExtractTime());
+ }
+ String account = "鏀粯瀹濓細" + UserUtil.filterAlipayAccount(extract.getAccount());
+ account = account + "-濮撳悕锛�" + UserUtil.filterAlipayName(extract.getName());
+
+ JSONObject object = new JSONObject();
+ object.put("id", extract.getId());
+ object.put("title", "浣犱簬" + TimeUtil.formatDate(receiveTime) + "鎻愮幇鎴愬姛");
+ object.put("account", account);
+ object.put("money", "楼" + extract.getMoney().setScale(2).toString());
+ JSONArray.add(object);
+ }
+
+ JSONObject json = new JSONObject();
+ json.put("count", JSONArray.size());
+ json.put("list", JSONArray);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
+ }
+
/**
* 鍒犻櫎鎻愮幇璁板綍
*
@@ -135,6 +183,18 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
}
}
+
+ @RequestMapping(value = "getMineInfo")
+ public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.mineInfo);
+ if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ MineInfoVO dto = new Gson().fromJson(previewInfo.getContent(), MineInfoVO.class);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
+ }
/**
* 鍒拌处棰勮-鐢熶骇鍥剧墖
@@ -166,59 +226,17 @@
}
}
- @RequestMapping(value = "getExtractRecord")
- public void getExtractRecord(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- List<Extract> list = null;
- PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.extractRecord);
- if (previewInfo != null && !StringUtil.isNullOrEmpty(previewInfo.getContent())) {
- Gson gson = new Gson();
- list = gson.fromJson(previewInfo.getContent(), new TypeToken<ArrayList<Extract>>() {}.getType());
- }
-
- if (list == null)
- list = new ArrayList<>();
- JSONArray JSONArray = new JSONArray();
- for (Extract extract : list) {
- Date receiveTime = extract.getReceiveTime();
- if (receiveTime == null) {
- receiveTime = new Date(extract.getExtractTime());
- }
- String account = "鏀粯瀹濓細" + UserUtil.filterAlipayAccount(extract.getAccount());
- account = account + "-濮撳悕锛�" + UserUtil.filterAlipayName(extract.getName());
-
- JSONObject object = new JSONObject();
- object.put("id", extract.getId());
- object.put("title", "浣犱簬" + TimeUtil.formatDate(receiveTime) + "鎻愮幇鎴愬姛");
- object.put("account", account);
- object.put("money", "楼" + extract.getMoney().setScale(2).toString());
- JSONArray.add(object);
- }
-
- JSONObject json = new JSONObject();
- json.put("count", JSONArray.size());
- json.put("list", JSONArray);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
- }
-
- @RequestMapping(value = "getMineInfo")
- public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.mineInfo);
- }
-
- @RequestMapping(value = "getMoneyInfo")
- public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.moneyInfo);
- }
-
- private void getInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out, PreviewEnum previewEnum) {
- PreviewInfo previewInfo = previewInfoService.get(uid, previewEnum);
+ @RequestMapping(value = "getMoneyArrivalImg")
+ public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);
if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
JSONObject object = new JSONObject();
- object.put("result", previewInfo.getContent());
+ object.put("link", previewInfo.getContent());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
}
+
}
--
Gitblit v1.8.0