合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java

@@ -58,7 +58,7 @@ public class TpAnnouncementController extends BaseController {
         return tpAnnouncement;
     }
 
-    @ApiOperation(value = "查询公告详情",nickname ="查询公告详情")
+    @ApiOperation(value = "修改公告",nickname ="修改公告")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id，announcementTitle:公告标题，" +
                     "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
@@ -69,5 +69,15 @@ public class TpAnnouncementController extends BaseController {
         return tpAnnouncement;
     }
 
+    @ApiOperation(value = "批量删除公告",nickname ="批量删除公告")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id(多个)")})
+    @RequestMapping(value="/deleteAnnouncement",method = RequestMethod.POST)
+    public ResponseBean deleteAnnouncement(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean tpAnnouncement= tpAnnouncementService.deleteAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+        return tpAnnouncement;
+    }
+
 
 }

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

@@ -17,13 +17,11 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
 
     int insert(TpAnnouncement record);
 
-    int insertSelective(TpAnnouncement record);
-
     TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
 
     int updateByPrimaryKeySelective(@Param("id") Integer id, @Param("viewCount") Integer viewCount);
 
-    int updateByPrimaryKey(TpAnnouncement record);
+    int updateTpAnnouncement(TpAnnouncement record);
 
     IPage<TpAnnouncement> getAnnouncements(Page page ,@Param("record")TpAnnouncement record);
 

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

@@ -39,4 +39,13 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
      * @return
      */
     ResponseBean updateAnnouncement(String paramets,Integer communityId,Integer userId);
+
+    /**
+     * 批量删除公告
+      * @param paramets
+     * @param communityId
+     * @param id
+     * @return
+     */
+    ResponseBean deleteAnnouncement(String paramets, Integer communityId, Integer id);
 }

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

@@ -185,4 +185,23 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         }
         return response;
     }
+
+    @Override
+    public ResponseBean deleteAnnouncement(String paramets, Integer communityId, Integer userId) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(paramets);
+
+        JSONArray announcementIdId = parseObject.getJSONArray("id");
+        Integer[] announcementIdArray = announcementIdId.toArray(new Integer[]{});
+        for (Integer id : announcementIdArray) {
+            TpAnnouncement tpAnnouncement = new TpAnnouncement();
+            tpAnnouncement.setId(id);
+            tpAnnouncement.setCommunityId(communityId);
+            tpAnnouncement.setStatus("0");
+            tpAnnouncement.setUpdateUser(userId);
+            tpAnnouncement.setUpdateDate(new Date());
+            tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
+        }
+        return response;
+    }
 }

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

@@ -32,5 +32,46 @@
     tp_announcement
     WHERE community_id = #{record.communityId,jdbcType=INTEGER}
   </select>
-
+  <update id="updateTpAnnouncement" parameterType="com.community.huiju.model.TpAnnouncement" >
+    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 and announcementCarouselImg !=''">
+        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>
 </mapper>

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

@@ -54,3 +54,13 @@ export function updateannouncement(data) {
     }
   })
 }
+// 批量删除(data)里面是单子字段的多个id
+export function deleteAnnouncement(data) {
+  return request({
+    url: '/deleteAnnouncement',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
+}

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

@@ -157,6 +157,13 @@ export const constantRouterMap = [
         name: 'signUp-info',
         hidden: true,
         meta: { title: '活动报名人', icon: 'table' }
+      },
+      {     
+        path: '/announcement',
+        component: () => import('@/views/social/announcement/details'),
+        name: 'contentParticulars-details',
+        hidden: true,
+        meta: { title: '编辑公告', icon: 'table' }
       }
     ]
   },

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

@@ -1,4 +1,4 @@
-import { listAnnouncement, addAnnouncement, announcementById, updateannouncement } from '@/api/announcement'
+import { listAnnouncement, addAnnouncement, announcementById, updateannouncement, deleteAnnouncement } from '@/api/announcement'
 
 const announcement = {
   actions: {
@@ -49,6 +49,18 @@ const announcement = {
           reject(error)
         })
       })
