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

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

@@ -248,7 +248,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/getTransaction/{communityId}", method = RequestMethod.GET)
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
@@ -269,7 +269,8 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "查询二手租赁回复", notes = "查询二手租赁回复")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "0:和我相关，1:楼主，2:物业"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
@@ -278,6 +279,7 @@ public class SocialController extends BaseController {
     @RequestMapping(value = "/getTransactionReply", method = RequestMethod.GET)
     public ResponseBean findUsedDetailsReply(@RequestParam("transactionId") Integer transactionId,
                                              @RequestParam(value = "order", defaultValue = "asc") String order,
+                                             @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                              HttpSession session) {
@@ -289,7 +291,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize);
+        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize,type);
         return responseBean;
     }
 
@@ -321,7 +323,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0二手,1求购,2租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
@@ -434,7 +436,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID"),
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID，imgArr:可多张[]"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)
@@ -490,15 +492,27 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "签到扫码", notes = "签到扫码")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "activityId:活动id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value = "activityId:活动id"),
     })
 
-    @RequestMapping(value = "/tpactivitysignin/add", method = RequestMethod.GET)
-    public ResponseBean  TpActivitySignInAdd(HttpSession session,@RequestBody String paramets) {
+    @RequestMapping(value = "/tpactivitysignin/add", method = RequestMethod.POST)
+    public ResponseBean  tpActivitySignInAdd(HttpSession session,@RequestBody String paramets) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        ResponseBean response = socialServiceI.TpActivitySignInAdd(paramets,userElement);
+        ResponseBean response = socialServiceI.tpActivitySignInAdd(paramets,userElement);
         return response;
     }
 
+    @ApiOperation(value = "回复对话", notes = "回复对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:帖子ID,replyContent:回复内容，replyUserId：被回复的用户ID，imgArr:可多张[]"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/replyAdd", method = RequestMethod.POST)
+    public ResponseBean replyAdd(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean replyAdd = socialServiceI.replyAdd(paramets,userElement);
+        return replyAdd;
+    }
+
 }

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

@@ -44,4 +44,12 @@ public interface TdImagesMapper {
      * @param type
      */
     void deleteTdImages(@Param("uuid") Integer uuid, @Param("type") String type);
+
+    /**
+     *
+     * @param uuid
+     * @param object
+     * @return
+     */
+    List<TdImages> selectImages(@Param("uuid") Integer uuid, @Param("object") String object);
 }

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

@@ -21,12 +21,14 @@ public interface TpTransactionReplyMapper {
     int updateByPrimaryKey(TpTransactionReply record);
 
     /**
-     * 根据 小区id 和 帖子id
+     * 当前帖子评论列表
      * @param communityId
      * @param transactionId
+     * @param userID
+     * @param founderUserID
      * @return
      */
-    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type);
 
     /**
      * 查询我回复别人的帖子

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

@@ -1,8 +1,10 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTransactionReply {
+
     private Integer id;
 
     private Integer communityId;
@@ -31,6 +33,34 @@ public class TpTransactionReply {
      */
     private String replyRoleName;
 
+    /**
+     * 回复的图片
+     * @return
+     */
+    private List<String> imgList;
+
+    /**
+     *0代表app端用户，1代表物业端用户
+     * @return
+     */
+    private String releaseIdentity;
+
+    public void setReleaseIdentity(String releaseIdentity) {
+        this.releaseIdentity = releaseIdentity;
+    }
+
+    public String getReleaseIdentity() {
+        return releaseIdentity;
+    }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -178,7 +178,7 @@ public interface SocialServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize);
+	ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize,Integer type);
 	/**
 	 * 二帖子回复
 	 *@param paramets
@@ -213,5 +213,13 @@ public interface SocialServiceI {
 	 * @param userElement
 	 * @return
 	 */
