合并

.gitignore

@@ -1 +1,2 @@
 *.class
+CODE/smart-community-word/.idea/workspace.xml

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

@@ -309,7 +309,6 @@ public class SocialController extends BaseController {
                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-
         if (!check(communityId)) {
             responseBean.addError("小区不存在");
             return responseBean;

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

@@ -28,7 +28,7 @@ public interface TpTransactionReplyMapper {
      * @param founderUserID
      * @return
      */
-    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type);
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type, @Param("roomNoName")String roomNoName);
 
     /**
      * 查询我回复别人的帖子

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

@@ -34,7 +34,12 @@ public class TpTransaction {
     private String telephone;
 
     private List<String> imgList;
-    
+
+    /**
+     * 房间号
+     */
+    private  String roomNoName;
+
     /**
      * 是否被举报 1是被举报 0或null是没被举报
      */
@@ -261,4 +266,12 @@ public class TpTransaction {
     public void setSort(String sort) {
         this.sort = sort;
     }
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
 }

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

@@ -51,6 +51,16 @@ public class TpTransactionReply {
      */
     private  Integer taUserVerifyId;
 
+    private String roomNoName;
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
+
     public void setTaUserVerifyId(Integer taUserVerifyId) {
         this.taUserVerifyId = taUserVerifyId;
     }

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

@@ -301,8 +301,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         tpTransactions.stream().forEach(e -> {
             if (null != e.getTaUserVerifyId()) {
-                TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(e.getTaUserVerifyId());
-                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(e.getTaUserVerifyId());
                 e.setRoleId(taSysRole.getId());
                 e.setRoleName(taSysRole.getRoleName());
             }
@@ -340,7 +339,9 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userElement.getId());
         tpTransaction.setUpdateDate(new Date());
-        tpTransaction.setTaUserVerifyId(userElement.getUserVerifyId());
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        tpTransaction.setTaUserVerifyId(taUserVerify.getRoleId());
+        tpTransaction.setRoomNoName(taUserVerify.getRoomNoName());
         tpTransaction.setIsReported("0");
         // 发布者身份  0 APP  1 物业
         tpTransaction.setReleaseIdentity("0");
@@ -574,7 +575,9 @@ public class SocialServiceImpl implements SocialServiceI {
         //  评论帖子取 TpTransaction 的创建人，回复对话取传过来的值
         tpTransactionReply.setReplyTaUserId(tpTransactionReply.getReplyTaUserId()==null?tpTransaction.getCreateUser():tpTransactionReply.getReplyTaUserId());
         tpTransactionReply.setReleaseIdentity("0");
-        tpTransactionReply.setTaUserVerifyId(userElement.getUserVerifyId());
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        tpTransactionReply.setTaUserVerifyId(taUserVerify.getRoleId());
+        tpTransactionReply.setRoomNoName(taUserVerify.getRoomNoName());
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
@@ -904,7 +907,9 @@ public class SocialServiceImpl implements SocialServiceI {
         TpTransaction tpTransaction= tpTransactionMapper.getById(transactionId);
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUnitId(), tpTransaction.getCreateUser(), type);
+        //房间号
+         TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getId(), tpTransaction.getCreateUser(),type,taUserVerify.getRoomNoName());
         for (TpTransactionReply tpTransactionReply : replies) {
             List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
             List<String> list = new ArrayList<>();
@@ -912,8 +917,6 @@ public class SocialServiceImpl implements SocialServiceI {
                 list.add(imageUrl.getImageUrl());
                 tpTransactionReply.setImgList(list);
             }
-
-
         }
 
         responseBean.addSuccess(replies);

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

@@ -19,11 +19,12 @@
         <result column="role_name" property="roleName" jdbcType="VARCHAR"/>
         <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER"/>
         <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR"/>
+        <result column="room_no_name" property="roomNoName" jdbcType="VARCHAR"/>
 
     </resultMap>
     <sql id="Base_Column_List">
     id, community_id, ta_user_id, transaction_title, transaction_content, sort,
-    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity
+    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity,room_no_name
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
     SELECT
@@ -62,12 +63,12 @@
       sort,
       view_count, status,
       type, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date,room_no_name)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{releaseIdentity,jdbcType=VARCHAR},#{taUserVerifyId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
        #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR})
   </insert>
     <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.community.huiju.model.TpTransaction">
@@ -119,7 +120,10 @@
                 ta_user_verify_id,
             </if>
             <if test="releaseIdentity != null">
-                release_identity
+                release_identity,
+            </if>
+            <if test="roomNoName != null">
+                room_no_name
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -171,6 +175,9 @@
             <if test="releaseIdentity != null">
                 #{releaseIdentity,jdbcType=VARCHAR},
             </if>
+            <if test="roomNoName != null">
+                #{roomNoName,jdbcType=VARCHAR}
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction">
@@ -215,6 +222,10 @@
             <if test="updateDate != null">
                 update_date = #{updateDate,jdbcType=TIMESTAMP},
             </if>
+            <if test="roomNoName != null">
+                room_no_name = #{roomNoName,jdbcType=VARCHAR},
+            </if>
+
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -231,7 +242,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      room_no_name = #{roomNoName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -13,11 +13,11 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
     <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
-
+    <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
+    reply_ta_user_name, create_date,room_no_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -32,11 +32,11 @@
   <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_verify_id,release_identity,
       ta_user_id, ta_user_name, reply_content, 
-      reply_ta_user_id, reply_ta_user_name, create_date
+      reply_ta_user_id, reply_ta_user_name, create_date,room_no_name
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},#{taUserVerifyId},#{releaseIdentity},
       #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR},
-      #{replyTaUserId,jdbcType=INTEGER}, #{replyTaUserName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}
+      #{replyTaUserId,jdbcType=INTEGER}, #{replyTaUserName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},#{roomNoName,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -73,7 +73,10 @@
         release_identity,
       </if>
       <if test="taUserVerifyId != null" >
-        ta_user_verify_id
+        ta_user_verify_id,
+      </if>
+      <if test="roomNoName != null" >
+        room_no_name
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -108,8 +111,12 @@
         #{releaseIdentity},
       </if>
       <if test="taUserVerifyId != null" >
-        #{ taUserVerifyId}
+        #{taUserVerifyId},
+      </if>
+      <if test="roomNoName != null" >
+        #{roomNoName}
       </if>
+
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -123,7 +130,7 @@
       </if>
       <if test="taUserId != null" >
         ta_user_id = #{taUserId,jdbcType=INTEGER},
-      </if>
+      </if>``
       <if test="taUserName != null" >
         ta_user_name = #{taUserName,jdbcType=VARCHAR},
       </if>
@@ -156,7 +163,7 @@
   </update>
   <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
     SELECT
-	tr.*, (SELECT r.description FROM ta_user_verify uv LEFT JOIN ta_sys_role r ON uv.role_id = r.id WHERE uv.id = tr.ta_user_verify_id) AS taRoleName,
+	tr.*, (SELECT r.description FROM ta_sys_role r  where r.id = tr.ta_user_verify_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
@@ -165,14 +172,12 @@
     and tr.transaction_id=#{transactionId}
       <if test="type != null and type != '' and type == 2" >
         AND release_identity=1
       </if>
       <if test="type != null and type != '' and type == 1" >
         AND  tr.ta_user_id = #{founderUserID}
       </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">

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

@@ -351,6 +351,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		 TpUnit tpUnit= new TpUnit();
 				tpUnit.setCommunityId(selectTpBuilding.getCommunityId())
 						.setPhaseId(selectTpBuilding.getPhaseId())
+						.setPhaseName(selectTpBuilding.getPhaseName())
 						.setBuildingName(selectTpBuilding.getName())
 						.setBuildingId(selectTpBuilding.getId())
 						.setName(nodeNumber)