合并

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

@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
@@ -27,71 +27,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <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="417">
-              <caret line="270" column="39" selection-start-line="270" selection-start-column="27" selection-end-line="270" selection-end-column="39" />
-            </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="417">
-              <caret line="120" column="28" selection-start-line="120" selection-start-column="28" selection-end-line="120" selection-end-column="28" />
-            </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/service/impl/TaUserServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="606">
-              <caret line="978" column="23" selection-start-line="978" selection-start-column="23" selection-end-line="978" selection-end-column="23" />
-            </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/model/TaUser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="351">
-              <caret line="73" column="53" selection-start-line="73" selection-start-column="53" selection-end-line="73" selection-end-column="53" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1169#1170#0" expanded="true" />
-                <element signature="e#1211#1212#0" expanded="true" />
-                <element signature="e#1298#1299#0" 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/dao/TpBuildingOwnerInfoMapper.java">
+        <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="522">
-              <caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
+            <state relative-caret-position="335">
+              <caret line="270" column="28" lean-forward="true" selection-start-line="270" selection-start-column="28" selection-end-line="270" selection-end-column="28" />
             </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/dao/TaUserMapper.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="-19">
-              <caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
+            <state relative-caret-position="189">
+              <caret line="16" column="27" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml">
+        <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="458">
-              <caret line="360" column="32" selection-start-line="360" selection-start-column="14" selection-end-line="360" selection-end-column="32" />
+            <state relative-caret-position="451">
+              <caret line="976" selection-start-line="976" selection-end-line="976" />
             </state>
           </provider>
         </entry>
@@ -179,6 +137,8 @@
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
         <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/controller/UserController.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" />
       </list>
     </option>
@@ -290,6 +250,31 @@
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -303,7 +288,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="1553741274409" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553744382063" />
     <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" />
@@ -467,13 +452,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="153440000" />
+    <option name="totallyTimeSpent" value="155072000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="185" y="38" width="1605" height="1047" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22847897" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08608414" />
       <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" />
@@ -484,7 +469,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.06013363" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.25084364" />
       <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" />
@@ -492,7 +477,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 anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27941176" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27896512" />
       <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" />
@@ -601,35 +586,16 @@
           <properties />
           <option name="timeStamp" value="5" />
         </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>268</line>
+          <properties />
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
-          <folding>
-            <element signature="e#836#837#0" expanded="true" />
-            <element signature="e#903#904#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BannerController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14">
-          <caret line="29" column="62" lean-forward="true" selection-start-line="29" selection-start-column="62" selection-end-line="29" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="385" column="26" selection-start-line="385" selection-start-column="26" selection-end-line="385" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -993,13 +959,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
-          <caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="351">
@@ -1013,10 +972,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="34" column="46" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <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="189">
+          <caret line="16" column="27" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="27" />
+        </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="606">
-          <caret line="978" column="23" selection-start-line="978" selection-start-column="23" selection-end-line="978" selection-end-column="23" />
+        <state relative-caret-position="451">
+          <caret line="976" selection-start-line="976" selection-end-line="976" />
+        </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">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="432">
+          <caret line="225" selection-start-line="225" selection-end-line="225" />
+        </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="335">
+          <caret line="270" column="28" lean-forward="true" selection-start-line="270" selection-start-column="28" selection-end-line="270" selection-end-column="28" />
         </state>
       </provider>
     </entry>

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

@@ -266,7 +266,7 @@ public class UserController extends BaseController {
     })
     @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
     public ResponseBean userHouseList(HttpSession session){
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        UserElement userElement= getUserElement(session);
         ResponseBean responseBean= iTaUserService.userHouseList(userElement);
         return responseBean;
     }

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

@@ -30,4 +30,7 @@ public interface TpBuildingOwnerInfoMapper {
 
     //根据手机号查询当前信息
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
+
+    @Select("select * from tp_building_owner_info where owner_tel=#{ownerTel}")
+    List<TpBuildingOwnerInfo> sellectHouseList(@Param("ownerTel") String ownerTel);
 }

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

@@ -976,15 +976,8 @@ public class TaUserServiceImpl implements ITaUserService {
     public ResponseBean userHouseList(UserElement userElement) {
         ResponseBean response= new ResponseBean();
         /*根据手机号会查询所有小区的多套房产*/
-        List<TaUser> taUserList= taUserMapper.getByLoginNameList(userElement.getLoginName());
-
-        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo=null;
-        for (TaUser taUser:taUserList){
-             tpBuildingOwnerInfo=tpBuildingOwnerInfoMapper.getByCommunityIdAndOwnerTel(taUser.getCommunityId(),taUser.getLoginName());
-
-             taUser.setHouseList(tpBuildingOwnerInfo);
-        }
-        response.addSuccess(taUserList);
+        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo  = tpBuildingOwnerInfoMapper.sellectHouseList(userElement.getLoginName());
+        response.addSuccess(tpBuildingOwnerInfo);
         return response;
     }
 }