合并

CODE/smart-community-word/.idea/workspace.xml

@@ -27,11 +27,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="305">
-              <caret line="269" column="68" selection-start-line="269" selection-start-column="68" selection-end-line="269" selection-end-column="68" />
+            <state relative-caret-position="366">
+              <caret line="256" column="57" selection-start-line="256" selection-start-column="57" selection-end-line="256" selection-end-column="57" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="363">
+              <caret line="136" column="26" lean-forward="true" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="30" />
             </state>
           </provider>
         </entry>
@@ -39,23 +48,51 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+            <state relative-caret-position="351">
+              <caret line="64" selection-start-line="64" selection-end-line="64" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="971" column="28" selection-start-line="971" selection-start-column="28" selection-end-line="971" selection-end-column="28" />
+            <state relative-caret-position="162">
+              <caret line="6" column="35" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="351">
+              <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="89">
+              <caret line="24" selection-start-line="24" selection-end-line="27" selection-end-column="49" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>ticketDetails</find>
@@ -138,8 +175,9 @@
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java" />
       </list>
     </option>
   </component>
@@ -162,8 +200,8 @@
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="185" />
-    <option name="y" value="38" />
+    <option name="x" value="249" />
+    <option name="y" value="77" />
     <option name="width" value="1605" />
     <option name="height" value="1047" />
   </component>
@@ -288,7 +326,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553744933099" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553753848390" />
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -452,13 +490,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="155723000" />
+    <option name="totallyTimeSpent" value="157687000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="185" y="38" width="1605" height="1047" extended-state="0" />
+    <frame x="249" y="77" width="1605" height="1047" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08608414" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34951457" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -469,7 +507,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" weight="0.16760404" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.30033746" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -477,7 +515,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
-      <window_info active="true" anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" visible="true" weight="0.27784026" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27784026" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
@@ -588,52 +626,20 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java</url>
-          <line>272</line>
+          <line>255</line>
+          <properties />
+          <option name="timeStamp" value="15" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java</url>
+          <line>59</line>
           <properties />
-          <option name="timeStamp" value="13" />
+          <option name="timeStamp" value="16" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="473">
-          <caret line="46" column="7" lean-forward="true" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="33" column="14" selection-start-line="33" selection-start-column="14" selection-end-line="33" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="42" column="58" selection-start-line="42" selection-start-column="58" selection-end-line="42" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="407">
@@ -979,31 +985,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
+    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE-sources.jar!/org/springframework/util/ReflectionUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+        <state relative-caret-position="402">
+          <caret line="225" selection-start-line="225" selection-end-line="225" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE-sources.jar!/org/springframework/util/ReflectionUtils.java">
+    <entry file="jar://F:/maven3.5/maven/serverRepository/org/apache/tomcat/embed/tomcat-embed-core/8.5.32/tomcat-embed-core-8.5.32-sources.jar!/javax/servlet/http/HttpSession.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="225" selection-start-line="225" selection-end-line="225" />
+        <state relative-caret-position="197">
+          <caret line="157" column="18" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="256" column="57" selection-start-line="256" selection-start-column="57" selection-end-line="256" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="136" column="26" lean-forward="true" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="30" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="971" column="28" selection-start-line="971" selection-start-column="28" selection-end-line="971" selection-end-column="28" />
+        <state relative-caret-position="351">
+          <caret line="981" column="5" lean-forward="true" selection-start-line="981" selection-start-column="5" selection-end-line="981" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="351">
+          <caret line="64" selection-start-line="64" selection-end-line="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
-          <caret line="269" column="68" selection-start-line="269" selection-start-column="68" selection-end-line="269" selection-end-column="68" />
+        <state relative-caret-position="89">
+          <caret line="24" selection-start-line="24" selection-end-line="27" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="351">
+          <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -0,0 +1,21 @@
+package com.community.huiju.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/3/28
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "楼栋资料库API",description = "楼栋资料库API")
+public class IBuildingOwnerInfoController {
+}

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

@@ -41,8 +41,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)")
     })
     @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
     public ResponseBean login(@RequestBody String parameter,
@@ -58,8 +57,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
@@ -72,8 +70,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
     public ResponseBean accessTicket(HttpSession session){
@@ -87,8 +84,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "修改用户名和性别和身份证", notes = "修改用户名和性别和身份证")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别和idCard身份证"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
     public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
@@ -108,8 +104,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "租客或家属 启用或者停用", notes = "租客或家属 启用或者停用")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/user/dependentsOrTenants",method = RequestMethod.PUT)
     public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
@@ -133,7 +128,6 @@ public class UserController extends BaseController {
                     "gender(租客或者家属 性别 1男 2女) " +
                     "type(2租客 3家属)" +
                     "idCard(身份证号)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
@@ -160,7 +154,6 @@ public class UserController extends BaseController {
                     "gender(租客或者家属 性别 1男 2女) " +
                     "type(2租客 3家属)" +
                     "idCard(身份证号)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/updateTenantsOrDependents",method = RequestMethod.POST)
@@ -186,7 +179,6 @@ public class UserController extends BaseController {
     @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/modifyUserHeadPortrait",method = RequestMethod.PUT)
@@ -204,18 +196,14 @@ public class UserController extends BaseController {
     @ApiOperation(value = "获取用户信息", notes = "获取用户信息, 携带userId表示查询租客或者家属")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
     public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId,
                                     HttpSession session){
         ResponseBean response = new ResponseBean();
-
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer id =  userElement.getId();
-
-        response = iTaUserService.getUserInfo(id,userId);
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.getUserInfo(userElement.getId(),userId);
         TaUserVO userVO = (TaUserVO) response.getData();
         userVO.setToken(session.getId());
 
@@ -227,7 +215,6 @@ public class UserController extends BaseController {
     @ApiOperation(value = "游客登录", notes = "游客登录")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
     public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {
@@ -262,12 +249,12 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "查看当前用户所有关联房产",notes = "查看当前用户所有关联房产")
     @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
     })
     @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
     public ResponseBean userHouseList(HttpSession session){
-//        UserElement userElement= getUserElement(session);
-        ResponseBean responseBean= iTaUserService.userHouseList(null);
+        UserElement userElement= getUserElement(session);
+        ResponseBean responseBean= iTaUserService.userHouseList(userElement);
         return responseBean;
     }
 }

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

@@ -976,7 +976,7 @@ public class TaUserServiceImpl implements ITaUserService {
     public ResponseBean userHouseList(UserElement userElement) {
         ResponseBean response= new ResponseBean();
         /*根据手机号会查询所有小区的多套房产*/
-        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo  = tpBuildingOwnerInfoMapper.sellectHouseList("17729250199");
+        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo  = tpBuildingOwnerInfoMapper.sellectHouseList(userElement.getLoginName());
         response.addSuccess(tpBuildingOwnerInfo);
         return response;
     }