优化通知目录

WebService/src/main/java/com/java110/web/components/NavComponent.java

@@ -3,6 +3,7 @@ package com.java110.web.components;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
 import com.java110.web.smo.INavServiceSMO;
+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 +20,9 @@ public class NavComponent {
     @Autowired
     private INavServiceSMO navServiceSMOImpl;
 
+    @Autowired
+    private IListNoticesSMO listNoticesSMOImpl;
+
 
     /**
      * 查询通知信息
@@ -28,16 +32,7 @@ public class NavComponent {
      */
     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'}"
-                + "]}";
-
-        JSONObject nav = JSONObject.parseObject(result);
-
-        return new ResponseEntity<String>(nav.toJSONString(), HttpStatus.OK);
+        return listNoticesSMOImpl.listNotices(pd);
     }
 
 
@@ -97,5 +92,11 @@ public class NavComponent {
         this.navServiceSMOImpl = navServiceSMOImpl;
     }
 
+    public IListNoticesSMO getListNoticesSMOImpl() {
+        return listNoticesSMOImpl;
+    }
 
+    public void setListNoticesSMOImpl(IListNoticesSMO listNoticesSMOImpl) {
+        this.listNoticesSMOImpl = listNoticesSMOImpl;
+    }
 }

WebService/src/main/resources/components/ownerPackage/member-select-owner/memberSelectOwner.html

@@ -72,6 +72,6 @@
     <vc:create
             name="addOwner"
             notifyLoadDataComponentName="listOwnerMember"
-            componentTitle="业主成员"
+            componentTitle="成员"
     ></vc:create>
 </div>

WebService/src/main/resources/components/pageFramePackage/nav/nav.html

@@ -21,7 +21,7 @@
 
             <div class="dropdown-menu" v-for="currentCommunity in navCommunityInfo.communityInfos">
                 <a class="dropdown-item" v-on:click="changeCommunity(currentCommunity)">{{currentCommunity.name}}</a>
-                <a href="/flow/enterCommunity" class="dropdown-item">
+                <a href="/flow/enterCommunity" class="dropdown-item text-center">
                     <strong>入驻小区</strong>
                     <i class="fa fa-angle-right"></i>
                 </a>
@@ -32,14 +32,14 @@
         </li>
         <li class="dropdown">
             <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
-                <i class="fa fa-bell"></i> <span class="label label-primary">{{nav.noticeSize}}</span>
+                <i class="fa fa-bell"></i> <span class="label label-primary">{{nav.total}}</span>
             </a>
             <ul class="dropdown-menu dropdown-alerts">
                 <li v-for="notice in nav.notices">
                     <a href="mailbox.html" class="dropdown-item">
                         <div>
-                            <i class="fa fa-envelope fa-fw"></i> {{notice.msg}}
-                            <span class="float-right text-muted small">{{notice.date}}</span>
+                            <i class="fa fa-envelope fa-fw"></i> {{notice.title}}
+                            <span class="float-right text-muted small">{{notice.startTime}}</span>
                         </div>
                     </a>
                     <div class="dropdown-divider"></div>

WebService/src/main/resources/components/pageFramePackage/nav/nav.js

