合并本地分支

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

@@ -1,7 +1,10 @@
 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;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author weichaochao
  * @Title: SocialController
@@ -42,5 +47,30 @@ public class SocialController {
         ResponseBean responseBean = new ResponseBean();
         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 = "/announcements/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
+        responseBean.addSuccess(announcementList);
+        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/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/TpTransactionMapper.java

@@ -0,0 +1,19 @@
+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);
+
+    int insert(TpTransaction record);
+
+    int insertSelective(TpTransaction record);
+
+    TpTransaction selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTransaction record);
+
+    int updateByPrimaryKey(TpTransaction record);
+}

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/TpAnnouncement.java

@@ -22,6 +22,8 @@ public class TpAnnouncement {
     private String status;
 
     private Integer createUser;
+    
+    private String userName;
 
     private Date createDate;
 
@@ -132,4 +134,12 @@ public class TpAnnouncement {
     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/TpTransaction.java

@@ -0,0 +1,175 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTransaction {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private String transactionTitle;
+
+    private String transactionContent;
+
+    private String transactionMatchImg1;
+
+    private String activityMatchImg3;
+
+    private String activityMatchImg4;
+
+    private String activityMatchImg5;
+
+    private String activityMatchImg6;
+
+    private Integer viewCount;
+
+    private String status;
+
+    private String type;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    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 getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getTransactionTitle() {
+        return transactionTitle;
+    }
+
+    public void setTransactionTitle(String transactionTitle) {
+        this.transactionTitle = transactionTitle == null ? null : transactionTitle.trim();
+    }
+
+    public String getTransactionContent() {
+        return transactionContent;
+    }
+
+    public void setTransactionContent(String transactionContent) {
+        this.transactionContent = transactionContent == null ? null : transactionContent.trim();
+    }
+
+    public String getTransactionMatchImg1() {
+        return transactionMatchImg1;
+    }
+
+    public void setTransactionMatchImg1(String transactionMatchImg1) {
+        this.transactionMatchImg1 = transactionMatchImg1 == null ? null : transactionMatchImg1.trim();
+    }
+
+    public String getActivityMatchImg3() {
+        return activityMatchImg3;
+    }
+
+    public void setActivityMatchImg3(String activityMatchImg3) {
+        this.activityMatchImg3 = activityMatchImg3 == null ? null : activityMatchImg3.trim();
+    }
+
+    public String getActivityMatchImg4() {
+        return activityMatchImg4;
+    }
+
+    public void setActivityMatchImg4(String activityMatchImg4) {
+        this.activityMatchImg4 = activityMatchImg4 == null ? null : activityMatchImg4.trim();
+    }
+
+    public String getActivityMatchImg5() {
+        return activityMatchImg5;
+    }
+
+    public void setActivityMatchImg5(String activityMatchImg5) {
+        this.activityMatchImg5 = activityMatchImg5 == null ? null : activityMatchImg5.trim();
+    }
+
+    public String getActivityMatchImg6() {
+        return activityMatchImg6;
+    }
+
+    public void setActivityMatchImg6(String activityMatchImg6) {
+        this.activityMatchImg6 = activityMatchImg6 == null ? null : activityMatchImg6.trim();
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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/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/TpMessageMapper.xml

@@ -259,5 +259,7 @@
         AND STATUS = 1
         AND advice_type = 1
         AND model_type = #{modelType,jdbcType=INTEGER}
+    ORDER BY
+    create_date DESC
   </select>
 </mapper>

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

@@ -0,0 +1,235 @@
+<?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.TpTransactionMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransaction" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR" />
+    <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR" />
+    <result column="transaction_match_img1" property="transactionMatchImg1" jdbcType="VARCHAR" />
+    <result column="activity_match_img3" property="activityMatchImg3" jdbcType="VARCHAR" />
+    <result column="activity_match_img4" property="activityMatchImg4" jdbcType="VARCHAR" />
+    <result column="activity_match_img5" property="activityMatchImg5" jdbcType="VARCHAR" />
+    <result column="activity_match_img6" property="activityMatchImg6" jdbcType="VARCHAR" />
+    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="type" property="type" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, transaction_title, transaction_content, transaction_match_img1, 
+    activity_match_img3, activity_match_img4, activity_match_img5, activity_match_img6, 
+    view_count, status, type, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_transaction
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_transaction
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransaction" >
+    insert into tp_transaction (id, community_id, ta_user_id, 
+      transaction_title, transaction_content, transaction_match_img1, 
+      activity_match_img3, activity_match_img4, activity_match_img5, 
+      activity_match_img6, view_count, status, 
+      type, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{transactionMatchImg1,jdbcType=VARCHAR}, 
+      #{activityMatchImg3,jdbcType=VARCHAR}, #{activityMatchImg4,jdbcType=VARCHAR}, #{activityMatchImg5,jdbcType=VARCHAR}, 
+      #{activityMatchImg6,jdbcType=VARCHAR}, #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR}, 
+      #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransaction" >
+    insert into tp_transaction
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="transactionTitle != null" >
+        transaction_title,
+      </if>
+      <if test="transactionContent != null" >
+        transaction_content,
+      </if>
+      <if test="transactionMatchImg1 != null" >
+        transaction_match_img1,
+      </if>
+      <if test="activityMatchImg3 != null" >
+        activity_match_img3,
+      </if>
+      <if test="activityMatchImg4 != null" >
+        activity_match_img4,
+      </if>
+      <if test="activityMatchImg5 != null" >
+        activity_match_img5,
+      </if>
+      <if test="activityMatchImg6 != null" >
+        activity_match_img6,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_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="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="transactionTitle != null" >
+        #{transactionTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="transactionContent != null" >
+        #{transactionContent,jdbcType=VARCHAR},
+      </if>
+      <if test="transactionMatchImg1 != null" >
+        #{transactionMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg3 != null" >
+        #{activityMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg4 != null" >
+        #{activityMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg5 != null" >
+        #{activityMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg6 != null" >
+        #{activityMatchImg6,jdbcType=VARCHAR},
+      </if>
+      <if test="viewCount != null" >
+        #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction" >
+    update tp_transaction
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="transactionTitle != null" >
+        transaction_title = #{transactionTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="transactionContent != null" >
+        transaction_content = #{transactionContent,jdbcType=VARCHAR},
+      </if>
+      <if test="transactionMatchImg1 != null" >
+        transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg3 != null" >
+        activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg4 != null" >
+        activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg5 != null" >
+        activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg6 != null" >
+        activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
+      </if>
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="type != null" >
+        type = #{type,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>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransaction" >
+    update tp_transaction
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      transaction_title = #{transactionTitle,jdbcType=VARCHAR},
+      transaction_content = #{transactionContent,jdbcType=VARCHAR},
+      transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
+      activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
+      activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
+      activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
+      activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      status = #{status,jdbcType=CHAR},
+      type = #{type,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>