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/UserController.java

         JSONObject jsonObject = JSONObject.parseObject(parameter);
         ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"));
         TaUserVO userVO = (TaUserVO) responseBean.getData();
-        setUserElement(userVO, session);
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
         return responseBean;
 
     }

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

 
     @Select("select * from tp_building_owner_info where owner_tel=#{ownerTel}")
     List<TpBuildingOwnerInfo> sellectHouseList(@Param("ownerTel") String ownerTel);
+
+    /**
+     * 根据 小区，期，楼栋，单元，楼层，户号
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase=#{phase} and building=#{building} and unit=#{unit}" +
+            " and level=#{level} and room_no=#{roomNo}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phase") String phase,
+                                                    @Param("building") String building, @Param("unit") String unit,
+                                                    @Param("level") String level, @Param("roomNo") String roomNo);
 }

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

 
     private Date createDate;
 
+    /**
+     * 审核人姓名
+     */
+    private String verifyName;
+
+    //  ------------------
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 业主名称
+     */
+    private String ownerName;
+
+
     public Integer getId() {
         return id;
     }
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getVerifyName() {
+        return verifyName;
+    }
+
+    public void setVerifyName(String verifyName) {
+        this.verifyName = verifyName;
+    }
 }

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

+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * app端用户审核表，存放用户的角色还有房产信息
+ * @author weiximei
+ */
+public interface TaUserVerifyServicel {
+
+    /**
+     * 查询 app端用户审核表 的数据
+     * @param userElement
+     * @return
+     */
+    ResponseBean getList(UserElement userElement);
+
+}

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

             // 认证状态  0 是未审核   1是审核通过   2是审核不通过
             String verifyStatus = taUserVerifies.get(0).getVerifyStatus();
             // 有一个审核通过的房产
-            if ("0".equals(verifyStatus)) {
+            if ("1".equals(verifyStatus)) {
 
                 TaUserVerify userVerify = taUserVerifies.get(0);
                 // 设置 userVO 信息
                 TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
                 taUserVO.setRole(taSysRole.getRoleName());
 
-                response.addSuccess(taUserVO);
+                response.addSuccess(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode(),taUserVO);
                 return response;
             }
-            String resultCode = "1".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode() :
+            String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
                                 "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
             response.addSuccess(resultCode, taUserVO);
             return response;
     @Override
     public ResponseBean register(String parameter) {
         ResponseBean<TaUser> response = new ResponseBean();
+
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         TaUser user = jsonObject.toJavaObject(TaUser.class);
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("loginName",user.getLoginName());
+        TaUser currentUser = taUserMapper.selectByLoginName(map);
+        if (null != currentUser) {
+            response.addError("手机号已被注册");
+            return response;
+        }
+
         String code = jsonObject.getString("code");
 
         // 校验手机号 和验证码

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

+package com.community.huiju.service.impl;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserVerifyMapper;
+import com.community.huiju.dao.ToCommunitiesMapper;
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaUserVerify;
+import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.service.TaUserVerifyServicel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * app端用户审核表，存放用户的角色还有房产信息
+ * @author weiximei
+ */
+@Slf4j
+@Service
+public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private ToCommunitiesMapper toCommunitiesMapper;
+
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    @Override
+    public ResponseBean getList(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(userElement.getId());
+        TaUserVerify taUserVerify = taUserVerifies.get(0);
+        TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
+        taUserVerify.setRoleName(taSysRole.getRoleName());
+        if ("2".equals(taUserVerify.getVerifyStatus())) {
+            // 开始查询 业主
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(taUserVerify.getCommunityId(), taUserVerify.getPhase(), taUserVerify.getBuilding(), taUserVerify.getUnit(), taUserVerify.getLevel(), taUserVerify.getRoomNo());
+            taUserVerify.setOwnerName(tpBuildingOwnerInfo.getOwnerName());
+        }
+
+        responseBean.addSuccess(taUserVerifies);
+        return responseBean;
+    }
+}

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

     <result column="openid" property="openid" jdbcType="VARCHAR" />
     <result column="nickname" property="nickname" jdbcType="VARCHAR" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+      <result column="verify_name" property="verifyName" javaType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, user_id, community_id, role_id, phase, building, unit, level, room_no, verify_status, 
-    openid, nickname, create_date
+    openid, nickname, create_date, verify_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
       role_id, phase, building, 
       unit, level, room_no, 
       verify_status, openid, nickname, 
-      create_date)
+      create_date, verify_name)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, 
       #{roleId,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, 
       #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, #{roomNo,jdbcType=VARCHAR}, 
       #{verifyStatus,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP})
+      #{createDate,jdbcType=TIMESTAMP}, #{verifyName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserVerify" >
     insert into ta_user_verify
       <if test="createDate != null" >
         create_date,
       </if>
+      <if test="verifyName != null">
+          verify_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
       <if test="createDate != null" >
         #{createDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="verifyName != null">
+          #{verifyName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserVerify" >
       <if test="createDate != null" >
         create_date = #{createDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="verifyName != null">
+          verify_name = #{verifyName, jdbcType=VARCHAR}
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
       verify_status = #{verifyStatus,jdbcType=VARCHAR},
       openid = #{openid,jdbcType=VARCHAR},
       nickname = #{nickname,jdbcType=VARCHAR},
-      create_date = #{createDate,jdbcType=TIMESTAMP}
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      verify_name = #{verifyName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByUserId" resultMap="BaseResultMap" parameterType="integer">