@@ -5,7 +5,11 @@
     var vm = new Vue({
         el:'#nav',
         data:{
-            nav:{},
+            nav:{
+                moreNoticeUrl:'/flow/noticeFlow',
+                notices:[],
+                total:0
+            },
             userName:"",
             navCommunityInfo:{
                 _currentCommunity:{
@@ -23,7 +27,8 @@
             getNavData:function(){
 
                 var param = {
-                    msg:'123',
+                    page:1,
+                    row:3
                 };
 
                 //发送get请求
@@ -31,7 +36,9 @@
                             'getNavData',
                              param,
                              function(json){
-                                vm.nav = JSON.parse(json);
+                                var _noticeObj = JSON.parse(json);
+                                vm.nav.notices = _noticeObj.notices;
+                                vm.nav.total = _noticeObj.total;
                              },function(){
                                 console.log('请求失败处理');
                              }

java110-db/src/main/resources/mapper/notice/NoticeServiceDaoImplMapper.xml

@@ -5,197 +5,198 @@
 <mapper namespace="noticeServiceDaoImpl">
 
     <!-- 保存通知信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessNoticeInfo" parameterType="Map">
-           insert into business_notice(
-operate,notice_type_cd,context,start_time,community_id,title,b_id,user_id,notice_id
-) values (
-#{operate},#{noticeTypeCd},#{context},#{startTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
-)
-       </insert>
-
-
-       <!-- 查询通知信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
-           select  t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time startTime,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId 
-from business_notice t 
-where 1 =1 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="noticeTypeCd !=null and noticeTypeCd != ''">
-   and t.notice_type_cd= #{noticeTypeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="startTime !=null">
-   and t.start_time= #{startTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="title !=null and title != ''">
-   and t.title= #{title}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="noticeId !=null and noticeId != ''">
-   and t.notice_id= #{noticeId}
-</if> 
-
-       </select>
+    <insert id="saveBusinessNoticeInfo" parameterType="Map">
+        insert into business_notice(
+        operate,notice_type_cd,context,start_time,community_id,title,b_id,user_id,notice_id
+        ) values (
+        #{operate},#{noticeTypeCd},#{context},#{startTime},#{communityId},#{title},#{bId},#{userId},#{noticeId}
+        )
+    </insert>
 
 
+    <!-- 查询通知信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
+        select t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
+        startTime,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id bId,t.user_id,t.user_id
+        userId,t.notice_id,t.notice_id noticeId
+        from business_notice t
+        where 1 =1
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="noticeTypeCd !=null and noticeTypeCd != ''">
+            and t.notice_type_cd= #{noticeTypeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="startTime !=null">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="title !=null and title != ''">
+            and t.title= #{title}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="noticeId !=null and noticeId != ''">
+            and t.notice_id= #{noticeId}
+        </if>
 
+    </select>
 
 
     <!-- 保存通知信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveNoticeInfoInstance" parameterType="Map">
         insert into n_notice(
-notice_type_cd,context,start_time,status_cd,community_id,title,b_id,user_id,notice_id
-) select t.notice_type_cd,t.context,t.start_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id from business_notice t where 1=1
-   and t.operate= 'ADD'
-<if test="noticeTypeCd !=null and noticeTypeCd != ''">
-   and t.notice_type_cd= #{noticeTypeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="startTime !=null">
-   and t.start_time= #{startTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="title !=null and title != ''">
-   and t.title= #{title}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="noticeId !=null and noticeId != ''">
-   and t.notice_id= #{noticeId}
-</if> 
+        notice_type_cd,context,start_time,status_cd,community_id,title,b_id,user_id,notice_id
+        ) select t.notice_type_cd,t.context,t.start_time,'0',t.community_id,t.title,t.b_id,t.user_id,t.notice_id from
+        business_notice t where 1=1
+        and t.operate= 'ADD'
+        <if test="noticeTypeCd !=null and noticeTypeCd != ''">
+            and t.notice_type_cd= #{noticeTypeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="startTime !=null">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="title !=null and title != ''">
+            and t.title= #{title}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="noticeId !=null and noticeId != ''">
+            and t.notice_id= #{noticeId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询通知信息 add by wuxw 2018-07-03 -->
     <select id="getNoticeInfo" parameterType="Map" resultType="Map">
-        select  t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId 
-from n_notice t 
-where 1 =1 
-<if test="noticeTypeCd !=null and noticeTypeCd != ''">
-   and t.notice_type_cd= #{noticeTypeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="startTime !=null">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="title !=null and title != ''">
-   and t.title= #{title}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="noticeId !=null and noticeId != ''">
-   and t.notice_id= #{noticeId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
+        startTime,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.title,t.b_id,t.b_id
+        bId,t.user_id,t.user_id userId,t.notice_id,t.notice_id noticeId
+        from n_notice t
+        where 1 =1
+        <if test="noticeTypeCd !=null and noticeTypeCd != ''">
+            and t.notice_type_cd= #{noticeTypeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="startTime !=null">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="title !=null and title != ''">
+            and t.title= #{title}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="noticeId !=null and noticeId != ''">
+            and t.notice_id= #{noticeId}
+        </if>
+        order by t.start_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改通知信息 add by wuxw 2018-07-03 -->
     <update id="updateNoticeInfoInstance" parameterType="Map">
-        update  n_notice t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="noticeTypeCd !=null and noticeTypeCd != ''">
-, t.notice_type_cd= #{noticeTypeCd}
-</if> 
-<if test="context !=null and context != ''">
-, t.context= #{context}
-</if> 
-<if test="startTime !=null">
-, t.start_time= #{startTime}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="title !=null and title != ''">
-, t.title= #{title}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
- where 1=1 <if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
-<if test="noticeId !=null and noticeId != ''">
-and t.notice_id= #{noticeId}
-</if> 
+        update n_notice t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="noticeTypeCd !=null and noticeTypeCd != ''">
+            , t.notice_type_cd= #{noticeTypeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            , t.context= #{context}
+        </if>
+        <if test="startTime !=null">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="title !=null and title != ''">
+            , t.title= #{title}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="noticeId !=null and noticeId != ''">
+            and t.notice_id= #{noticeId}
+        </if>
 
     </update>
 
     <!-- 查询通知数量 add by wuxw 2018-07-03 -->
-     <select id="queryNoticesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from n_notice t 
-where 1 =1 
-<if test="noticeTypeCd !=null and noticeTypeCd != ''">
-   and t.notice_type_cd= #{noticeTypeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="startTime !=null">
-   and t.start_time= #{startTime}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="title !=null and title != ''">
-   and t.title= #{title}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="noticeId !=null and noticeId != ''">
-   and t.notice_id= #{noticeId}
-</if> 
-
-
-     </select>
+    <select id="queryNoticesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from n_notice t
+        where 1 =1
+        <if test="noticeTypeCd !=null and noticeTypeCd != ''">
+            and t.notice_type_cd= #{noticeTypeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="startTime !=null">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="title !=null and title != ''">
+            and t.title= #{title}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="noticeId !=null and noticeId != ''">
+            and t.notice_id= #{noticeId}
+        </if>
+
+
+    </select>
 
 </mapper>