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

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

@@ -249,6 +249,15 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

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

@@ -333,7 +333,7 @@ public class SocialController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets,userElement.getUserVerifyId());
         return response;
     }
     

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

@@ -53,11 +53,36 @@ public class TpTransaction {
      */
     private Integer noLikeCount;
 
+    /**
+     * 对应app端的角色表，物业端发帖时不维护
+     */
+    private Integer taUserVerifyId;
+
+    /**
+     * 0为app端，1为物业
+     */
+    private String releaseIdentity;
+
+    public void setReleaseIdentity(String releaseIdentity) {
+        this.releaseIdentity = releaseIdentity;
+    }
+
+    public String getReleaseIdentity() {
+        return releaseIdentity;
+    }
+
     /**
      * 是否已点赞或者踩
      */
     private String bel;
 
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
 
     public String getRoleName() {
         return roleName;

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

@@ -45,6 +45,20 @@ public class TpTransactionReply {
      */
     private String releaseIdentity;
 
+    /**
+     * 用于查询app端角色，物业端不维护
+     * @param releaseIdentity
+     */
+    private  Integer taUserVerifyId;
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
     }

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

@@ -108,7 +108,7 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets)throws IOException;
+    ResponseBean addAllTransaction(Integer userId, String paramets, Integer userVerifyId)throws IOException;
 
 
 	/**

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

@@ -316,11 +316,12 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpTransaction> tpTransactions= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
 
         tpTransactions.stream().forEach(e->{
-            // 角色
-//            taUserVerifyMapper.selectByPrimaryKey()
-            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserId());
-            e.setRoleId(taSysRole.getId());
-            e.setRoleName(taSysRole.getRoleName());
+
+            if (null != e.getTaUserVerifyId()){
+                TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserVerifyId());
+                e.setRoleId(taSysRole.getId());
+                e.setRoleName(taSysRole.getRoleName());
+            }
             TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
             e.setCreateUserName(taUser.getUserName());
         });
@@ -335,7 +336,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException {
+    public ResponseBean addAllTransaction(Integer userId, String paramets,Integer userVerifyId) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String transactionTitle = (String) jsonObject.get("title");
@@ -355,6 +356,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
+        tpTransaction.setTaUserVerifyId(userVerifyId);
         tpTransaction.setIsReported("0");
 
         //判断身份是否为业主且状态为已停用
@@ -625,6 +627,7 @@ public class SocialServiceImpl implements SocialServiceI {
             tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
         }
         tpTransactionReply.setReleaseIdentity("0");
+        tpTransactionReply.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 

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

@@ -16,10 +16,13 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="role_id" property="roleId" jdbcType="INTEGER" />
     <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" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, transaction_title, transaction_content,
-    view_count, status, type, create_user, create_date, update_user, update_date
+    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction"  >
     SELECT
@@ -36,7 +39,9 @@
 	ttr.update_user,
 	ttr.update_date,
 	sr.id AS role_id,
-	sr.role_name AS role_name
+	sr.role_name AS role_name,
+	ttr.release_identity,
+	ttr.ta_user_verify_id
 FROM
 	tp_transaction ttr
 LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
@@ -48,12 +53,14 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransaction" >
-    insert into tp_transaction (id, community_id, ta_user_id, 
+    insert into tp_transaction (id, community_id,release_identity,
+      ta_user_verify_id，
+      ta_user_id,
       transaction_title, transaction_content,
       view_count, status,
       type, create_user, create_date, 
       update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{releaseIdentity,jdbcType=VARCHAR},#{taUserVerifyId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR},
        #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
@@ -101,6 +108,12 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="releaseIdentity != null" >
+        release_identity
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -142,6 +155,12 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="releaseIdentity != null" >
+        #{releaseIdentity,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction" >

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

@@ -11,9 +11,12 @@
     <result column="reply_ta_user_id" property="replyTaUserId" jdbcType="INTEGER" />
     <result column="reply_ta_user_name" property="replyTaUserName" jdbcType="VARCHAR" />
     <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" />
+
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id, 
+    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
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -27,12 +30,12 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <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, 
+    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
       )
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER}, 
-      #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, 
+    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}
       )
   </insert>
@@ -66,6 +69,12 @@
       <if test="createDate != null" >
         create_date,
       </if>
+      <if test="releaseIdentity != null" >
+        release_identity,
+      </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -95,6 +104,12 @@
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="releaseIdentity != null" >
+        #{releaseIdentity},
+      </if>
+      <if test="taUserVerifyId != null" >
+        #{ taUserVerifyId}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionReply" >
@@ -141,12 +156,12 @@
   </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,
+	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,
 	      (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
+	tr.community_id = #{communityId}
       <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>

CODE/smart-community/community-common/pom.xml

@@ -124,5 +124,6 @@
             <version>2.6</version>
         </dependency>
 
+
     </dependencies>
 </project>

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

@@ -312,7 +312,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		 Integer id= object.getInteger("id");
 		 String replyContent= object.getString("replyContent");
 		 JSONArray array= object.getJSONArray("contentImg");
-		// 根据此状态判断是回复帖子，还是回复人
+		// 根据此状态判断是回复帖子，还是回复人(共用一个接口)
 		Integer replyType= object.getInteger("replyType")==null?0:1;
 
 		 // 查询帖子信息
@@ -328,6 +328,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setTaUserName(userElement.getUserName())
 					.setReplyContent(replyContent)
 					.setReplyTaUserId(tpTransaction.getCreateUser())
+					.setReleaseIdentity("1")
 					.setReplyTaUserName(taUserMapper.selectById(tpTransaction.getTaUserId()).getUserName())
 					.setCreateDate(LocalDateTime.now());
 		}
@@ -338,6 +339,7 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 					.setTaUserName(userElement.getUserName())
 					.setReplyContent(replyContent)
 					.setReplyTaUserId(Reply.getTaUserId())
+					.setReleaseIdentity("1")
 					.setReplyTaUserName(Reply.getTaUserName())
 					.setCreateDate(LocalDateTime.now());
 		}