做了公告列表

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

@@ -9,12 +9,12 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
     int deleteByPrimaryKey(Integer id);
 
-    @Override
     int insert(TpAnnouncement record);
 
     int insertSelective(TpAnnouncement record);
@@ -25,7 +25,9 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
 
     int updateByPrimaryKey(TpAnnouncement record);
 
-    IPage<TpAnnouncement> getAnnouncements(Page page ,@Param("communityId") Integer communityId);
+    IPage<TpAnnouncement> getAnnouncements(Page page ,@Param("record")TpAnnouncement record);
+
+    List<TpAnnouncement> getById( @Param("record")TpAnnouncement record);
 
     /**
      * 公告轮播图

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.User;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserMapper extends BaseMapper<User> {
+    String selectByIdCreateUserName(@Param("id") Integer id);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpAnnouncement.java

@@ -42,13 +42,13 @@ public class TpAnnouncement implements Serializable {
     /**0 是已作废 1 是已发布   2 是草稿 3 是已修改**/
     private String status;
 
-    /**创建人**/
+    /**创建人编号**/
     private Integer createUser;
 
     /**创建时间**/
     private Date createDate;
 
-    /**更新人**/
+    /**更新人编号**/
     private Integer updateUser;
 
     /**更新时间**/

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -1,21 +1,28 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.dao.UserMapper;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.model.User;
 import com.community.huiju.service.TpAnnouncementService;
+import com.community.huiju.vo.AnnouncementTable;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * version V1.0
@@ -26,11 +33,15 @@ import java.util.Map;
  * creat_time: 2018/12/28
  **/
 @Slf4j
