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

@@ -17,6 +17,7 @@ import org.apache.catalina.User;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -266,4 +267,15 @@ public class UserController extends BaseController {
         responseBean = iTaUserService.addWelcomeUser(userElement, user);
         return responseBean;
     }
+
+    @ApiOperation(value = "查看当前用户所有关联房产",notes = "查看当前用户所有关联房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
+    public ResponseBean userHouseList(HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean responseBean= iTaUserService.userHouseList(userElement);
+        return responseBean;
+    }
 }

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

@@ -64,4 +64,11 @@ public interface TaUserMapper {
      * @return
      */
     TaUser getByLoginName(@Param("communityId")Integer communityId, @Param("phone")String phone);
+
+    /**
+     * 根据手机号码查询多套房产
+     * @param loginName
+     * @return
+     */
+    List<TaUser> getByLoginNameList(@Param("loginName") String loginName);
 }

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

@@ -120,4 +120,10 @@ public interface ITaUserService {
      */
     ResponseBean addWelcomeUser(UserElement userElement,TaUser user);
 
+    /**
+     * 查看当前用户所有关联房产
+     * @param userElement
+     * @return
+     */
+    ResponseBean userHouseList(UserElement userElement);
 }

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

@@ -962,4 +962,11 @@ public class TaUserServiceImpl implements ITaUserService {
         responseBean.addSuccess(user);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean userHouseList(UserElement userElement) {
+        ResponseBean response= new ResponseBean();
+        List<TaUser> taUser= taUserMapper.getByLoginNameList(userElement.getLoginName());
+        return null;
+    }
 }

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

@@ -357,7 +357,13 @@
     <if test="phone != null" >
       and login_name = #{phone,jdbcType=INTEGER}
     </if>
-
   </select>
+  <select id="getByLoginNameList" parameterType="string" resultMap="BaseResultMap">
+    <include refid="Base_Column_List" />
+    from ta_user
+    where
+      and login_name = #{loginName,jdbcType=INTEGER}
+  </select>
+
 
 </mapper>