Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/pom.xml

@@ -195,6 +195,12 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>5.1.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

CODE/smart-community/property-api/pom.xml

@@ -203,6 +203,12 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.56</version>
 		</dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.1-jre</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

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

@@ -116,7 +116,8 @@ public class TransactionController extends BaseController {
 
 	@ApiOperation(value = "二手评论列表",nickname ="二手评论列表")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id" )})
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，replyTaUserName：被回复人，taUserName：回复人，" +
+					"status:（0回复我的,1回复全部物业人员的,2全部物业人员回复的,3话题发起人回复的）,createDate:时间" )})
 	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
 	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
 	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpSession session){
@@ -124,4 +125,13 @@ public class TransactionController extends BaseController {
 		ResponseBean  transactionReplyList= transactionService.transactionReplyList(paramets,userElement.getCommunityId(),userElement.getId());
 		return transactionReplyList;
 	}
+
+	@ApiOperation(value = "删除二手帖子评论",nickname ="删除二手帖子评论")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
+	@RequestMapping(value="/deleteReply",method = RequestMethod.POST)
+	public ResponseBean deleteReply(@RequestBody String paramets, HttpSession session){
+		ResponseBean  transactionsUpdata= transactionService.deleteReply(paramets);
+		return transactionsUpdata;
+	}
 }

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

@@ -5,6 +5,7 @@ import com.community.huiju.model.TransactionReply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,5 +24,5 @@ public interface TransactionReplyMapper extends BaseMapper<TransactionReply> {
      * @param id
      * @return
      */
-    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id,@Param("userID") Integer userID,@Param("status") Integer status);
+    List<TransactionReply> transactionReplyList(Page page, @Param("id") Integer id, @Param("userID") Integer userID, @Param("status") Integer status,@Param("taUserName") String taUserName, @Param("createDate") Date createDate, @Param("replyTaUserName") String replyTaUserName);
 }

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

@@ -66,4 +66,11 @@ public interface ITransactionService extends IService<TpTransaction> {
 	 * @return
 	 */
 	ResponseBean transactionReplyList(String paramets, Integer communityId, Integer id);
+
+	/**
+	 * 删除二手帖子评论
+	 * @param paramets
+	 * @return
+	 */
+    ResponseBean deleteReply(String paramets);
 }

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

@@ -251,14 +251,20 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject object= JSONObject.parseObject(paramets);
 		Integer id = object.getInteger("id");
+		/*回复*/
+		String replyTaUserName = object.getString("replyTaUserName");
+		/*被回复*/
+		String taUserName = object.getString("taUserName");
 		Integer status = object.getInteger("status");
+		Date createDate = object.getDate("createDate");
+
 		Integer pageNum = object.getInteger("pageNum");
 		Integer pageSize = object.getInteger("pageSize");
 		Page<TransactionReply> page = new Page<>();
 		page.setSize(pageSize == null ? 10 : pageSize);
 		page.setCurrent(pageNum == null ? 1 : pageNum);
 		// 分页查询
-		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,userID,status);
+		List<TransactionReply> TransactionReplylList = transactionReplyMapper.transactionReplyList(page,id,userID,status,taUserName,createDate,replyTaUserName);
 		//查询帖子评论所带图片
 
 		for (TransactionReply transactionReply:TransactionReplylList){
@@ -282,4 +288,17 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+
+	@Override
+	public ResponseBean deleteReply(String paramets) {
+		ResponseBean responseBean= new ResponseBean();
+		 JSONObject object= JSONObject.parseObject(paramets);
+	 	JSONArray array= object.getJSONArray("id");
+	 	Integer[]	Reply= array.toArray(new Integer[]{});
+	 	for (Integer id:Reply){
+			transactionReplyMapper.deleteById(id);
+		}
+	 	responseBean.addSuccess("成功");
+		return responseBean;
+	}
 }

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

@@ -36,6 +36,17 @@
     AND re.release_identity in(1,2)
     AND re.ta_user_id = tr.create_user
     </if>
-    </select>
 