+@Transactional
 @Service
 public class TpAnnouncementServiceImpl extends ServiceImpl<TpAnnouncementMapper, TpAnnouncement> implements TpAnnouncementService {
 
 @Autowired
 private  TpAnnouncementMapper tpAnnouncementMapper;
+
+    @Autowired
+    private UserMapper userMapper;
     @Override
     public ResponseBean tpAnnouncemenList(String paramets, Integer CommunityId) {
         ResponseBean responseBean = new ResponseBean();
@@ -39,19 +50,35 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         tpAnnouncement.setCommunityId(CommunityId);
         JSONObject jsonobject = JSONObject.parseObject(paramets);
         Integer pageNum = jsonobject.getInteger("pageNum");
+        Integer announcementNumber = jsonobject.getInteger("announcementNumber");
         Integer pageSize = jsonobject.getInteger("pageSize");
+        tpAnnouncement.setId(announcementNumber);
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
+        // page.setDesc("sort", "create_date");
+
+        IPage<TpAnnouncement> pageInfo = tpAnnouncementMapper.getAnnouncements(page,tpAnnouncement);
+        List<TpAnnouncement> tpAnnouncementList = pageInfo.getRecords();
 
-        IPage<TpAnnouncement> tpAnnouncementList= tpAnnouncementMapper.getAnnouncements(page,CommunityId);
+        List<AnnouncementTable> tableList = tpAnnouncementList.stream().map(e->{
+            AnnouncementTable announcementTable = new AnnouncementTable();
+            BeanUtils.copyProperties(e, announcementTable);
+            //创建人
+            String createUserName = userMapper.selectByIdCreateUserName(e.getUpdateUser());
+            //修改人
+            String updateDateName = userMapper.selectByIdCreateUserName(e.getCreateUser());
+            announcementTable.setCreateUserName(createUserName);
+            announcementTable.setUpdateDateName(updateDateName);
+            return announcementTable;
+        }).collect(Collectors.toList());
 
         Map<String, Object> map = Maps.newHashMap();
-        map.put("list", tpAnnouncementList.getRecords());
-        map.put("total", tpAnnouncementList.getTotal());
-        map.put("pageNum", tpAnnouncementList.getCurrent());
-        map.put("pageSize", tpAnnouncementList.getSize());
+        map.put("list", tableList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
         responseBean.addSuccess(map);
         return responseBean;
     }

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/AnnouncementTable.java

@@ -0,0 +1,21 @@
+package com.community.huiju.vo;
+
+import com.community.huiju.model.TpAnnouncement;
+import lombok.Data;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2018/12/29
+ **/
+@Data
+public class AnnouncementTable extends TpAnnouncement {
+    /**创建人**/
+    private String createUserName;
+
+    /**修改人**/
+    private String updateDateName;
+}

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

@@ -1,172 +1,36 @@
 <?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.TpAnnouncementMapper" >
-  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpAnnouncement" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="announcement_title" property="announcementTitle" jdbcType="VARCHAR" />
-    <result column="announcement_carousel_img" property="announcementCarouselImg" jdbcType="VARCHAR" />
-    <result column="announcement_content" property="announcementContent" jdbcType="VARCHAR" />
-    <result column="user_name" property="userName" jdbcType="VARCHAR" />
-    <result column="sort" property="sort" jdbcType="INTEGER" />
-    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
-    <result column="set_up_carousel" property="setUpCarousel" jdbcType="CHAR" />
-    <result column="status" property="status" 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, announcement_title, announcement_carousel_img, announcement_content,
     sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
     update_date
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from tp_announcement
-    where id = #{id,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from tp_announcement
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpAnnouncement" >
-    insert into tp_announcement (id, community_id, announcement_title,
-      announcement_carousel_img, announcement_content,
-      sort, view_count, set_up_carousel,
-      status, create_user, create_date,
-      update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{announcementTitle,jdbcType=VARCHAR},
-      #{announcementCarouselImg,jdbcType=VARCHAR}, #{announcementContent,jdbcType=VARCHAR},
-      #{sort,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, #{setUpCarousel,jdbcType=CHAR},
-      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpAnnouncement" >
-    insert into tp_announcement
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="communityId != null" >
-        community_id,
-      </if>
-      <if test="announcementTitle != null" >
-        announcement_title,
-      </if>
-      <if test="announcementCarouselImg != null" >
-        announcement_carousel_img,
-      </if>
-      <if test="announcementContent != null" >
-        announcement_content,
-      </if>
-      <if test="sort != null" >
-        sort,
-      </if>
-      <if test="viewCount != null" >
-        view_count,
-      </if>
-      <if test="setUpCarousel != null" >
-        set_up_carousel,
-      </if>
-      <if test="status != null" >
-        status,
-      </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="announcementTitle != null" >
-        #{announcementTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="announcementCarouselImg != null" >
-        #{announcementCarouselImg,jdbcType=VARCHAR},
-      </if>
-      <if test="announcementContent != null" >
-        #{announcementContent,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null" >
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="viewCount != null" >
-        #{viewCount,jdbcType=INTEGER},
-      </if>
-      <if test="setUpCarousel != null" >
-        #{setUpCarousel,jdbcType=CHAR},
-      </if>
-      <if test="status != null" >
-        #{status,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" >
-    update tp_announcement
-    <set >
-      <if test="viewCount != null" >
-        view_count = #{viewCount,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpAnnouncement" >
-    update tp_announcement
-    set community_id = #{communityId,jdbcType=INTEGER},
-      announcement_title = #{announcementTitle,jdbcType=VARCHAR},
-      announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
-      announcement_content = #{announcementContent,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      view_count = #{viewCount,jdbcType=INTEGER},
-      set_up_carousel = #{setUpCarousel,jdbcType=CHAR},
-      status = #{status,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>
-
-  <select id="getAnnouncements" resultType="com.community.huiju.model.TpAnnouncement" parameterType="map">
+  <select id="getAnnouncements" resultType="com.community.huiju.model.TpAnnouncement">
     SELECT
-    <include refid="Base_Column_List" />
+    id, community_id, announcement_title, announcement_carousel_img, announcement_content,
+    sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
+    update_date
    FROM
-      tp_announcement WHERE  community_id = #{communityId,jdbcType=INTEGER}
-
+      tp_announcement
+      <where>
+        <if test="record.id != null and record.id != ''" >
+          AND id =  #{record.id,jdbcType=INTEGER}
+        </if>
+        <if test="record.announcementTitle != null and record.announcementTitle != ''" >
+          AND announcement_title like concat('%',#{record.announcementTitle,jdbcType=VARCHAR},'%')
+        </if>
+          AND community_id = #{record.communityId,jdbcType=INTEGER}
+      </where>
   </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  order by create_date DESC limit  #{sum,jdbcType=INTEGER}
+  <select id="getById" resultType="com.community.huiju.model.TpAnnouncement">
+    SELECT
+    id, community_id, announcement_title, announcement_carousel_img, announcement_content,
+    sort, view_count, set_up_carousel, status, create_user, create_date, update_user,
+    update_date
+    FROM
+    tp_announcement
+    WHERE community_id = #{record.communityId,jdbcType=INTEGER}
   </select>
+
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -1,5 +1,12 @@
 <?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.UserMapper">
+    <select id="selectByIdCreateUserName" parameterType="int" resultType="string">
+        SELECT
+         user_name
+        FROM
+        tp_user
+        WHERE id=#{id,jdbcType=INTEGER}
+    </select>
 
 </mapper>

VUECODE/smart-property-manage/src/api/announcement.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+// 获取当前小区的所有公告
+export function listAnnouncement(data) {
+  return request({
+    url: '/tpAnnouncement',
+    method: 'post',
+    data: {
+      announcementNumber: data.announcementNumber,
+      announcementTitle: data.announcementTitle,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/store/index.js

@@ -7,6 +7,7 @@ import community from './modules/community'
 import trunkIndex from './modules/trunkIndex'
 import batchImport from './modules/batchImport'
 import getters from './getters'
+import announcement from './modules/announcement'
 import buildingOwnerInfo from './modules/buildingOwnerInfo'
 
 Vue.use(Vuex)
@@ -19,7 +20,8 @@ const store = new Vuex.Store({
     banner,
     trunkIndex,
     batchImport,
-    buildingOwnerInfo
+    buildingOwnerInfo,
+    announcement
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/announcement.js

@@ -0,0 +1,20 @@
+import { listAnnouncement } from '@/api/announcement'
+
+const announcement = {
+  actions: {
+    /**
+     *获取当前小区的所有公告
+     */
+    ListAnnouncement({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        listAnnouncement(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default announcement

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -143,7 +143,7 @@ export default {
     handleSelectionChange(data) {
 
     },
-	search(){
+	  search() {
       this.listQuery.pageNum = 1
       this.dataQuery()
     },
@@ -151,8 +151,8 @@ export default {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
       this.listQuery.ownerName = ''
-      this.listQuery.ownerTel = ''
-	  this.listQuery.verifyStatus= ''
+      this.listQuery.ownerTel =''
+	  this.listQuery.verifyStatus=''
       this.dataQuery()
     },
     open3(ownerTel, verifyStatus) {

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -1,13 +1,175 @@
 
 <template>
-  <div>公告</div>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="公告编号">
+        <el-input v-model.trim="listQuery.announcementNumber" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="公告编号" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="公告标题" >
+        <el-input v-model.trim="listQuery.announcementTitle" placeholder="公告标题" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="primary">添加</el-button>
+      <el-button type="warning">修改</el-button>
+      <el-button type="danger">作废</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listAnnouncement"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="编号" align="center"/>
+      <el-table-column prop="announcementTitle" label="标题" align="center" />
+      <el-table-column prop="viewCount" label="查看数量" align="center"/>
+      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="status" label="状态" align="center"/>
+      <el-table-column prop="createDate" label="发布时间" align="center"/>
+      <el-table-column prop="createUserName" label="发布人" align="center"/>
+      <el-table-column prop="updateDate" label="修改时间" align="center" />
+      <el-table-column prop="updateDateName" label="修改人" align="center"/>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
 </template>
+
 <script>
+import { mapActions } from 'vuex'
+
 export default {
-  name: 'Index'
+  data() {
+    return {
+      listQuery: {
+        number: '',
+        announcementTitle: '',
+        viewCount: '',
+        sort: '',
+        status: '',
+        createDate: '',
+        createUser: '',
+        updateUser: '',
+        updateDate: '',
+        createUserName: '',
+        updateDateName: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      listAnnouncement: [],
+      buildingList: [],
+      unitList: [],
+      levelList: [],
+      roomNoList: [],
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    // 获取数据
+    this.dataQuery()
+  },
+  methods: {
+    ...mapActions('listAnnouncement', [
+      'BserPassCertification'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageNum = 1
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('ListAnnouncement', this.listQuery).then((res) => {
+        const resData = res.data
+        this.listAnnouncement = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = 10
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListAnnouncement')
+      })
+    },
+    handleSelectionChange(data) {
+
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.ownerName = ''
+      this.listQuery.announcementNumber= ''
+      this.listQuery.announcementTitle= ''
+      this.dataQuery()
+    }
+  }
 }
 </script>
 
 <style scoped>
-
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
 </style>
+