+    },
+    /**
+     * 批量删除
+     */
+    DeleteAnnouncement({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        deleteAnnouncement(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -1,10 +1,10 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="活动标题" prop="announcementTitle">
+      <el-form-item label="公告标题" prop="announcementTitle">
         <el-input v-model="ruleForm.announcementTitle" placeholder="15字以内"/>
       </el-form-item>
-      <el-form-item label="活动轮播图" prop="announcementCarouselImg">
+      <el-form-item label="公告轮播图" prop="announcementCarouselImg">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -16,10 +16,10 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
       </el-form-item>
-      <el-form-item label="活动详细描述">
-        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      <el-form-item label="公告详细描述">
+        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容"/>
       </el-form-item>
-      <el-form-item label="活动配图">
+      <el-form-item label="公告配图">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -62,11 +62,11 @@ export default {
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
       rules: {
         announcementTitle: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { required: true, message: '请输入公告名称', trigger: 'blur' },
           { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '活动详细描述', trigger: 'blur' }
+          { required: true, message: '公告详细描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
@@ -87,7 +87,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
             return 
           }
           this.ruleForm.status = status // 发布状态
@@ -147,7 +147,6 @@ export default {
     handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
       const resImg = response.data[0]
       this.ruleForm.contentImg.push(resImg)
-      console.log('上传活动配图成功时回调!')
     },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value

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

@@ -0,0 +1,151 @@
+<template>
+  <div id="root">
+    <span class="activityTile">{{ ruleForm.activityTitle }}</span>
+    <img :src="ruleForm.activityCarouselImg" width="700" height="500">
+    <div class="activityContext">
+      {{ ruleForm.activityContent }}
+    </div>
+    <div class="activityContextImg">
+       <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
+    </div>
+    <div class="progress">
+      <div class="text-progress">
+        <span class="people-number">已报名人数 {{ ruleForm.signUpCount }}</span>
+        <div class="outer-layer"/>
+        <div class="inner-layer"/>
+      </div>
+      <div class="circular"/>
+      <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
+      <el-button type="primary" style="float: left;">查看报名名单</el-button>
+    </div>
+    <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
+    <div class="bom-button">
+      <el-button type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      asOfdate: '2018/10/10 23:59:59',
+      ruleForm: {
+        id: '',
+        activityTitle: '',
+        activityCarouselImg: '', // 轮播图
+        activityContent: '', // 活动内容详细
+        contentImg: [], // 活动内容配图
+        signUpCount: '', // 报名人数统计
+        signUpMax: '', //  活动人数上限
+        registrationEndTime: '', // 报名活动结束时间
+        sort: 1, // 权重
+        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+      }
+    }
+  },
+  mounted() {
+    this.getById(this.$route.params.id)
+    console.log("this.$route.params.id",this.$route.params.id)
+  },
+  methods: {
+    getById(id) { // 根据ID获取活动信息
+    console.log(123)
+    console.log(id)
+      this.$store.dispatch('ActivityById', id).then((res) => {
+        const resData = res.data
+        this.ruleForm = resData.info
+        this.ruleForm.contentImg = resData.contentImg
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    ediActivity() { // 修改活动
+      this.$router.push({ name: 'activity-edi', params: { id: this.ruleForm.id }})
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+  flex-flow: column;
+  width: 700px;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.activityTile{
+  text-align: center;
+  font-size: 30px;
+  margin-bottom: 10px;
+}
+.activityContext{
+  margin-top: 20px;
+  margin-bottom: 20px;
+  font-size: 20px;
+  justify-items: center;
+}
+.progress {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.text-progress {
+  width: 500px;
+  float: left;
+  align-content: center;
+  position: absolute;
+  margin-top: 12px;
+}
+.people-number {
+  position: relative;
+  margin-left: 180px;
+}
+.outer-layer {
+  background-color: gainsboro;
+  height: 3px;
+  width: 450px;
+  margin-top: -10px;
+  position: relative;
+}
+.inner-layer {
+  background-color: aquamarine;
+  height: 6px;
+  width: 100px;
+  position: relative;
+  margin-top: -4px;
+}
+.circular {
+  border: 1px #001528 solid;
+  border-radius: 10px;
+  /*background-color: chartreuse;*/
+  width: 20px;
+  height: 20px;
+  position: relative;
+  margin-left: 452px;
+  margin-top: 11px;
+  float: left;
+}
+.people-limit {
+  margin-top: 13px;
+}
+.bom-button{
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 100px;
+}
+</style>

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

@@ -1,10 +1,10 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-      <el-form-item label="活动标题" prop="announcementTitle">
+      <el-form-item label="公告标题" prop="announcementTitle">
         <el-input v-model="ruleForm.announcementTitle" placeholder="15字以内"/>
       </el-form-item>
-      <el-form-item label="活动轮播图" prop="announcementCarouselImg">
+      <el-form-item label="公告轮播图" prop="announcementCarouselImg">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -16,10 +16,10 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
       </el-form-item>
-      <el-form-item label="活动详细描述">
-        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+      <el-form-item label="公告详细描述">
+        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容"/>
       </el-form-item>
-      <el-form-item label="活动配图">
+      <el-form-item label="公告配图">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -60,15 +60,15 @@ export default {
       },
       contentImgList: [],
       Urlimage: '', // 轮播图预览
-      dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
-      dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
+      dialogVisible: false, // 公告配图, 默认不显示 (以单张为单位)
+      dialogImageUrl: '', // 公告配图, 图片链接 (以单张为单位)
       rules: {
         announcementTitle: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { required: true, message: '请输入公告名称', trigger: 'blur' },
           { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '活动详细描述', trigger: 'blur' }
+          { required: true, message: '公告详细描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
@@ -92,7 +92,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
             loading.close()
             return 
           }

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

@@ -16,7 +16,7 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger">作废</el-button>
+      <el-button type="danger" @click="deleteAnnouncement">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -30,10 +30,19 @@
         type="selection"
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
-      <el-table-column prop="announcementTitle" label="标题" align="center" />
+      <el-table-column prop="announcementTitle" label="标题" align="center" >
+        <template slot-scope="scope"><a><span @click="clickTitle(scope.row.id)" style="text-decoration: underline; color: blue ">{{ scope.row.announcementTitle }}</span></a></template>
+      </el-table-column>
       <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="status" label="状态" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status==0">{{ '已作废' }}</span>
+          <span v-if="scope.row.status==1">{{ '已发布' }}</span>
+          <span v-if="scope.row.status==2">{{ '草稿' }}</span>
+          <span v-if="scope.row.status==3">{{ '已修改' }}</span>
+        </template>
+      </el-table-column>   
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="createUserName" label="发布人" align="center"/>
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
@@ -59,6 +68,7 @@ export default {
   data() {
     return {
       listQuery: {
+        id: '',
         number: '',
         announcementTitle: '',
         viewCount: '',
@@ -102,16 +112,6 @@ export default {
       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) => {
@@ -160,6 +160,22 @@ export default {
       }
       this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
      },
+     deleteAnnouncement(){
+      const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('DeleteAnnouncement',ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+     },
+    clickTitle(id){
+      console.log("id:",id)
+      this.$router.push({ name: 'contentParticulars-details' , params: { id: id }})
+    },
     formatDate(val) {
       var value = new Date(val)
       var year = value.getFullYear()