+    <if test="taUserName != null and taUserName !=''">
+        and re.ta_user_name like concat('%',#{ taUserName,jdbcType=VARCHAR},'%')
+    </if>
+
+    <if test="replyTaUserName != null and replyTaUserName !=''">
+        and re.reply_ta_user_name like concat('%',#{ replyTaUserName,jdbcType=VARCHAR},'%')
+    </if>
+
+    <if test="createDate != null">
+        and  date_format(re.create_date,'%Y%m%d')=date_format(#{createDate},'%Y%m%d')
+    </if>
+    </select>
 </mapper>

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

@@ -23,7 +23,7 @@ export function updateTransactionById(id) {
     method: 'post'
   })
 }
-
+// 帖子列表
 export function transactionsList(data) {
   return request({
     url: '/transactions',
@@ -38,7 +38,7 @@ export function transactionsList(data) {
     }
   })
 }
-
+// 添加二手帖子
 export function transactionsAdd(data) {
   return request({
     url: '/transactions/add',
@@ -55,7 +55,7 @@ export function transactionsAdd(data) {
     }
   })
 }
-
+// 编辑二手帖子
 export function transactionsEdit(data) {
   return request({
     url: '/transactions/updata',
@@ -72,6 +72,7 @@ export function transactionsEdit(data) {
     }
   })
 }
+// 删除二手帖子
 export function transactionsDelete(data) {
   console.log('1111')
   console.log(data)
@@ -83,18 +84,42 @@ export function transactionsDelete(data) {
     }
   })
 }
