From fd1dce3121a7773419263c495f92e160cc1e7124 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:36:36 +0800
Subject: [PATCH] 2.1 +后台编辑

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java |  370 ----------------------------------------------------
 1 files changed, 0 insertions(+), 370 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index 7d9b4e2..b4008a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -30,10 +30,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.controller.admin.utils.AdminUtils;
-import com.yeshi.fanli.dto.ChartTDO;
-import com.yeshi.fanli.entity.admin.count.CountUserInfo;
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -59,12 +55,10 @@
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 @Controller
@@ -859,370 +853,6 @@
 		}
 	}
 
-	/**
-	 * 缁熻瀹℃牳娆℃暟
-	 * 
-	 * @param callback
-	 * @param state
-	 *            瀹℃牳鐘舵�侊細鎵�鏈�-3 閫氳繃-1 鎷掔粷- 2
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�3
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3骞�
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getAuditTotal")
-	public void getAuditTotal(String callback, String stateArray, Integer dateType, String year, String startTime,
-			String endTime, PrintWriter out) {
-		try {
-			String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
-			if (validateMsg != null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
-				return;
-			}
-			
-			if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
-				startTime = null;
-				endTime = null;
-			}
-
-			Date beginDate = null;
-			Date endDate = null;
-			
-			if (dateType == 1) {
-				beginDate = TimeUtil.parse(startTime);
-				endDate = TimeUtil.parse(endTime);
-			} else if (dateType == 2) {
-				Calendar calendar=Calendar.getInstance();  
-				int currentYear = calendar.get(Calendar.YEAR);
-				if (!StringUtil.isNullOrEmpty(year)) {
-					currentYear = Integer.parseInt(year);
-				}
-				calendar.clear();
-			    calendar.set(Calendar.YEAR, currentYear);
-			    beginDate =calendar.getTime();
-		
-				calendar.clear();
-				calendar.set(Calendar.YEAR, currentYear);
-				calendar.roll(Calendar.DAY_OF_YEAR, -1);
-				endDate=calendar.getTime(); 
-			} else if (dateType == 3) {
-				beginDate = TimeUtil.parse("2018-01-01");
-				endDate = new Date();
-			}
-			Gson gson = new Gson();
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-			
-			String substring = stateArray.substring(1, stateArray.length()-1);
-			List<Integer> channelList = null;
-			if (stateArray != null && stateArray.trim().length() > 4) {
-				channelList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() {}.getType());
-			}
-			
-			JSONArray line_list = new JSONArray();
-			
-			if (channelList != null && channelList.size() > 0) {
-				for (Integer state : channelList) {
-					List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, state);
-					String name = "";
-					if (state == 1) {
-						name = "閫氳繃";
-					} else if (state == 2) {
-						name = "椹冲洖";
-					}
-					JSONObject innerList = new JSONObject();
-					innerList.put("name", name);
-					innerList.put("data", gson.toJson(list));
-					line_list.add(innerList);
-				}
-			} else {
-				List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, null);
-				JSONObject innerList = new JSONObject();
-				innerList.put("name", "鍏ㄩ儴");
-				innerList.put("data", gson.toJson(list));
-				line_list.add(innerList);
-			}
-
-			JSONObject data = new JSONObject();
-			data.put("line_list", line_list);
-			data.put("xAxis_list", gson.toJson(dateList));
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
-			e.printStackTrace();
-		}
-	}
-	
-	private List<Object> getAuditData(List<String> dateList, Integer dateType, Date beginDate, Date endDate, 
-			Integer state) throws Exception{
-		List<Object> list = new ArrayList<>();
-		List<CountUserInfo> listHistory = extractAuditRecordService.getAuditCount(beginDate, endDate, state);
-		for (String date: dateList) {
-			int value = 0;
-			if (listHistory != null) {
-				for (CountUserInfo history: listHistory) {
-					if (dateType == 1) {
-						String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value += history.getNum();
-							continue;
-						}
-					} else if (dateType == 2){
-						String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
-						if(gernalTime.startsWith("0")) {
-							gernalTime = gernalTime.substring(1, 2);
-						}
-							
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value +=  history.getNum();
-							continue;
-						}
-					} else if (dateType == 3) {
-						String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value +=  history.getNum();
-							continue;
-						}
-					}
-				}
-			}
-			list.add(value + "");
-		}
-		
-		return list;
-	}
-
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬婚
-	 * 
-	 * @param callback
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getExtractApplyMoney")
-	public void getExtractApplyMoney(String callback, Integer dateType, String year, String startTime, String endTime,
-			PrintWriter out) {
-		try {
-			String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
-			if (validateMsg != null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
-				return;
-			}
-			
-			if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
-				startTime = null;
-				endTime = null;
-			}
-
-			Date beginDate = null;
-			Date endDate = null;
-			if (dateType == 1) {
-				beginDate = TimeUtil.parse(startTime);
-				endDate = TimeUtil.parse(endTime);
-			} else if (dateType == 2) {
-				Calendar calendar=Calendar.getInstance();  
-				int currentYear = calendar.get(Calendar.YEAR);
-				if (!StringUtil.isNullOrEmpty(year)) {
-					currentYear = Integer.parseInt(year);
-				}
-				
-				calendar.clear();
-			    calendar.set(Calendar.YEAR, currentYear);
-			    beginDate =calendar.getTime();
-		
-				calendar.clear();
-				calendar.set(Calendar.YEAR, currentYear);
-				calendar.roll(Calendar.DAY_OF_YEAR, -1);
-				endDate=calendar.getTime(); 
-			} else if (dateType == 3) {
-				beginDate = TimeUtil.parse("2018-01-01");
-				endDate = new Date();
-			}
-			Gson gson = new Gson();
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-			
-			List<String> list = new ArrayList<>();
-			List<CountUserInfo> listHistory = extractAuditRecordService.getApplyMoney(beginDate, endDate);
-			for (String date: dateList) {
-				BigDecimal money = new BigDecimal("0");
-				if (listHistory == null) {
-					list.add(money.toString());
-					continue;
-				}
-				
-				for (CountUserInfo history: listHistory) {
-					if (dateType == 1) {
-						String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					} else if (dateType == 2){
-						String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
-						if(gernalTime.startsWith("0")) {
-							gernalTime = gernalTime.substring(1, 2);
-						}
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					} else if (dateType == 3) {
-						String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							money = MoneyBigDecimalUtil.add(money, history.getMoney());
-							continue;
-						}
-					}
-				}
-				list.add(money.toString());
-			}
-			
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "閲戦");
-			innerList.put("data", gson.toJson(list));
-
-			JSONArray line_list = new JSONArray();
-			line_list.add(innerList);
-
-			JSONObject data = new JSONObject();
-			data.put("xAxis_list", gson.toJson(dateList));
-			data.put("line_list", line_list);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 缁熻鎻愮幇鐢宠鎬绘鏁�
-	 * 
-	 * @param callback
-	 * @param state
-	 *            鎵�鏈�-绌哄�兼垨鑰呬笉浼� 寰呭鏍�-0 閫氳繃-1 鎷掔粷- 2
-	 * @param type
-	 *            缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�
-	 * @param dateType
-	 *            绫诲瀷 1鏃� 2鏈� 3骞�
-	 * @param year
-	 *            2018
-	 * @param startTime
-	 *            2018-12-01
-	 * @param endTime
-	 *            2018-12-01
-	 * @param out
-	 */
-	@RequestMapping(value = "getExtractApplyNumber")
-	public void getExtractApplyNumber(String callback, Integer state, Integer dateType, String year, String startTime,
-			String endTime, PrintWriter out) {
-		try {
-			String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
-			if (validateMsg != null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
-				return;
-			}
-			
-			if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
-				startTime = null;
-				endTime = null;
-			}
-
-			
-			Date beginDate = null;
-			Date endDate = null;
-			
-			if (dateType == 1) {
-				beginDate = TimeUtil.parse(startTime);
-				endDate = TimeUtil.parse(endTime);
-			} else if (dateType == 2) {
-				Calendar calendar=Calendar.getInstance();  
-				int currentYear = calendar.get(Calendar.YEAR);
-				if (!StringUtil.isNullOrEmpty(year)) {
-					currentYear = Integer.parseInt(year);
-				}
-				
-				calendar.clear();
-			    calendar.set(Calendar.YEAR, currentYear);
-			    beginDate =calendar.getTime();
-		
-				calendar.clear();
-				calendar.set(Calendar.YEAR, currentYear);
-				calendar.roll(Calendar.DAY_OF_YEAR, -1);
-				endDate=calendar.getTime(); 
-			} else if (dateType == 3) {
-				beginDate = TimeUtil.parse("2018-01-01");
-				endDate = new Date();
-			}
-			Gson gson = new Gson();
-			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-			
-			List<Object> list = new ArrayList<>();
-			List<CountUserInfo> listHistory = extractAuditRecordService.geApplyNumber(beginDate, endDate);
-			for (String date: dateList) {
-				int value = 0;
-				if (listHistory == null) {
-					list.add(value + "");
-					continue;
-				}
-				
-				for (CountUserInfo history: listHistory) {
-					if (dateType == 1) {
-						String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value += history.getNum();
-							continue;
-						}
-					} else if (dateType == 2){
-						String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
-						if(gernalTime.startsWith("0")) {
-							gernalTime = gernalTime.substring(1, 2);
-						}
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value += history.getNum();
-							continue;
-						}
-					} else if (dateType == 3) {
-						String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
-						if (gernalTime.equalsIgnoreCase(date)) {
-							value += history.getNum();
-							continue;
-						}
-					}
-				}
-				list.add(value + "");
-			}
-			
-			JSONObject innerList = new JSONObject();
-			innerList.put("name", "鏁伴噺");
-			innerList.put("data", gson.toJson(list));
-
-			JSONArray line_list = new JSONArray();
-			line_list.add(innerList);
-
-			JSONObject data = new JSONObject();
-			data.put("xAxis_list", gson.toJson(dateList));
-			data.put("line_list", line_list);
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * 涓嬭浇鎻愮幇绾㈠寘Openid

--
Gitblit v1.8.0