合并

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

@@ -36,6 +36,7 @@ public class TpAnnouncementController extends BaseController {
         ResponseBean tpAnnouncementList=tpAnnouncementService.tpAnnouncemenList(paramets,userElement.getCommunityId());
         return tpAnnouncementList;
     }
+
     @ApiOperation(value = "添加公告",nickname ="添加公告")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="announcementTitle:公告标题，" +
@@ -47,6 +48,7 @@ public class TpAnnouncementController extends BaseController {
         ResponseBean  addAnnouncement= tpAnnouncementService.addAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
         return addAnnouncement;
     }
+
     @ApiOperation(value = "查询公告详情",nickname ="查询公告详情")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id")})
@@ -56,4 +58,16 @@ public class TpAnnouncementController extends BaseController {
         return tpAnnouncement;
     }
 
+    @ApiOperation(value = "查询公告详情",nickname ="查询公告详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告id，announcementTitle:公告标题，" +
+                    "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
+    @RequestMapping(value="/updateAnnouncement",method = RequestMethod.POST)
+    public ResponseBean updateAnnouncement(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean tpAnnouncement= tpAnnouncementService.updateAnnouncement(paramets,userElement.getCommunityId(),userElement.getId());
+        return tpAnnouncement;
+    }
+
+
 }

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

@@ -32,4 +32,11 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
      * @return
      */
     ResponseBean announcementById(String paramets);
+
+    /**
+     * 添加公告
+      * @param paramets
+     * @return
+     */
+    ResponseBean updateAnnouncement(String paramets,Integer communityId,Integer userId);
 }

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

@@ -124,7 +124,6 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tdImages.setCreateUser(userId);
             imagesMapper.insert(tdImages);
         }
-            //添加内容图片
             return response;
     }
         @Override
@@ -148,4 +147,42 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             response.addSuccess(map);
             return response;
         }
+
+    @Override
+    public ResponseBean updateAnnouncement(String paramets,Integer communityId,Integer userId) {
+                  ResponseBean response= new ResponseBean();
+         TpAnnouncement tpAnnouncement = JSONObject.parseObject(paramets, TpAnnouncement.class);
+//                        String announcementimg=tpAnnouncement.getAnnouncementCarouselImg();
+//                        tpAnnouncement.setAnnouncementCarouselImg( "".equals(announcementimg)?null:announcementimg);
+                        tpAnnouncement.setCommunityId(communityId);
+                        tpAnnouncement.setCreateDate(new Date());
+                        tpAnnouncement.setUpdateUser(userId);
+                        tpAnnouncement.setCreateUser(userId);
+                        tpAnnouncement.setUpdateDate(new Date());
+                        tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
+
+        JSONObject parseObject = JSONObject.parseObject(paramets);
+        //内容包含多个图转数组
+        JSONArray contentImg = parseObject.getJSONArray("contentImg");
+        Integer tdImagesUuid = parseObject.getInteger("id");
+        String[] contentImgArray = contentImg.toArray(new String[]{});
+        //修改图片时删除原来图片
+        if (contentImg.size()!=0){
+        QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TdImages::getUuid,tdImagesUuid);
+        queryWrapper.lambda().eq(TdImages::getType,"announcement");
+        imagesMapper.delete(queryWrapper);
+
+        for (String img:contentImgArray){
+            TdImages tdImages = new TdImages();
+            tdImages.setImageUrl(img);
+            tdImages.setType("announcement");
+            tdImages.setUuid(tpAnnouncement.getId());
+            tdImages.setCreateTime(LocalDateTime.now());
+            tdImages.setCreateUser(userId);
+            imagesMapper.insert(tdImages);
+            }
+        }
+        return response;
+    }
 }

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

@@ -38,3 +38,19 @@ export function announcementById(data) {
     }
   })
 }
+// 修改公告
+export function updateannouncement(data) {
+  return request({
+    url: '/updateAnnouncement',
+    method: 'post',
+    data: {
+      id: data.id,
+      announcementTitle: data.announcementTitle,
+      announcementCarouselImg: data.announcementCarouselImg,
+      contentImg: data.contentImg,
+      announcementContent: data.announcementContent,
+      sort: data.sort,
+      status: data.status
+    }
+  })
+}

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

@@ -1,4 +1,4 @@
-import { listAnnouncement, addAnnouncement, announcementById } from '@/api/announcement'
+import { listAnnouncement, addAnnouncement, announcementById, updateannouncement } from '@/api/announcement'
 
 const announcement = {
   actions: {
@@ -37,6 +37,18 @@ const announcement = {
           reject(error)
         })
       })
+    },
+    /**
+     * 根据id查询公告
+     */
+    Updateannouncement({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        updateannouncement(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -38,7 +38,6 @@
         <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
       </el-form-item>
       <el-form-item>
-        <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>
@@ -78,7 +77,6 @@ export default {
     }
   },
     mounted() {
-      console.log("123")
     this.getById(this.$route.params.id)
   },
   methods: {
@@ -95,10 +93,11 @@ export default {
         if (valid) {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
+            loading.close()
             return 
           }
           this.ruleForm.status = status // 发布状态
-          this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
+          this.$store.dispatch('Updateannouncement', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({
                 message: res.message,
@@ -119,10 +118,8 @@ export default {
           return false
         }
       })
-    },
-    resetForm(formName,status) {
-      console.log(status)
-      this.submitForm(formName,status)
+       // 关闭加载框
+      loading.close()
     },
     handleAvatarSuccess(res, file) { // 轮播图上传回调
       this.ruleForm.announcementCarouselImg = res.data[0]
@@ -161,34 +158,17 @@ export default {
       console.log(value)
     },
     getById(id) { // 页面初始化后调用此方法根据ID获取活动信息
-     console.log("id：",id)
       this.ruleForm.id=this.$route.params.id
-      console.log("123id:",this.ruleForm.id)
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
-        const resData = res.data
-        this.ruleForm.announcementTitle=resData.tpAnnouncement.announcementTitle// 标题
-        this.ruleForm.announcementContent=resData.tpAnnouncement.announcementContent// 内容
-        this.Urlimage=resData.tpAnnouncement.announcementCarouselImg // 轮播图
-        this.ruleForm.sort=resData.tpAnnouncement.sort// 权重
+      const resData = res.data
+      this.ruleForm.announcementTitle=resData.tpAnnouncement.announcementTitle// 标题
+      this.ruleForm.announcementContent=resData.tpAnnouncement.announcementContent// 内容
+      this.Urlimage=resData.tpAnnouncement.announcementCarouselImg // 轮播图
+      this.ruleForm.sort=resData.tpAnnouncement.sort// 权重
         //多张图片进行遍历
-        const imgArr=resData.studentList
-        console.log("imgArr:",imgArr)
-        this.ruleForm.contentImg=imgArr// 内容图片
-        for (let i = 0; i < imgArr.length; i++) {
-          // this.contentImgList=resData.studentList[i].imageUrl
-          console.log("imgArr2.:",imgArr)
+        for (let i = 0; i < resData.studentList.length; i++) {
+          this.contentImgList.push({ url: resData.studentList[i].imageUrl })
         }
-        // console.log("this.ruleForm.contentImg",imgArr)
-        // const resData = res.data
-        // this.imageUrl = resData.info.activityCarouselImg
-        // this.ruleForm = resData.info
-
-        // const imgArr = resData.contentImg
-        // this.ruleForm.contentImg = imgArr
-        //多张图片进行遍历
-        // for (let i = 0; i < imgArr.length; i++) {
-        //   this.activityContentList.push({ url: imgArr[i] })
-        // }
       })
     }
   }