-
+// 评论列表
 export function transactionReplyList(data) {
   return request({
     url: '/transactionReplyList',
     method: 'post',
     data: {
-      transactionTitle: data.transactionTitle,
       id: data.id,
-      userName: data.userName,
+      replyTaUserName: data.replyTaUserName,
+      taUserName: data.taUserName,
       status: data.status,
       pageNum: data.pageNum,
-      pageSize: data.pageSize
+      pageSize: data.pageSize,
+      createDate: data.dataValue
+    }
+  })
+}
+// 删除评论
+export function deleteReply(data) {
+  console.log(data)
+  return request({
+    url: '/deleteReply',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
+}
+// 添加评论
+export function transactionReplyAdd(data) {
+  return request({
+    url: '/TransactionReply/add',
+    method: 'post',
+    data: {
+      id: data.id,
+      contentImg: data.contentImg,
+      replyContent: data.replyContent
     }
   })
 }

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

@@ -1,4 +1,4 @@
-import { fetchList, transactionById, updateTransactionById, transactionsList, transactionsAdd, transactionsEdit, transactionsDelete, transactionReplyList } from '@/api/transaction'
+import { fetchList, transactionById, updateTransactionById, transactionsList, transactionsAdd, transactionsEdit, transactionsDelete, transactionReplyList, deleteReply, transactionReplyAdd } from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -92,6 +92,24 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    DeleteReply({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        deleteReply(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    TransactionReplyAdd({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        transactionReplyAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -34,7 +34,7 @@
       </el-form-item>
     </el-form>
     <div class="button">
-      <el-button type="danger" >作废</el-button>
+      <el-button type="danger" @click="deleteReply">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -57,7 +57,7 @@
       <el-table-column prop="replyTaUserName" label="被回复人" align="center"/>
       <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
       <el-table-column prop="viewCount" label="操作" align="center">
-      <template slot-scope="scope"><a><span style="color: #63B8FF" @click="TransactionReplyAdd(scope.row.id)">{{ '回复此回复' }}</span></a></template>
+      <template slot-scope="scope"><a><span style="color: #63B8FF" @click="TransactionReplyOpen(scope.row.id)">{{ '回复此回复' }}</span></a></template>
       </el-table-column>  
     </el-table>
     <div class="block">
@@ -70,6 +70,33 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
+    <el-dialog title="回复发帖人" :visible.sync="listQuery.dialogFormVisible" :show-close="listQuery.close">
+      <el-form :model="listQuery">
+        <el-form-item label="活动名称" :label-width="listQuery.formLabelWidth">
+          <textarea v-model="listQuery.textContent" placeholder="回复TA或向TA提问" class="textarea-inherit" id="message_textarea" rows="8"></textarea> 
+        </el-form-item>
+        <el-form-item>
+        <el-upload
+          :limit="8"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessContentImg"
+          :file-list="contentImgList"
+          name="uploadFiles"
+          action="http://106.14.20.193:8086/property-api/uploadimage"
+          list-type="picture-card">
+          <i class="el-icon-plus"/>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img :src="dialogImageUrl" width="100%" alt="">
+        </el-dialog>
+      </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="TransactionReplyOff">取 消</el-button>
+        <el-button type="primary" @click="TransactionReplyAdd()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -90,8 +117,16 @@ export default {
 				taUserName: '',
 				transactionId: '',
         pageNum: '1',
-        pageSize: 10
+        pageSize: 10,
+        dataValue: '',
+        dialogFormVisible: false,
+        formLabelWidth: '120px',
+        contentImg: [], 
+        close: false  
       },
+      contentImgList: [],
+      dialogVisible: false,
+      dialogImageUrl: '',
       total: 0, // 数据总数
       transactionsList: [],
       deleteIds: [], // 选择的id集合
@@ -121,28 +156,20 @@ export default {
       value = value < 10 ? '0' + value : value
       return value
     },
-    getStatus(row) { // 获取状态
-      // let statusName = ''
-
-      // // 判断状态
-      // // switch (row.status) {
-      // //   case '0':
-      // //     statusName = '已作废'
-      // //     break
-      // //   case '1':
-      // //     statusName = '已发布'
-      // //     break
-      // //   case '2':
-      // //     statusName = '草稿'
-      // //     break
-      // // }
-
-      // // 如果修改时间和创建时间不一致, 就显示已修改
-      // if (row.status === '1' && (row.updateDate > row.createDate)) {
-      //   statusName = '已修改'
-      // }
-
-      // return statusName
+    handlePictureCardPreview(file) { //配图文件列表中已上传的文件时的钩子
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleRemove(file, fileList) { //配图移除时
+      this.listQuery.contentImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listQuery.contentImg.push(fileList[i].response.data[0])
+      }
+      console.log(file, fileList)
+    },
+    handleSuccessContentImg(response, file, fileList) { // 配图上传成功时回调
+      const resImg = response.data[0]
+      this.listQuery.contentImg.push(resImg)
     },
     dataQuery() { // 查询数据
       this.listLoading = true
@@ -173,16 +200,20 @@ export default {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
       this.listQuery.ownerName =''
-      this.listQuery.id=''
       this.listQuery.status=''
-      this.listQuery.userName=''
+      this.listQuery.taUserName=''
+      this.listQuery.dataValue=''
+      this.listQuery.dataValue=''
+      this.listQuery.replyTaUserName=''
       this.dataQuery()
     },
-    deleteId(){
+    deleteReply(){
       const ids = this.deleteIds
       this.listLoading = true
-      console.log(ids)
-      this.$store.dispatch('transaction/TransactionsDelete', ids).then((res) => {
+      if(ids<1){
+      this.$message.error('请选择一条数据')
+        }
+      this.$store.dispatch('transaction/DeleteReply', ids).then((res) => {
         this.listLoading = false
         this.dataQuery()
       }).catch(() => {
@@ -191,8 +222,6 @@ export default {
       })
     },
 
-
-    
     formatDate(val) {
       if (val === null) {
         return ''
@@ -202,7 +231,34 @@ export default {
       var month = value.getMonth() + 1
       var day = value.getDate()
       return year + '-' + month + '-' + day
-    }
+    },
+    // 弹出层
+    TransactionReplyOpen(id){
+      this.listQuery.dialogFormVisible = true
+      this.listQuery.id = id
+    },
+    // 取消
+    TransactionReplyOff(){
+       this.listQuery.dialogFormVisible = false
+       this.contentImgList = []
+       console.log('this.contentImgList',this.contentImgList)
+       this.listQuery.contentImg = []
+       console.log(' this.listQuery.contentImg', this.listQuery.contentImg)
+       this.dataQuery()
+    },
+    // 添加评论
+    TransactionReplyAdd(){
+       this.listQuery.dialogFormVisible = false
+       console.log(this.listQuery.id,'this.listQuery.id')
+       
+        this.$store.dispatch('transaction/TransactionReplyAdd', this.listQuery).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error TransactionReplyAdd')
+      })
+    } 
   }
 }
 </script>
@@ -230,5 +286,10 @@ export default {
 .button {
   margin-left: 20px;
 }
+.textarea-inherit {
+        width: 100%;
+        overflow: auto;
+        word-break: break-all; 
+    }
 </style>