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 |  117 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 93 insertions(+), 24 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 ff4f7cf..f478fa7 100644
--- a/WebService/src/main/java/com/java110/web/components/NavComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/NavComponent.java
@@ -1,9 +1,12 @@
 package com.java110.web.components;
 
-import com.alibaba.fastjson.JSONArray;
 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;
@@ -20,53 +23,95 @@
     @Autowired
     private INavServiceSMO navServiceSMOImpl;
 
-    public ResponseEntity<String> getNavData(IPageData pd){
+    @Autowired
+    private IListNoticesSMO listNoticesSMOImpl;
 
-        String result = "{'noticeSize':10," +
-                "'moreNoticeUrl':'/moreNotice','notices':[" +
-                "{'msg':'鏂扮郴缁熷紑鍙戞祴璇�','date':'2019-03-19'}," +
-                "{'msg':'鏉冮檺妫�鏌ユ祴璇�','date':'2019-03-21'}," +
-                "{'msg':'绯荤粺娆插紑鍙戞祴璇�','date':'2019-03-20'}" +
-                "]}";
+    @Autowired
+    private IListMsgSMO listMsgSMOImpl;
 
-        JSONObject nav = JSONObject.parseObject(result);
+    @Autowired
+    private IReadMsgSMO readMsgSMOImpl;
 
-        return new ResponseEntity<String>(nav.toJSONString(), HttpStatus.OK);
+    @Autowired
+    private IListMyEnteredCommunitysSMO listMyEnteredCommunitysSMOImpl;
+
+
+    /**
+     * 鏌ヨ閫氱煡淇℃伅
+     *
+     * @param pd 椤甸潰灏佽鏁版嵁
+     * @return 閫氱煡淇℃伅
+     */
+    public ResponseEntity<String> getNavData(IPageData pd) {
+
+        return listMsgSMOImpl.listMsg(pd);
+    }
+
+    /**
+     * 闃呰娑堟伅
+     *
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> readMsg(IPageData pd) {
+        return readMsgSMOImpl.readMsg(pd);
     }
 
 
     /**
      * 閫�鍑虹櫥褰�
-     * @param pd
-     * @return
+     *
+     * @param pd 椤甸潰灏佽瀵硅薄
+     * @return 椤甸潰瀵硅薄ResponseEntity
      */
-    public ResponseEntity<String> logout(IPageData pd){
+    public ResponseEntity<String> logout(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  navServiceSMOImpl.doExit(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = navServiceSMOImpl.doExit(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
 
     /**
      * 鑾峰彇鐢ㄦ埛淇℃伅
-     * @param pd
-     * @return
+     *
+     * @param pd 椤甸潰灏佽瀵硅薄
+     * @return 椤甸潰瀵硅薄ResponseEntity
      */
-    public ResponseEntity<String> getUserInfo(IPageData pd){
+    public ResponseEntity<String> getUserInfo(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  navServiceSMOImpl.getUserInfo(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = navServiceSMOImpl.getUserInfo(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
 
+    /**
+     * 鏌ヨ宸茬粡鍏ヤ綇鐨勫皬鍖�
+     *
+     * @param pd 椤甸潰灏佽瀵硅薄
+     * @return 灏忓尯淇℃伅 [{community:"123123",name:"娴嬭瘯1灏忓尯"},{community:"223123",name:"娴嬭瘯2灏忓尯"}]
+     */
+    public ResponseEntity<String> getCommunitys(IPageData pd) {
+        ResponseEntity<String> responseEntity = null;
+        responseEntity = listMyEnteredCommunitysSMOImpl.myCommunitys(pd);
+
+        return responseEntity;
+    }
+
+    public IListMyEnteredCommunitysSMO getListMyEnteredCommunitysSMOImpl() {
+        return listMyEnteredCommunitysSMOImpl;
+    }
+
+    public void setListMyEnteredCommunitysSMOImpl(IListMyEnteredCommunitysSMO listMyEnteredCommunitysSMOImpl) {
+        this.listMyEnteredCommunitysSMOImpl = listMyEnteredCommunitysSMOImpl;
+    }
 
     public INavServiceSMO getNavServiceSMOImpl() {
         return navServiceSMOImpl;
@@ -75,4 +120,28 @@
     public void setNavServiceSMOImpl(INavServiceSMO navServiceSMOImpl) {
         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