合并

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

@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -304,6 +305,23 @@ public class SocialController extends BaseController {
         ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
         return response;
     }
+    
+    @ApiOperation(value = "举报二手交易帖子", notes = "举报二手交易帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionId:二手交易帖子id, reportReasonId:举报原因id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/transaction/report/{communityId}", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean reportTransaction(@PathVariable("communityId") Integer communityId,@RequestBody String paramets, HttpSession session)throws IOException{
+        
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.reportTransaction(userId, communityId,paramets);
+        return response;
+    }
 
     @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
     @ApiImplicitParams({
@@ -374,4 +392,13 @@ public class SocialController extends BaseController {
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }
+    
+    @ApiOperation(value = "获取举报原因列表", notes = "获取举报原因列表")
+    @RequestMapping(value = "/reports", method = RequestMethod.GET)
+    public ResponseBean getReportReasons() {
+        ResponseBean responseBean = new ResponseBean();
+        List<Map<String,Object>> reportList = socialServiceI.getReportReasons();
+        responseBean.addSuccess(reportList);
+        return responseBean;
+    }
 }

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface TpTransactionMapper {
@@ -27,4 +28,8 @@ public interface TpTransactionMapper {
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 
     TpTransaction getById(@Param("id")Integer id);
+	
+	List<Map<String, Object>> getReportReasons();
+    
+    int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
 }

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

@@ -29,6 +29,11 @@ public class TpTransaction {
     private Date updateDate;
 
     private List<String> imgList;
+    
+    /**
+     * 是否被举报 1是被举报 0或null是没被举报
+     */
+    private String isReported;
 
     private  Integer roleId;
 
@@ -150,4 +155,12 @@ public class TpTransaction {
     public void setImgList(List<String> imgList) {
         this.imgList = imgList;
     }
+    
+    public String getIsReported() {
+        return isReported;
+    }
+    
+    public void setIsReported(String isReported) {
+        this.isReported = isReported;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.community.huiju.model.*;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -151,4 +152,19 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean deleteransaction(Integer id,Integer userid);
+	
+	/**
+	 * 获取举报原因列表
+	 * @return
+	 */
+	List<Map<String, Object>> getReportReasons();
+	
+	/**
+	 * 举报二手交易帖子
+	 * @param userId
+	 * @param communityId
+	 * @param paramets
+	 * @return
+	 */
+	ResponseBean reportTransaction(Integer userId,Integer communityId, String paramets);
 }

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

@@ -11,6 +11,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,7 @@ import java.util.stream.Collectors;
  * @date 2018/10/23
  */
 @Service("SocialService")
+@Transactional
 public class SocialServiceImpl implements SocialServiceI {
 
     @Autowired
@@ -445,8 +447,52 @@ public class SocialServiceImpl implements SocialServiceI {
         }
         return responseBean;
         }
-
-
+    
+    /**
+     * 获取举报原因列表
+     *
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getReportReasons() {
+        return tpTransactionMapper.getReportReasons();
+    }
+    
+    /**
+     * 举报二手交易帖子
+     *
+     * @param userId
+     * @param paramets
+     * @return
+     */
+    @Override
+    public ResponseBean reportTransaction(Integer userId, Integer communityId, String paramets) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        Integer transactionId = jsonObject.getInteger("transactionId");
+        String reportReasonId = jsonObject.getString("reportReasonId");
+        //校验举报的帖子存不存在
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(transactionId,communityId);
+        if (null == tpTransaction){
+            responseBean.addError("举报的交易不存在");
+            return responseBean;
+        }
+        //插入举报表
+        tpTransactionMapper.saveReportReason(userId,communityId,transactionId,reportReasonId);
+        //更新交易表的举报状态为被举报
+        TpTransaction record = new TpTransaction();
+        record.setId(transactionId);
+        record.setIsReported("1");
+        Integer size = tpTransactionMapper.updateByPrimaryKeySelective(record);
+        if (size > 0){
+            responseBean.addSuccess(size);
+            return responseBean;
+        }
+        responseBean.addError("举报出错");
+        return responseBean;
+    }
+    
+    
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分

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

@@ -156,6 +156,9 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="viewCount != null" >
         view_count = #{viewCount,jdbcType=INTEGER},
       </if>
+      <if test="isReported != null and isReported !=''" >
+        is_reported = #{isReported,jdbcType=CHAR},
+      </if>
       <if test="status != null" >
         status = #{status,jdbcType=CHAR},
       </if>
@@ -238,4 +241,15 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     from tp_transaction
     where id = #{id,jdbcType=INTEGER} and status = 1
   </select>
+
+  <select id="getReportReasons" resultType="java.util.Map">
+    SELECT id,reason FROM sys_report_reason ORDER BY sort
+  </select>
+
+  <insert id="saveReportReason">
+    insert into tp_transaction_report (community_id, transaction_id,
+      report_reason_id, reporter_id)
+    values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
+      #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
+  </insert>
 </mapper>

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/building/batch/batchImport.vue

@@ -4,7 +4,7 @@
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
         <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
-          <el-button style="margin-left: 10px;" size="large" type="primary"><a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771">下载模板</a></el-button>
+          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>

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] })
-        // }
       })
     }
   }