完成 服务 首页显示

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.SocialServiceI;
@@ -31,7 +32,8 @@ public class SocialController {
 
     @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
     public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id){
         ResponseBean responseBean = new ResponseBean();
         TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId);
@@ -59,4 +61,31 @@ public class SocialController {
         responseBean.addSuccess(announcementList);
         return responseBean;
     }
+
+    @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区id"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "sum",value = "显示的条数")
+    })
+    @RequestMapping(value = "/announcement/announcementCarouselImg/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncement(@PathVariable(value = "communityId")Integer communityId ,@RequestParam("sum") Integer sum){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId,sum);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
+    
+    @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "活动标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
+        responseBean.addSuccess(activityList);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -56,4 +56,6 @@ public class UserController {
 
     }
 
+
+
 }

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

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpActivity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TpActivityMapper {
@@ -17,4 +20,6 @@ public interface TpActivityMapper {
     int updateByPrimaryKeySelective(TpActivity record);
 
     int updateByPrimaryKey(TpActivity record);
+    
+    List<TpActivity> getActivitys(@Param("communityId")Integer communityId,@Param("title") String title);
 }

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

@@ -17,9 +17,11 @@ 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);
 	
 	List<TpAnnouncement> getAnnouncements(@Param("communityId") Integer communityId,@Param("title") String title);
+
+    List<TpAnnouncement> getAnnouncement(@Param("communityId")Integer communityId, @Param("sum")Integer sum);
 }

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

@@ -0,0 +1,17 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpCarouselSetting;
+
+public interface TpCarouselSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpCarouselSetting record);
+
+    int insertSelective(TpCarouselSetting record);
+
+    TpCarouselSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpCarouselSetting record);
+
+    int updateByPrimaryKey(TpCarouselSetting record);
+}

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

@@ -1,7 +1,9 @@
 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);
 
