公告轮播图

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpAnnouncementMapper.java

@@ -17,7 +17,7 @@ public interface TpAnnouncementMapper {
 
     TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
 
-    int updateByPrimaryKeySelective(TpAnnouncement record);
+    int updateByPrimaryKeySelective(@Param("id")Integer id, @Param("viewCount")Integer viewCount);
 
     int updateByPrimaryKey(TpAnnouncement record);
 	

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpSocialViewMapper.java

@@ -16,4 +16,6 @@ public interface TpSocialViewMapper {
     int updateByPrimaryKeySelective(TpSocialView record);
 
     int updateByPrimaryKey(TpSocialView record);
+
+    Integer selectViewNum(TpSocialView tpSocialView);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -2,7 +2,7 @@ package com.community.huiju.service;
 
 import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpMessage;
+import com.community.huiju.model.TpSocialView;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface SocialServiceI {
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
-	
+
 	/**
 	 * 分页获取公告列表
 	 * @param communityId

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -1,5 +1,11 @@
 package com.community.huiju.service.impl;
 
+import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.dao.TpSocialViewMapper;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpSocialView;
+import com.community.huiju.service.SocialServiceI;
 import com.community.huiju.dao.TpActivityMapper;
 import com.community.huiju.dao.TpAnnouncementMapper;
 import com.community.huiju.model.TpActivity;
@@ -9,28 +15,50 @@ import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 import java.util.List;
 
 /**
- * @author admin
+ * @author weichaochao
  * @Title: SocialServiceImpl
- * @Description: TODO
  * @date 2018/10/23
  */
 @Service("SocialService")
 public class SocialServiceImpl implements SocialServiceI {
+
     @Autowired
     private TpAnnouncementMapper tpAnnouncementMapper;
-    
+
+    @Autowired
+    private TpSocialViewMapper tpSocialViewMapper;
+
     @Autowired
     private TpActivityMapper tpActivityMapper;
     
     @Override
+    @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
+        TpSocialView tpSocialView = new TpSocialView();
+        //TODO
+        tpSocialView.setTaUserId(1);
+        tpSocialView.setSocialType(Constant.ANNOUNCEMENT);
+        tpSocialView.setCommunityId(communityId);
+        tpSocialView.setUuid(id);
+        Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+
+        if (viewNum == 0){
+            tpSocialView.setCreateDate(new Date());
+            tpSocialViewMapper.insertSelective(tpSocialView);
+            tpSocialView.setTaUserId(null);
+            Integer allViewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+            tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
+        }
         return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
     }
-    
+
     /**
      * 分页获取公告列表
      * @param communityId

CODE/smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml

@@ -129,45 +129,12 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpAnnouncement" >
+  <update id="updateByPrimaryKeySelective" >
     update tp_announcement
     <set >
-      <if test="communityId != null" >
-        community_id = #{communityId,jdbcType=INTEGER},
-      </if>
-      <if test="announcementTitle != null" >
-        announcement_title = #{announcementTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="announcementCarouselImg != null" >
-        announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
-      </if>
-      <if test="announcementContent != null" >
-        announcement_content = #{announcementContent,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null" >
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
       <if test="viewCount != null" >
         view_count = #{viewCount,jdbcType=INTEGER},
       </if>
-      <if test="setUpCarousel != null" >
-        set_up_carousel = #{setUpCarousel,jdbcType=CHAR},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=CHAR},
-      </if>
-      <if test="createUser != null" >
-        create_user = #{createUser,jdbcType=INTEGER},
-      </if>
-      <if test="createDate != null" >
-        create_date = #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUser != null" >
-        update_user = #{updateUser,jdbcType=INTEGER},
-      </if>
-      <if test="updateDate != null" >
-        update_date = #{updateDate,jdbcType=TIMESTAMP},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>

CODE/smart-community/app-api/src/main/resources/mapper/TpSocialViewMapper.xml

@@ -114,4 +114,15 @@
       create_date = #{createDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectViewNum" resultType="java.lang.Integer" parameterType="com.community.huiju.model.TpSocialView">
+    select count(*) from tp_social_view
+    where
+    <if test="taUserId != null" >
+      ta_user_id = #{taUserId} and
+    </if>
+    uuid = #{uuid}
+    and community_id = #{communityId}
+    and social_type = #{socialType}
+  </select>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -29,4 +29,13 @@ public class Constant {
     
     /** 住户APP端待办 **/
     public static final Integer MODEL_TYPE_UPCOMING = 2;
+
+    /** 社交公告类型**/
+    public static final String ANNOUNCEMENT = "announcement";
+
+    /** 社交活动类型**/
+    public static final String ACTIVITY = "activity";
+
+    /** 社交二手租赁类型**/
+    public static final String LEASE = "lease";
 }