From d1f26741bddf6f512d62c0100d42c52be8d37e76 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:35:40 +0800
Subject: [PATCH] 工具类优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java |  466 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
index 80fceb7..36a7f22 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ActivityController.java
@@ -1,233 +1,233 @@
-package com.yeshi.fanli.controller.client.v1;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.entity.FileUploadResult;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
-import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.exception.ActivityException;
-import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
-import com.yeshi.fanli.service.inter.activity.ActivityService;
-import com.yeshi.fanli.util.Constant;
-
-import net.sf.json.JSONObject;
-
-/**
- * 鍔ㄦ��
- * 
- * @author Administrator
- *
- */
-@Controller
-@RequestMapping("api/v1/activity")
-public class ActivityController {
-
-	@Resource
-	private ActivityService activityService;
-
-	private Gson getGson() {
-		GsonBuilder gb = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
-		gb.excludeFieldsWithoutExposeAnnotation();
-		gb.registerTypeAdapter(Date.class, new TypeAdapter<Date>() {
-
-			@Override
-			public void write(JsonWriter out, Date value) throws IOException {
-				String desc = "";
-				if (value != null) {
-
-					Calendar calendar = Calendar.getInstance();
-					calendar.setTime(value);
-					int y1 = calendar.get(Calendar.YEAR);// 鑾峰彇骞翠唤
-					int d1 = calendar.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
-
-					Date nowDate = new Date();
-					Calendar calendar2 = Calendar.getInstance();
-					calendar2.setTime(nowDate);
-					int y2 = calendar2.get(Calendar.YEAR);// 鑾峰彇骞翠唤
-					int d2 = calendar2.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
-
-					long old = value.getTime();
-					long now = nowDate.getTime();
-					if (y1 == y2) {
-						if (d1 == d2) {
-							long cha = now - old;
-							if (cha < 1000 * 60 * 2L) {
-								desc = "鍒氬垰";
-							}else if (cha < 1000 * 60 * 60L) {
-								desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
-							}else {
-								desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
-							}
-						} else if (d2 - d1 == 1) {
-							desc = "鏄ㄥぉ";
-						} else {
-							desc = (d2 - d1) + "澶╁墠";
-						}
-					} else {
-						int timeDistance = 0;
-						for (int i = y1; i < y2; i++) {
-							if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) {
-								timeDistance += 366; // 闂板勾
-							} else {
-								timeDistance += 365; // 涓嶆槸闂板勾
-							}
-						}
-						desc = timeDistance + (d2 - d1) + "澶╁墠";
-					}
-
-					out.value(desc);
-				}
-			}
-
-			@Override
-			public Date read(JsonReader in) throws IOException {
-				return new Date();
-			}
-		});
-		Gson gson = gb.create();
-		return gson;
-	}
-
-	/**
-	 * 鑾峰彇鍔ㄦ�佹帹鑽�
-	 * 
-	 * @param acceptData
-	 * @param page
-	 *            -椤电爜
-	 * @param out
-	 */
-	@RequestMapping(value = "getRecommendActivity", method = RequestMethod.POST)
-	public void getRecommendActivity(AcceptData acceptData, int page, PrintWriter out) {
-		if (page <= 0)
-			page = 1;
-		List<RecommendActivity> list = activityService.getRecommendActivityListCache(page, Constant.PAGE_SIZE);
-		long count = activityService.getRecommendActivityCountCache();
-		JSONObject data = new JSONObject();
-		data.put("data", getGson().toJson(list));
-		data.put("count", count);
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-	/**
-	 * 鍒嗕韩鍟嗗搧
-	 * 
-	 * @param acceptData
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "shareGoods", method = RequestMethod.POST)
-	public void shareGoods(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
-		try {
-			ActivityShareResult result = activityService.shareActivityGoods(uid, activityId);
-			JSONObject data = new JSONObject();
-			data.put("shareTitle", result.getTitle());
-			List<String> imgList = new ArrayList<>();
-			for (FileUploadResult uploadResult : result.getImgList())
-				imgList.add(uploadResult.getUrl());
-			data.put("shareImgs", imgList);
-			out.print(JsonUtil.loadTrueResult(data));
-			activityService.addShareCount(activityId, 1);
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		} catch (ActivityException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		}
-	}
-	
-	/**
-	 * 鍒嗕韩鍟嗗搧
-	 * 
-	 * @param acceptData
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "sharegoodsv2", method = RequestMethod.POST)
-	public void shareGoodsV2(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
-		try {
-			JSONObject data = activityService.shareGoodsV2(uid, activityId);
-			out.print(JsonUtil.loadTrueResult(data));
-			activityService.addShareCount(activityId, 1);
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		} catch (ActivityException e) {
-			out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鍒嗕韩鍟嗗搧锛堜即闅忓浘鐗囩殑MD5锛�
-	 * 
-	 * @param acceptData
-	 * @param uid
-	 * @param activityId
-	 * @param out
-	 */
-	@RequestMapping(value = "shareGoodsWithEncryptInfo", method = RequestMethod.POST)
-	public void shareGoodsWithEncryptInfo(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
-		try {
-			ActivityShareResult result = activityService.shareActivityGoods(uid, activityId);
-			JSONObject data = new JSONObject();
-			data.put("shareTitle", result.getTitle());
-			data.put("shareImgs", result.getImgList());
-			out.print(JsonUtil.loadTrueResult(data));
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		} catch (ActivityException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		}
-	}
-
-	/**
-	 * 鐢熸垚閭�璇峰浘鐗�
-	 * 
-	 * @param acceptData
-	 * @param uid
-	 * @param out
-	 */
-	@RequestMapping(value = "inviteImg", method = RequestMethod.POST)
-	public void inviteImg(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
-		try {
-			ActivityShareResult result = activityService.shareInviteImg(uid, activityId);
-			List<String> imgList = new ArrayList<>();
-			for (FileUploadResult img : result.getImgList())
-				imgList.add(img.getUrl());
-
-			JSONObject data = new JSONObject();
-			data.put("shareTitle", result.getTitle());
-			data.put("shareImgs", imgList);
-			out.print(JsonUtil.loadTrueResult(data));
-			activityService.addShareCount(activityId, 1);
-		} catch (ActivityException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
-		}
-	}
-
-	@RequestMapping(value = "addShareCount", method = RequestMethod.POST)
-	public void addShareCount(AcceptData acceptData, long id, PrintWriter out) {
-		activityService.addShareCount(id, 1);
-		RecommendActivity activity = activityService.getRecommendActivityById(id);
-		JSONObject data = new JSONObject();
-		data.put("shareCount", activity.getShareCount());
-		out.print(JsonUtil.loadTrueResult(data));
-	}
-
-}
+package com.yeshi.fanli.controller.client.v1;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.entity.FileUploadResult;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
+import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
+import com.yeshi.fanli.service.inter.activity.ActivityService;
+import com.yeshi.fanli.util.Constant;
+
+import net.sf.json.JSONObject;
+
+/**
+ * 鍔ㄦ��
+ * 
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping("api/v1/activity")
+public class ActivityController {
+
+	@Resource
+	private ActivityService activityService;
+
+	private Gson getGson() {
+		GsonBuilder gb = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+		gb.excludeFieldsWithoutExposeAnnotation();
+		gb.registerTypeAdapter(Date.class, new TypeAdapter<Date>() {
+
+			@Override
+			public void write(JsonWriter out, Date value) throws IOException {
+				String desc = "";
+				if (value != null) {
+
+					Calendar calendar = Calendar.getInstance();
+					calendar.setTime(value);
+					int y1 = calendar.get(Calendar.YEAR);// 鑾峰彇骞翠唤
+					int d1 = calendar.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
+
+					Date nowDate = new Date();
+					Calendar calendar2 = Calendar.getInstance();
+					calendar2.setTime(nowDate);
+					int y2 = calendar2.get(Calendar.YEAR);// 鑾峰彇骞翠唤
+					int d2 = calendar2.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
+
+					long old = value.getTime();
+					long now = nowDate.getTime();
+					if (y1 == y2) {
+						if (d1 == d2) {
+							long cha = now - old;
+							if (cha < 1000 * 60 * 2L) {
+								desc = "鍒氬垰";
+							}else if (cha < 1000 * 60 * 60L) {
+								desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
+							}else {
+								desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
+							}
+						} else if (d2 - d1 == 1) {
+							desc = "鏄ㄥぉ";
+						} else {
+							desc = (d2 - d1) + "澶╁墠";
+						}
+					} else {
+						int timeDistance = 0;
+						for (int i = y1; i < y2; i++) {
+							if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) {
+								timeDistance += 366; // 闂板勾
+							} else {
+								timeDistance += 365; // 涓嶆槸闂板勾
+							}
+						}
+						desc = timeDistance + (d2 - d1) + "澶╁墠";
+					}
+
+					out.value(desc);
+				}
+			}
+
+			@Override
+			public Date read(JsonReader in) throws IOException {
+				return new Date();
+			}
+		});
+		Gson gson = gb.create();
+		return gson;
+	}
+
+	/**
+	 * 鑾峰彇鍔ㄦ�佹帹鑽�
+	 * 
+	 * @param acceptData
+	 * @param page
+	 *            -椤电爜
+	 * @param out
+	 */
+	@RequestMapping(value = "getRecommendActivity", method = RequestMethod.POST)
+	public void getRecommendActivity(AcceptData acceptData, int page, PrintWriter out) {
+		if (page <= 0)
+			page = 1;
+		List<RecommendActivity> list = activityService.getRecommendActivityListCache(page, Constant.PAGE_SIZE);
+		long count = activityService.getRecommendActivityCountCache();
+		JSONObject data = new JSONObject();
+		data.put("data", getGson().toJson(list));
+		data.put("count", count);
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+
+	/**
+	 * 鍒嗕韩鍟嗗搧
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "shareGoods", method = RequestMethod.POST)
+	public void shareGoods(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
+		try {
+			ActivityShareResult result = activityService.shareActivityGoods(uid, activityId);
+			JSONObject data = new JSONObject();
+			data.put("shareTitle", result.getTitle());
+			List<String> imgList = new ArrayList<>();
+			for (FileUploadResult uploadResult : result.getImgList())
+				imgList.add(uploadResult.getUrl());
+			data.put("shareImgs", imgList);
+			out.print(JsonUtil.loadTrueResult(data));
+			activityService.addShareCount(activityId, 1);
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		} catch (ActivityException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		}
+	}
+	
+	/**
+	 * 鍒嗕韩鍟嗗搧
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "sharegoodsv2", method = RequestMethod.POST)
+	public void shareGoodsV2(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
+		try {
+			JSONObject data = activityService.shareGoodsV2(uid, activityId);
+			out.print(JsonUtil.loadTrueResult(data));
+			activityService.addShareCount(activityId, 1);
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		} catch (ActivityException e) {
+			out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鍒嗕韩鍟嗗搧锛堜即闅忓浘鐗囩殑MD5锛�
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param activityId
+	 * @param out
+	 */
+	@RequestMapping(value = "shareGoodsWithEncryptInfo", method = RequestMethod.POST)
+	public void shareGoodsWithEncryptInfo(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
+		try {
+			ActivityShareResult result = activityService.shareActivityGoods(uid, activityId);
+			JSONObject data = new JSONObject();
+			data.put("shareTitle", result.getTitle());
+			data.put("shareImgs", result.getImgList());
+			out.print(JsonUtil.loadTrueResult(data));
+		} catch (UserShareGoodsRecordException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		} catch (ActivityException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		}
+	}
+
+	/**
+	 * 鐢熸垚閭�璇峰浘鐗�
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "inviteImg", method = RequestMethod.POST)
+	public void inviteImg(AcceptData acceptData, long uid, long activityId, PrintWriter out) {
+		try {
+			ActivityShareResult result = activityService.shareInviteImg(uid, activityId);
+			List<String> imgList = new ArrayList<>();
+			for (FileUploadResult img : result.getImgList())
+				imgList.add(img.getUrl());
+
+			JSONObject data = new JSONObject();
+			data.put("shareTitle", result.getTitle());
+			data.put("shareImgs", imgList);
+			out.print(JsonUtil.loadTrueResult(data));
+			activityService.addShareCount(activityId, 1);
+		} catch (ActivityException e) {
+			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+		}
+	}
+
+	@RequestMapping(value = "addShareCount", method = RequestMethod.POST)
+	public void addShareCount(AcceptData acceptData, long id, PrintWriter out) {
+		activityService.addShareCount(id, 1);
+		RecommendActivity activity = activityService.getRecommendActivityById(id);
+		JSONObject data = new JSONObject();
+		data.put("shareCount", activity.getShareCount());
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+
+}

--
Gitblit v1.8.0