-    ResponseBean TpActivitySignInAdd(String paramets, UserElement userElement);
+    ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement);
+
+	/**
+	 * 回复对话
+	 * @param paramets
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean replyAdd(String paramets, UserElement userElement);
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
@@ -602,6 +603,10 @@ public class SocialServiceImpl implements SocialServiceI {
     @Override
     public ResponseBean addTransactionReply(String paramets, UserElement userElement) {
         ResponseBean response= new ResponseBean();
+        JSONObject object= JSONObject.parseObject(paramets);
+        JSONArray array= object.getJSONArray("imgArr");
+        String[]	reply= array.toArray(new String[]{});
+
         TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTaUserId(userElement.getId());
@@ -613,8 +618,19 @@ public class SocialServiceImpl implements SocialServiceI {
         if(null!=tpTransactionReply.getReplyTaUserId()&!"".equals(tpTransactionReply.getReplyTaUserId())) {
             tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
         }
+        tpTransactionReply.setReleaseIdentity("0");
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
+
+        for (String img:reply){
+            TdImages tdImages= new TdImages();
+            tdImages.setImageUrl(img);
+            tdImages.setType("reply");
+            tdImages.setUuid(tpTransactionReply.getId());
+            tdImages.setCreateTime(new Date());
+            tdImages.setCreateUser(userElement.getId());
+            tdImagesMapper.insert(tdImages);
+        }
         response.addSuccess("成功");
         return response;
     }
@@ -663,11 +679,11 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean TpActivitySignInAdd(String paramets, UserElement userElement) {
+    public ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement) {
         ResponseBean responseBean= new ResponseBean();
         Integer activityId= JSONObject.parseObject(paramets).getInteger("activityId");
         TpActivitySignIn tpActivitySignIn= new TpActivitySignIn();
-        tpActivitySignIn.setId(activityId);
+        tpActivitySignIn.setActivityId(activityId);
         tpActivitySignIn.setCommunityId(userElement.getCommunityId());
 
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
@@ -676,15 +692,52 @@ public class SocialServiceImpl implements SocialServiceI {
         tpActivitySignIn.setUserRole(description);
         tpActivitySignIn.setUserName(userElement.getUserName());
         //期/栋/单/层/户
-        String bu=taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName();
+        String bu=taUserVerify.getPhaseName()+"期"+taUserVerify.getBuildingName()+"栋"+taUserVerify.getUnitName()+"单"+taUserVerify.getLevelName()+"层"+taUserVerify.getRoomNoName()+"户";
         tpActivitySignIn.setBuildingInfo(bu);
         tpActivitySignIn.setTaUserId(userElement.getId());
         tpActivitySignIn.setUserTel(userElement.getLoginName());
         tpActivitySignIn.setCreateDate(new Date());
         tpActivitySignInMapper.insert(tpActivitySignIn);
 
+        responseBean.addSuccess("成功");
 
-        return null;
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean replyAdd(String paramets, UserElement userElement) {
+        ResponseBean response= new ResponseBean();
+
+        JSONObject object= JSONObject.parseObject(paramets);
+        Integer transactionId= object.getInteger("transactionId");
+        String replyContent= object.getString("replyContent");
+        Integer replyUserId= object.getInteger("replyUserId");
+        String[] imgArr= object.getJSONArray("imgArr").toArray(new String[]{});
+
+        String userName= taUserMapper.selectByPrimaryKey(replyUserId).getUserName();
+      TpTransactionReply tpTransactionReply=  new TpTransactionReply();
+        tpTransactionReply.setCommunityId(userElement.getCommunityId());
+        tpTransactionReply.setTransactionId(transactionId);
+        tpTransactionReply.setTaUserId(userElement.getId());
+        tpTransactionReply.setTaUserName(userElement.getUserName());
+        tpTransactionReply.setReleaseIdentity("0");
+        tpTransactionReply.setReplyContent(replyContent);
+        tpTransactionReply.setReplyTaUserId(replyUserId);
+        tpTransactionReply.setReplyTaUserName(userName);
+        tpTransactionReply.setCreateDate(new Date());
+        response.addSuccess("成功");
+        tpTransactionReplyMapper.insert(tpTransactionReply);
+        //添加评论图片
+        for(String img:imgArr){
+            TdImages tdImages= new TdImages();
+            tdImages.setImageUrl(img);
+            tdImages.setType("reply");
+            tdImages.setUuid(tpTransactionReply.getId());
+            tdImages.setCreateTime(new Date());
+            tdImages.setCreateUser(userElement.getId());
+            tdImagesMapper.insert(tdImages);
+        }
+        return response;
     }
 
 
@@ -886,11 +939,23 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize) {
+    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize,Integer type) {
         ResponseBean responseBean = new ResponseBean();
+        //拿到当前帖子的创建人
+        Integer CreateUser= tpTransactionMapper.getById(transactionId).getCreateUser();
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId);
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId,userElement.getUnitId(),CreateUser,type);
+        for (TpTransactionReply tpTransactionReply:replies){
+            List<TdImages> tdImagesList= tdImagesMapper.selectImages(tpTransactionReply.getId(),"reply");
+            List<String> list= new ArrayList<>();
+            for (TdImages imageUrl:tdImagesList){
+                list.add(imageUrl.getImageUrl());
+                tpTransactionReply.setImgList(list);
+            }
+
+
+        }
 
         responseBean.addSuccess(replies);
         return responseBean;

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

@@ -135,4 +135,13 @@
     where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
   </delete>
 
+
+  <select id="selectImages" resultMap="BaseResultMap" >
+    SELECT
+    *
+    FROM
+    td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{object,jdbcType=CHAR}
+  </select>
+
 </mapper>

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

@@ -26,7 +26,7 @@
     delete from tp_transaction_reply
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" >
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into tp_transaction_reply (id, community_id, transaction_id, 
       ta_user_id, ta_user_name, reply_content, 
       reply_ta_user_id, reply_ta_user_name, create_date
@@ -140,13 +140,23 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
-    select
-      tr.*,
-      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.ta_user_id) as taRoleName,
-      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.reply_ta_user_id) as replyRoleName
-    from tp_transaction_reply tr
-    where tr.community_id = #{communityId,jdbcType=INTEGER} and tr.transaction_id = #{transactionId,jdbcType=INTEGER}
-  </select>
+    SELECT
+	tr.*, (SELECT tsr.role_name FROM ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr ON tsur.role_id = tsr.id WHERE tsur.user_id = tr.ta_user_id) AS taRoleName,
+	      (SELECT tsr.role_name FROM ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr ON tsur.role_id = tsr.id WHERE tsur.user_id = tr.reply_ta_user_id) AS replyRoleName
+    FROM
+        tp_transaction_reply tr
+    WHERE
+	tr.community_id = 45
+      <if test="type != null and type != '' and type == 2" >
+      AND (tr.reply_ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id )) OR (ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id ))
+      </if>
+      <if test="type != null and type != '' and type == 1" >
+      AND (tr.ta_user_id =#{userID}) OR (tr.reply_ta_user_id = #{userID})
+      </if>
+      <if test="type != null and type != '' and type == 0" >
+      AND (tr.ta_user_id =#{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
+      </if>
+   </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">
      select
      <include refid="Base_Column_List" />

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

@@ -212,22 +212,22 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
             }
                 // 发布时消息为无效
-                if ("1".equals(tpActivity.getStatus())) {
-                    QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("community_id", userElement.getCommunityId());
-                    queryWrapper.eq("message_type", "8");
-                    queryWrapper.eq("model_type", "2");
-                    queryWrapper.eq("source", "2");
-                    queryWrapper.eq("status", "1");
-                    Message message = messageMapper.selectOne(queryWrapper);
-                    if (null != message) {
-                        message.setStatus("0");
-                        message.setUpdateDate(LocalDateTime.now());
-                        message.setUpdateUser(userElement.getId());
-                        messageMapper.updateById(message);
-                    }
-
-                }
+//                if ("1".equals(tpActivity.getStatus())) {
+//                    QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+//                    queryWrapper.eq("community_id", userElement.getCommunityId());
+//                    queryWrapper.eq("message_type", "8");
+//                    queryWrapper.eq("model_type", "2");
+//                    queryWrapper.eq("source", "2");
+//                    queryWrapper.eq("status", "1");
+//                    Message message = messageMapper.selectOne(queryWrapper);
+//                    if (null != message) {
+//                        message.setStatus("0");
+//                        message.setUpdateDate(LocalDateTime.now());
+//                        message.setUpdateUser(userElement.getId());
+//                        messageMapper.updateById(message);
+//                    }
+//
+//                }
                 // 扫码签到
 
                 if (radio==1){

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

@@ -313,7 +313,8 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		 String replyContent= object.getString("replyContent");
 		 JSONArray array= object.getJSONArray("contentImg");
 		// 根据此状态判断是回复帖子，还是回复人
-		Integer replyType= object.getInteger("replyType");
+		Integer replyType= object.getInteger("replyType")==null?0:1;
+
 		 // 查询帖子信息
 		TpTransaction tpTransaction= tpTransactionMapper.selectById(id);
 		// 查询评论信息

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

@@ -239,6 +239,7 @@ export default {
     },
     // 取消
     TransactionReplyOff(){
+       this.listQuery.replyContent = ''
        this.listQuery.dialogFormVisible = false
        this.contentImgList = []
        this.listQuery.contentImg = []