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

@@ -431,7 +431,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID，imgArr:可多张[]"),
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyId：被回复的评论ID，imgArr:可多张[]"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)

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

@@ -87,7 +87,12 @@ public class TpTransactionReply {
     private String replyRoleName;
     
     private String createUserName;
-
+    
+    /**
+     * 被回复的评论ID
+     */
+    private Integer replyId;
+    
     /**
      * 回复的图片
      * @return
@@ -254,6 +259,14 @@ public class TpTransactionReply {
         return createUserName;
     }
     
+    public Integer getReplyId() {
+        return replyId;
+    }
+    
+    public void setReplyId(Integer replyId) {
+        this.replyId = replyId;
+    }
+    
     public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }

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

@@ -572,12 +572,12 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setUuidName(userElement.getUserName());
 
             // 由于评论帖子和评论对话是同一个接口，当tpTransactionReply.getReplyTaUserId()为空时查询Ta_user里面的名字
-        TpTransaction tpTransaction= tpTransactionMapper.getById(tpTransactionReply.getTransactionId());
+        TpTransactionReply tpTransactionReplyBack = tpTransactionReplyMapper.selectByPrimaryKey(tpTransactionReply.getReplyId());
         
         //  评论帖子取 TpTransaction 的创建人，回复对话取传过来的值
-        tpTransactionReply.setReplyUuid(tpTransaction.getUuid());
-        tpTransactionReply.setReplyUuidType(tpTransaction.getUuidType());
-        tpTransactionReply.setReplyUuidName(tpTransaction.getUuidName());
+        tpTransactionReply.setReplyUuid(tpTransactionReplyBack.getUuid());
+        tpTransactionReply.setReplyUuidType(tpTransactionReplyBack.getUuidType());
+        tpTransactionReply.setReplyUuidName(tpTransactionReplyBack.getUuidName());
         tpTransactionReply.setReleaseIdentity("0");
         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
         tpTransactionReply.setCreateDate(new Date());

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

@@ -1218,7 +1218,6 @@ public class TaUserServiceImpl implements ITaUserService {
     public ResponseBean addFeedback(UserElement userElement, String parameter) {
        ResponseBean response= new ResponseBean<>();
        TaFeedback taFeedback= JSONObject.parseObject(parameter,TaFeedback.class);
-       String[] feedbackImgArr= JSONObject.parseObject(parameter).getJSONArray("feedbackImg").toArray(new String[]{});
 
         if (!AccountValidatorUtil.isPhone(taFeedback.getTaUserTel())) {
             response.addError("请输入正确的手机号!");
@@ -1232,13 +1231,16 @@ public class TaUserServiceImpl implements ITaUserService {
        taFeedback.setCreateDate(new Date());
        taFeedback.setCreateUser(userElement.getUserVerifyId());
        taFeedbackMapper.insert(taFeedback);
-
-       for (String imgUrl:feedbackImgArr){
-           TaFeedbackImg taFeedbackImg = new TaFeedbackImg();
-           taFeedbackImg.setImgUrl(imgUrl);
-           taFeedbackImg.setCreateDate(new Date());
-           taFeedbackImg.setFeedbackId(taFeedback.getId());
-           taFeedbackImgMapper.insert(taFeedbackImg);
+        JSONArray jSONArray= JSONObject.parseObject(parameter).getJSONArray("feedbackImg");
+       if(null!=jSONArray) {
+           String[] feedbackImgArr = jSONArray.toArray(new String[]{});
+           for (String imgUrl : feedbackImgArr) {
+               TaFeedbackImg taFeedbackImg = new TaFeedbackImg();
+               taFeedbackImg.setImgUrl(imgUrl);
+               taFeedbackImg.setCreateDate(new Date());
+               taFeedbackImg.setFeedbackId(taFeedback.getId());
+               taFeedbackImgMapper.insert(taFeedbackImg);
+           }
        }
         response.addSuccess("成功");
         return response;

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

@@ -17,8 +17,9 @@
     <result column="room_no_name" property="roomNoName" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id,ta_user_verify_id
-    reply_ta_user_name, create_date,room_no_name
+    id, community_id, transaction_id,uuid,uuid_type,
+      uuid_name, reply_content,
+      reply_uuid, reply_uuid_type,reply_uuid_name, create_date,release_identity
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select