From 25680e135b5bdc15658622cbfde74bab73cfee77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 25 十二月 2020 18:54:40 +0800
Subject: [PATCH] 功能完善
---
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
index 646a9fa..0c9d330 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
@@ -8,18 +8,21 @@
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.exception.UserInfoExtraException;
import com.ks.daylucky.pojo.DO.UserInfo;
+import com.ks.daylucky.pojo.DO.UserInfoExtra;
import com.ks.daylucky.pojo.DO.UserMsg;
import com.ks.daylucky.pojo.DTO.AlipayUserInfo;
import com.ks.daylucky.pojo.DTO.TokenDTO;
import com.ks.daylucky.pojo.DTO.UserMsgSettings;
import com.ks.daylucky.pojo.VO.AcceptData;
+import com.ks.daylucky.pojo.VO.UserConfigVO;
+import com.ks.daylucky.pojo.VO.UserMsgVO;
import com.ks.daylucky.service.UserInfoExtraService;
import com.ks.daylucky.service.UserInfoService;
import com.ks.daylucky.service.UserMsgService;
import com.ks.daylucky.util.Constant;
-import com.ks.daylucky.util.RSA2Encryptor;
import com.ks.daylucky.util.RSAUtil;
import com.ks.daylucky.util.UserInfoUtil;
+import com.ks.daylucky.util.factory.vo.UserMsgVOFactory;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,6 +36,7 @@
import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
import java.util.List;
@Controller
@@ -188,14 +192,35 @@
@RequestMapping("getUserMsgList")
public String getUserMsgList(AcceptData acceptData, int page) {
List<UserMsg> msgList = userMsgService.getUserMsgList(acceptData.getUid(), page, Constant.PAGE_SIZE);
+ List<UserMsgVO> voList = new ArrayList<>();
+ if (msgList != null) {
+ for (UserMsg userMsg : msgList) {
+ voList.add(UserMsgVOFactory.create(userMsg));
+ }
+ }
+
+
long count = userMsgService.countUserMsg(acceptData.getUid());
- Gson gson = JsonUtil.getConvertDateToShortNameBuilder(new GsonBuilder().excludeFieldsWithoutExposeAnnotation()).create();
+ Gson gson = JsonUtil.getConvertDateToShortNameBuilder(new GsonBuilder()).create();
JSONObject data = new JSONObject();
- data.put("data", gson.toJson(msgList));
+ data.put("data", gson.toJson(voList));
data.put("count", count);
return JsonUtil.loadTrueResult(data);
}
+ @ResponseBody
+ @RequestMapping("getUserConfig")
+ public String getUserConfig(AcceptData acceptData) {
+ //娑堟伅鏈鏁�
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(acceptData.getUid());
+ if (extra == null) {
+ return JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ UserConfigVO vo = new UserConfigVO();
+ vo.setMsgCount(extra.getMsgUnreadCount());
+ return JsonUtil.loadTrueResult(vo);
+ }
+
}
--
Gitblit v1.8.0