From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/NavComponent.java | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/NavComponent.java b/WebService/src/main/java/com/java110/web/components/NavComponent.java
index bfa08f5..f478fa7 100644
--- a/WebService/src/main/java/com/java110/web/components/NavComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/NavComponent.java
@@ -3,6 +3,10 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
import com.java110.web.smo.INavServiceSMO;
+import com.java110.web.smo.community.IListMyEnteredCommunitysSMO;
+import com.java110.web.smo.msg.IListMsgSMO;
+import com.java110.web.smo.msg.IReadMsgSMO;
+import com.java110.web.smo.notice.IListNoticesSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -19,6 +23,18 @@
@Autowired
private INavServiceSMO navServiceSMOImpl;
+ @Autowired
+ private IListNoticesSMO listNoticesSMOImpl;
+
+ @Autowired
+ private IListMsgSMO listMsgSMOImpl;
+
+ @Autowired
+ private IReadMsgSMO readMsgSMOImpl;
+
+ @Autowired
+ private IListMyEnteredCommunitysSMO listMyEnteredCommunitysSMOImpl;
+
/**
* 鏌ヨ閫氱煡淇℃伅
@@ -28,16 +44,17 @@
*/
public ResponseEntity<String> getNavData(IPageData pd) {
- String result = "{'noticeSize':10,"
- + "'moreNoticeUrl':'/moreNotice','notices':["
- + "{'msg':'鏂扮郴缁熷紑鍙戞祴璇�','date':'2019-03-19'},"
- + "{'msg':'鏉冮檺妫�鏌ユ祴璇�','date':'2019-03-21'},"
- + "{'msg':'绯荤粺娆插紑鍙戞祴璇�','date':'2019-03-20'}"
- + "]}";
+ return listMsgSMOImpl.listMsg(pd);
+ }
- JSONObject nav = JSONObject.parseObject(result);
-
- return new ResponseEntity<String>(nav.toJSONString(), HttpStatus.OK);
+ /**
+ * 闃呰娑堟伅
+ *
+ * @param pd
+ * @return
+ */
+ public ResponseEntity<String> readMsg(IPageData pd) {
+ return readMsgSMOImpl.readMsg(pd);
}
@@ -83,11 +100,18 @@
*/
public ResponseEntity<String> getCommunitys(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- responseEntity = navServiceSMOImpl.listMyCommunity(pd);
+ responseEntity = listMyEnteredCommunitysSMOImpl.myCommunitys(pd);
return responseEntity;
}
+ public IListMyEnteredCommunitysSMO getListMyEnteredCommunitysSMOImpl() {
+ return listMyEnteredCommunitysSMOImpl;
+ }
+
+ public void setListMyEnteredCommunitysSMOImpl(IListMyEnteredCommunitysSMO listMyEnteredCommunitysSMOImpl) {
+ this.listMyEnteredCommunitysSMOImpl = listMyEnteredCommunitysSMOImpl;
+ }
public INavServiceSMO getNavServiceSMOImpl() {
return navServiceSMOImpl;
@@ -97,5 +121,27 @@
this.navServiceSMOImpl = navServiceSMOImpl;
}
+ public IListNoticesSMO getListNoticesSMOImpl() {
+ return listNoticesSMOImpl;
+ }
+ public void setListNoticesSMOImpl(IListNoticesSMO listNoticesSMOImpl) {
+ this.listNoticesSMOImpl = listNoticesSMOImpl;
+ }
+
+ public IListMsgSMO getListMsgSMOImpl() {
+ return listMsgSMOImpl;
+ }
+
+ public void setListMsgSMOImpl(IListMsgSMO listMsgSMOImpl) {
+ this.listMsgSMOImpl = listMsgSMOImpl;
+ }
+
+ public IReadMsgSMO getReadMsgSMOImpl() {
+ return readMsgSMOImpl;
+ }
+
+ public void setReadMsgSMOImpl(IReadMsgSMO readMsgSMOImpl) {
+ this.readMsgSMOImpl = readMsgSMOImpl;
+ }
}
--
Gitblit v1.8.0