提交

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

@@ -49,6 +49,8 @@ public class TpBuildingOwnerInfo {
 
     private Date updateDate;
 
+    private Integer taUserVerifyId;
+
     public Integer getId() {
         return id;
     }
@@ -232,4 +234,12 @@ public class TpBuildingOwnerInfo {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
 }

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

@@ -257,7 +257,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             TpBuildingOwnerInfo selectBuild = getBuildingInfo(userElement, user.getLoginName());
             if (null == selectBuild) {
                 // 插入楼栋信息数据
-                insertTpBuildingOwnerInfo(userElement, user, null);
+                insertTpBuildingOwnerInfo(userElement, user, null, userVerify.getId());
             }
             //审核通过后推送消息（临时数据）
             String[] messageArr= new String[14];
@@ -328,8 +328,9 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
      * @param userElement
      * @param user
      * @param userId 创建人
+     * @param userVerifyId 审核的id
      */
-    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId) {
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId, Integer userVerifyId) {
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
         // 查询 期/楼栋/单元/层/户号
         TpPhase phase = tpPhaseMapper.selectByPrimaryKey(userElement.getPhaseId());
@@ -360,6 +361,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         // tpBuildingOwnerInfo.setCreateUser(userId);
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setPairStatus("1");
+        tpBuildingOwnerInfo.setTaUserVerifyId(userVerifyId);
 
         // 添加的时候, 默认是当前操作的小区
         tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());

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

@@ -25,12 +25,13 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" javaType="INTEGER"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, id_card, phase_id, phase_name, building_id, building_name, unit_id, 
     unit_name, level_id, level_name, room_no_id, room_no_name, owner_name, owner_tel, 
     gender, pair_status, verify_status, sort, create_user, create_date, update_user, 
-    update_date
+    update_date, ta_user_verify_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -50,7 +51,7 @@
       room_no_name, owner_name, owner_tel, 
       gender, pair_status, verify_status, 
       sort, create_user, create_date, 
-      update_user, update_date)
+      update_user, update_date, ta_user_verify_id)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
       #{phaseId,jdbcType=INTEGER}, #{phaseName,jdbcType=VARCHAR}, #{buildingId,jdbcType=INTEGER}, 
       #{buildingName,jdbcType=VARCHAR}, #{unitId,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR}, 
@@ -58,7 +59,7 @@
       #{roomNoName,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, 
       #{gender,jdbcType=CHAR}, #{pairStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, 
       #{sort,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{taUserVerifyId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" keyProperty="id" useGeneratedKeys="true" >
     insert into tp_building_owner_info
@@ -132,6 +133,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="ta_user_verify_id != null">
+        ta_user_verify_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -203,6 +207,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserVerifyId != null">
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
@@ -274,6 +281,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserVerifyId != null">
+        ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -300,7 +310,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},
+      ta_user_verify_id = #{taUserVerifyId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updatOwnerTel" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -137,6 +137,11 @@ public class TpBuildingOwnerInfo implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
+
+    /**
+     * 审核id
+     */
+    private Integer taUserVerifyId;
     
     /**
      * 身份

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

@@ -181,9 +181,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 审核通过后，往楼栋资料库添加数据
         if ("1".equals(verify)) {
-            insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getCommunityId(), userElement.getId(),
                     userVerify.getGender(), user.getUserName(), user.getLoginName());
+
+            // 设置审核id
+            tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
+            tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
+
             // 推送海康
             ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
             if (!"0".equals(pushHKPerson.getCode())) {
@@ -296,6 +301,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taUserVerify.setVerifyName(user.getUserName());
         row = taUserVerifyMapper.insert(taUserVerify);
 
+        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
+        row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
+
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {

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

@@ -176,7 +176,11 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             // 只有这个人在当前房产没有楼栋资料的时候才添加
             if (null == tpBuildingOwnerInfo) {
                 // 添加楼栋数据
-                insertBuildingOwnerInfo(userVerify, user);
+               tpBuildingOwnerInfo = insertBuildingOwnerInfo(userVerify, user);
+
+               // 设置审核id
+               tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
+               tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
             }
             // 推送海康
             ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());

CODE/smart-community/property-api/src/main/resources/bootstrap.yml

@@ -23,3 +23,15 @@ eureka:
   client:
     service-url:
       defaultZone: http://localhost:8080/eureka/
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 180000
+
+ribbon:
+  ReadTimeout: 38000
+  ConnectTimeout: 38000
+  eureka.enabled: true

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

@@ -72,7 +72,7 @@
             t.update_date as updateDate
         FROM
             tp_building_owner_info t
-            LEFT JOIN ta_user_verify u ON t.room_no_id = u.room_no_id
+            INNER JOIN ta_user_verify u ON t.ta_user_verify_id = u.id
             LEFT JOIN ta_sys_role r ON u.role_id = r.id
             LEFT JOIN tp_user m ON t.update_user = m.id
         WHERE