过度

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

@@ -15,7 +15,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

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpSocialView;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpSocialViewMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpSocialView record);
+
+    int insertSelective(TpSocialView record);
+
+    TpSocialView selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpSocialView record);
+
+    int updateByPrimaryKey(TpSocialView record);
+
+    Integer selectViewNum(TpSocialView tpSocialView);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpSocialView.java

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpSocialView {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer uuid;
+
+    private String socialType;
+
+    private Integer taUserId;
+
+    private String remark;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getSocialType() {
+        return socialType;
+    }
+
+    public void setSocialType(String socialType) {
+        this.socialType = socialType == null ? null : socialType.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpSocialView;
 
 /**
  * @author weichaochao
@@ -9,4 +10,5 @@ import com.community.huiju.model.TpAnnouncement;
  */
 public interface SocialServiceI {
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
+    void insertSocialView(TpSocialView tpSocialView);
 }

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

@@ -1,23 +1,54 @@
 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 io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 /**
- * @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;
+
     @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);
     }
+
+    @Override
+    public void insertSocialView(TpSocialView tpSocialView) {
+
+    }
 }

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

@@ -128,45 +128,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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpSocialViewMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpSocialView" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="social_type" property="socialType" jdbcType="VARCHAR" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, uuid, social_type, ta_user_id, remark, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpSocialView" >
+    insert into tp_social_view (id, community_id, uuid, 
+      social_type, ta_user_id, remark, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, 
+      #{socialType,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpSocialView" >
+    insert into tp_social_view
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="socialType != null" >
+        social_type,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpSocialView" >
+    update tp_social_view
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        social_type = #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpSocialView" >
+    update tp_social_view
+    set community_id = #{communityId,jdbcType=INTEGER},
+      uuid = #{uuid,jdbcType=INTEGER},
+      social_type = #{socialType,jdbcType=VARCHAR},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      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";
 }