@@ -14,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/dao/TpTransactionMapper.java

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransaction;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpTransactionMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -38,6 +38,8 @@ public class TpActivity {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    private String userName;
 
     public Integer getId() {
         return id;
@@ -182,4 +184,12 @@ public class TpActivity {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getUserName() {
+        return userName;
+    }
+    
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

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

@@ -0,0 +1,43 @@
+package com.community.huiju.model;
+
+public class TpCarouselSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String carouselType;
+
+    private Integer carouselNum;
+
+    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 String getCarouselType() {
+        return carouselType;
+    }
+
+    public void setCarouselType(String carouselType) {
+        this.carouselType = carouselType == null ? null : carouselType.trim();
+    }
+
+    public Integer getCarouselNum() {
+        return carouselNum;
+    }
+
+    public void setCarouselNum(Integer carouselNum) {
+        this.carouselNum = carouselNum;
+    }
+}

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

@@ -1,7 +1,8 @@
 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;
 
@@ -12,13 +13,32 @@ import java.util.List;
  */
 public interface SocialServiceI {
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
-	
+
 	/**
 	 * 分页获取公告列表
 	 * @param communityId
+	 * @param title
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
 	List<TpAnnouncement> getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
+
+	/**
+	 * 公告轮播图
+	 * @param communityId
+	 * @param sum
+	 * @return
+	 */
+	List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum);
+	
+	/**
+	 * 分页获取活动列表
+	 * @param communityId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
 }

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

@@ -27,6 +27,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	 */
 	@Override
 	public Map<String, Object> getMessageTotal(Integer communityId) {
+		//todo
 		Integer userId = 1;
 		return tpMessageMapper.getMessageTotal(userId,communityId);
 	}
@@ -41,6 +42,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	 */
 	@Override
 	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
+		//todo
 		Integer userId = 1;
 		pageNum = null == pageNum ? 1 : pageNum;
 		pageSize = null == pageSize ? 10 : pageSize;

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

@@ -1,33 +1,68 @@
 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;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpMessage;
 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
+     * @param title
      * @param pageNum
      * @param pageSize
      * @return
@@ -42,4 +77,35 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
         return announcementList;
     }
+    /**
+     * 根据当前小区ID查出轮播图
+     * @param communityId 当前小区ID
+     * @param sum 当前查询总数
+     * @return
+     */
+    @Override
+    public List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum) {
+        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId ,sum);
+        return listAnnouncement;
+    }
+
+    
+    /**
+     * 分页获取活动列表
+     * @param communityId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        pageNum = null == pageNum ? 1 : pageNum;
+        pageSize = null == pageSize ? 10 : pageSize;
+        //使用分页插件
+        PageHelper.startPage(pageNum, pageSize);
+        // 获取数据
+        List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
+        return activityList;
+    }
 }

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

@@ -7,6 +7,7 @@
     <result column="activity_title" property="activityTitle" jdbcType="VARCHAR" />
     <result column="activity_carousel_img" property="activityCarouselImg" jdbcType="VARCHAR" />
     <result column="activity_content" property="activityContent" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="sort" property="sort" jdbcType="INTEGER" />
     <result column="sign_up_count" property="signUpCount" jdbcType="INTEGER" />
     <result column="sign_up_max" property="signUpMax" jdbcType="INTEGER" />
@@ -246,4 +247,27 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getActivitys" resultMap="BaseResultMap">
+    SELECT
+      a.id,
+      a.activity_title,
+      a.activity_content,
+      a.create_date,
+      u.user_name AS user_name,
+      a.sort,
+      a.view_count,
+      a.sign_up_count
+  FROM
+      tp_activity a
+      LEFT JOIN tp_user u ON a.create_user = u.id
+      AND u.community_id = #{communityId,jdbcType=INTEGER}
+  WHERE
+      a.community_id = #{communityId,jdbcType=INTEGER}
+      AND ( a.STATUS = 1 OR a.STATUS = 3 )
+      AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
+  ORDER BY
+      a.sort,
+      a.create_date DESC
+  </select>
 </mapper>

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>
@@ -204,9 +171,16 @@
   WHERE
       a.community_id = #{communityId,jdbcType=INTEGER}
       AND ( a.STATUS = 1 OR a.STATUS = 3 )
-      and announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
   ORDER BY
       a.sort,
       a.create_date DESC
   </select>
+
+  <select id="getAnnouncement" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpAnnouncement">
+    select
+    <include refid="Base_Column_List" />
+    from tp_announcement
+    where community_id = #{communityId,jdbcType=INTEGER}  and status=1 limit  #{sum,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -0,0 +1,82 @@
+<?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.TpCarouselSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpCarouselSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="carousel_type" property="carouselType" jdbcType="VARCHAR" />
+    <result column="carousel_num" property="carouselNum" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, carousel_type, carousel_num
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting (id, community_id, carousel_type, 
+      carousel_num)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{carouselType,jdbcType=VARCHAR}, 
+      #{carouselNum,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="carouselType != null" >
+        carousel_type,
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num,
+      </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="carouselType != null" >
+        #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="carouselType != null" >
+        carousel_type = #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num = #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      carousel_type = #{carouselType,jdbcType=VARCHAR},
+      carousel_num = #{carouselNum,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -36,4 +36,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";
+
 }

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540265676" Name="smartCommunity" Objects="588" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>smartCommunity</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -3698,7 +3698,7 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>PhysicalDiagram_1</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -7920,13 +7920,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o113">
 <a:ObjectID>E1A7CF79-7543-479E-B18A-516582F0951D</a:ObjectID>
-<a:Name>tp_social_setting</a:Name>
-<a:Code>tp_social_setting</a:Code>
+<a:Name>tp_carousel_setting</a:Name>
+<a:Code>tp_carousel_setting</a:Code>
 <a:CreationDate>1539140281</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539141938</a:ModificationDate>
+<a:ModificationDate>1540286027</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>物业端社交设置表 （设置住户端公告和活动轮播数）</a:Comment>
+<a:Comment>轮播数设置表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o293">
@@ -7956,13 +7956,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o295">
 <a:ObjectID>6571CBA9-911D-4751-9D38-280D5CDC1641</a:ObjectID>
-<a:Name>social_type</a:Name>
-<a:Code>social_type</a:Code>
+<a:Name>carousel_type</a:Name>
+<a:Code>carousel_type</a:Code>
 <a:CreationDate>1539141779</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539142002</a:ModificationDate>
+<a:ModificationDate>1540285970</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>社交类型： announcement 表示公告  activity 表示活动</a:Comment>
+<a:Comment>轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner</a:Comment>
 <a:DataType>varchar(80)</a:DataType>
 <a:Length>80</a:Length>
 </o:Column>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540265676" Name="smartCommunity" Objects="588" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>smartCommunity</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -3698,7 +3698,7 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>PhysicalDiagram_1</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -7920,13 +7920,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o113">
 <a:ObjectID>E1A7CF79-7543-479E-B18A-516582F0951D</a:ObjectID>
-<a:Name>tp_social_setting</a:Name>
-<a:Code>tp_social_setting</a:Code>
+<a:Name>tp_carousel_setting</a:Name>
+<a:Code>tp_carousel_setting</a:Code>
 <a:CreationDate>1539140281</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539141938</a:ModificationDate>
+<a:ModificationDate>1540286027</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>物业端社交设置表 （设置住户端公告和活动轮播数）</a:Comment>
+<a:Comment>轮播数设置表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o293">
@@ -7956,13 +7956,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o295">
 <a:ObjectID>6571CBA9-911D-4751-9D38-280D5CDC1641</a:ObjectID>
-<a:Name>social_type</a:Name>
-<a:Code>social_type</a:Code>
+<a:Name>carousel_type</a:Name>
+<a:Code>carousel_type</a:Code>
 <a:CreationDate>1539141779</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539142002</a:ModificationDate>
+<a:ModificationDate>1540285970</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>社交类型： announcement 表示公告  activity 表示活动</a:Comment>
+<a:Comment>轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner</a:Comment>
 <a:DataType>varchar(80)</a:DataType>
 <a:Length>80</a:Length>
 </o:Column>