fuxingfan
/
smartCommunity
关注 1
点赞 0
派生 0
代码 工单 1 合并请求 0 版本发布 4 动态
浏览代码

和

dingxin 6 年前
父节点
4ab4605fa8
当前提交
3d22cbbfb0
共有 3 个文件被更改，包括 138 次插入 和 192 次删除
分列视图 显示文件统计
  1. 115
    190
      CODE/smart-community-word/.idea/workspace.xml
  2. 12
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java
  3. 11
    2
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

+ 115
- 190
CODE/smart-community-word/.idea/workspace.xml 查看文件 

@@ -2,10 +2,9 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
5 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java" afterDir="false" />
6 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" afterDir="false" />
8 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" afterDir="false" />
5 
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
+      <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" />
7 
+      <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" />
9 8 
     </list>
10 9 
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
11 10 
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
 
@@ -27,21 +26,72 @@
27 26 
     <SUITE FILE_PATH="coverage/smart_community_word$PropertyApplication.ic" NAME="PropertyApplication Coverage Results" MODIFIED="1552024801928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
28 27 
   </component>
29 28 
   <component name="FileEditorManager">
30 
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29 
+    <leaf>
30 
+      <file pinned="false" current-in-tab="false">
31 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
32 
+          <provider selected="true" editor-type-id="text-editor">
33 
+            <state relative-caret-position="417">
34 
+              <caret line="270" column="39" selection-start-line="270" selection-start-column="27" selection-end-line="270" selection-end-column="39" />
35 
+            </state>
36 
+          </provider>
37 
+        </entry>
38 
+      </file>
39 
+      <file pinned="false" current-in-tab="false">
40 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java">
41 
+          <provider selected="true" editor-type-id="text-editor">
42 
+            <state relative-caret-position="417">
43 
+              <caret line="120" column="28" selection-start-line="120" selection-start-column="28" selection-end-line="120" selection-end-column="28" />
44 
+            </state>
45 
+          </provider>
46 
+        </entry>
47 
+      </file>
31 48 
       <file pinned="false" current-in-tab="true">
32 
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
49 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
50 
+          <provider selected="true" editor-type-id="text-editor">
51 
+            <state relative-caret-position="606">
52 
+              <caret line="978" column="23" selection-start-line="978" selection-start-column="23" selection-end-line="978" selection-end-column="23" />
53 
+            </state>
54 
+          </provider>
55 
+        </entry>
56 
+      </file>
57 
+      <file pinned="false" current-in-tab="false">
58 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java">
59 
+          <provider selected="true" editor-type-id="text-editor">
60 
+            <state relative-caret-position="351">
61 
+              <caret line="73" column="53" selection-start-line="73" selection-start-column="53" selection-end-line="73" selection-end-column="53" />
62 
+              <folding>
63 
+                <element signature="imports" expanded="true" />
64 
+                <element signature="e#1169#1170#0" expanded="true" />
65 
+                <element signature="e#1211#1212#0" expanded="true" />
66 
+                <element signature="e#1298#1299#0" expanded="true" />
67 
+              </folding>
68 
+            </state>
69 
+          </provider>
70 
+        </entry>
71 
+      </file>
72 
+      <file pinned="false" current-in-tab="false">
73 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
74 
+          <provider selected="true" editor-type-id="text-editor">
75 
+            <state relative-caret-position="522">
76 
+              <caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
77 
+            </state>
78 
+          </provider>
79 
+        </entry>
80 
+      </file>
81 
+      <file pinned="false" current-in-tab="false">
82 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
33 83 
           <provider selected="true" editor-type-id="text-editor">
34 
-            <state relative-caret-position="487">
35 
-              <caret line="618" selection-start-line="618" selection-end-line="621" selection-end-column="9" />
84 
+            <state relative-caret-position="-19">
85 
+              <caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
36 86 
             </state>
37 87 
           </provider>
38 88 
         </entry>
39 89 
       </file>
40 90 
       <file pinned="false" current-in-tab="false">
41 
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
91 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml">
42 92 
           <provider selected="true" editor-type-id="text-editor">
43 
-            <state relative-caret-position="224">
44 
-              <caret line="451" column="59" selection-start-line="451" selection-start-column="54" selection-end-line="451" selection-end-column="73" />
93 
+            <state relative-caret-position="458">
94 
+              <caret line="360" column="32" selection-start-line="360" selection-start-column="14" selection-end-line="360" selection-end-column="32" />
45 95 
             </state>
46 96 
           </provider>
47 97 
         </entry>
 
@@ -128,6 +178,8 @@
128 178 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java" />
129 179 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
130 180 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" />
181 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java" />
182 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" />
131 183 
       </list>
132 184 
     </option>
133 185 
   </component>
 
@@ -149,9 +201,10 @@
149 201 
     <option name="jreName" value="1.8" />
150 202 
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
151 203 
   </component>
152 
-  <component name="ProjectFrameBounds" extendedState="7">
153 
-    <option name="x" value="953" />
154 
-    <option name="width" value="974" />
204 
+  <component name="ProjectFrameBounds">
205 
+    <option name="x" value="185" />
206 
+    <option name="y" value="38" />
207 
+    <option name="width" value="1605" />
155 208 
     <option name="height" value="1047" />
156 209 
   </component>
157 210 
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
 
@@ -160,6 +213,7 @@
160 213 
       <foldersAlwaysOnTop value="true" />
161 214 
     </navigator>
162 215 
     <panes>
216 
+      <pane id="Scope" />
163 217 
       <pane id="PackagesPane" />
164 218 
       <pane id="ProjectPane">
165 219 
         <subPane>
 
@@ -236,145 +290,10 @@
236 290 
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
237 291 
               <item name="controller" type="462c0819:PsiDirectoryNode" />
238 292 
             </path>
239 
-            <path>
240 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
241 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
242 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
243 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
244 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
245 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
246 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
247 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
248 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
249 
-              <item name="dao" type="462c0819:PsiDirectoryNode" />
250 
-            </path>
251 
-            <path>
252 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
253 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
254 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
255 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
256 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
257 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
258 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
259 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
260 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
261 
-              <item name="model" type="462c0819:PsiDirectoryNode" />
262 
-            </path>
263 
-            <path>
264 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
265 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
266 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
267 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
268 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
269 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
270 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
271 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
272 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
273 
-              <item name="service" type="462c0819:PsiDirectoryNode" />
274 
-            </path>
275 
-            <path>
276 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
277 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
278 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
279 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
280 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
281 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
282 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
283 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
284 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
285 
-              <item name="service" type="462c0819:PsiDirectoryNode" />
286 
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
287 
-            </path>
288 
-            <path>
289 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
290 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
291 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
292 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
293 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
294 
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
295 
-            </path>
296 
-            <path>
297 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
298 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
299 
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
300 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
301 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
302 
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
303 
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
304 
-            </path>
305 
-            <path>
306 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
307 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
308 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
309 
-            </path>
310 
-            <path>
311 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
312 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
313 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
314 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
315 
-            </path>
316 
-            <path>
317 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
318 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
319 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
320 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
321 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
322 
-            </path>
323 
-            <path>
324 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
325 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
326 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
327 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
328 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
329 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
330 
-            </path>
331 
-            <path>
332 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
333 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
334 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
335 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
336 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
337 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
338 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
339 
-            </path>
340 
-            <path>
341 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
342 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
343 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
344 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
345 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
346 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
347 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
348 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
349 
-            </path>
350 
-            <path>
351 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
352 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
353 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
354 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
355 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
356 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
357 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
358 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
359 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
360 
-            </path>
361 
-            <path>
362 
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
363 
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
364 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
365 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
366 
-              <item name="main" type="462c0819:PsiDirectoryNode" />
367 
-              <item name="java" type="462c0819:PsiDirectoryNode" />
368 
-              <item name="com" type="462c0819:PsiDirectoryNode" />
369 
-              <item name="community" type="462c0819:PsiDirectoryNode" />
370 
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
371 
-              <item name="model" type="462c0819:PsiDirectoryNode" />
372 
-            </path>
373 293 
           </expand>
374 294 
           <select />
375 295 
         </subPane>
376 296 
       </pane>
377 
-      <pane id="Scope" />
378 297 
     </panes>
379 298 
   </component>
380 299 
   <component name="PropertiesComponent">
 
@@ -384,7 +303,7 @@
384 303 
     <property name="RequestMappingsPanelWidth1" value="75" />
385 304 
     <property name="WebServerToolWindowFactoryState" value="false" />
386 305 
     <property name="aspect.path.notification.shown" value="true" />
387 
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552547384005" />
306 
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553741274409" />
388 307 
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
389 308 
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
390 309 
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
 
@@ -419,7 +338,7 @@
419 338 
       </list>
420 339 
     </option>
421 340 
   </component>
422 
-  <component name="RunManager" selected="Spring Boot.ZuulApplication">
341 
+  <component name="RunManager" selected="Spring Boot.AppApplication">
423 342 
     <configuration default="true" type="Applet">
424 343 
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
425 344 
       <method v="2">
 
@@ -548,13 +467,13 @@
548 467 
     <servers />
549 468 
   </component>
550 469 
   <component name="TimeTrackingManager">
551 
-    <option name="totallyTimeSpent" value="152656000" />
470 
+    <option name="totallyTimeSpent" value="153440000" />
552 471 
   </component>
553 472 
   <component name="ToolWindowManager">
554 
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
473 
+    <frame x="185" y="38" width="1605" height="1047" extended-state="0" />
555 474 
     <editor active="true" />
556 475 
     <layout>
557 
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1609808" />
476 
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22847897" />
558 477 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
559 478 
       <window_info id="Designer" order="2" />
560 479 
       <window_info id="Image Layers" order="3" />
 
@@ -565,7 +484,7 @@
565 484 
       <window_info anchor="bottom" id="Message" order="0" />
566 485 
       <window_info anchor="bottom" id="Find" order="1" />
567 486 
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
568 
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.06013363" />
487 
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" weight="0.06013363" />
569 488 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
570 489 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
571 490 
       <window_info anchor="bottom" id="TODO" order="6" />
 
@@ -686,34 +605,6 @@
686 605 
     </breakpoint-manager>
687 606 
   </component>
688 607 
   <component name="editorHistoryManager">
689 
-    <entry file="jar://F:/maven3.5/maven/serverRepository/com/alibaba/fastjson/1.2.56/fastjson-1.2.56-sources.jar!/com/alibaba/fastjson/JSONObject.java">
690 
-      <provider selected="true" editor-type-id="text-editor">
691 
-        <state relative-caret-position="228">
692 
-          <caret line="323" column="16" selection-start-line="323" selection-start-column="16" selection-end-line="323" selection-end-column="16" />
693 
-        </state>
694 
-      </provider>
695 
-    </entry>
696 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/RoleMapper.java">
697 
-      <provider selected="true" editor-type-id="text-editor">
698 
-        <state relative-caret-position="351">
699 
-          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
700 
-        </state>
701 
-      </provider>
702 
-    </entry>
703 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml">
704 
-      <provider selected="true" editor-type-id="text-editor">
705 
-        <state relative-caret-position="290">
706 
-          <caret line="29" column="61" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="61" />
707 
-        </state>
708 
-      </provider>
709 
-    </entry>
710 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java">
711 
-      <provider selected="true" editor-type-id="text-editor">
712 
-        <state relative-caret-position="297">
713 
-          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
714 
-        </state>
715 
-      </provider>
716 
-    </entry>
717 608 
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java">
718 609 
       <provider selected="true" editor-type-id="text-editor">
719 610 
         <state relative-caret-position="440">
 
@@ -791,13 +682,6 @@
791 682 
         </state>
792 683 
       </provider>
793 684 
     </entry>
794 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
795 
-      <provider selected="true" editor-type-id="text-editor">
796 
-        <state relative-caret-position="324">
797 
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
798 
-        </state>
799 
-      </provider>
800 
-    </entry>
801 685 
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysRoleMapper.xml">
802 686 
       <provider selected="true" editor-type-id="text-editor">
803 687 
         <state relative-caret-position="-2187" />
 
@@ -1095,6 +979,47 @@
1095 979 
         </state>
1096 980 
       </provider>
1097 981 
     </entry>
982 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml">
983 
+      <provider selected="true" editor-type-id="text-editor">
984 
+        <state relative-caret-position="458">
985 
+          <caret line="360" column="32" selection-start-line="360" selection-start-column="14" selection-end-line="360" selection-end-column="32" />
986 
+        </state>
987 
+      </provider>
988 
+    </entry>
989 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
990 
+      <provider selected="true" editor-type-id="text-editor">
991 
+        <state relative-caret-position="-19">
992 
+          <caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
993 
+        </state>
994 
+      </provider>
995 
+    </entry>
996 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
997 
+      <provider selected="true" editor-type-id="text-editor">
998 
+        <state relative-caret-position="522">
999 
+          <caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
1000 
+        </state>
1001 
+      </provider>
1002 
+    </entry>
1003 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java">
1004 
+      <provider selected="true" editor-type-id="text-editor">
1005 
+        <state relative-caret-position="351">
1006 
+          <caret line="73" column="53" selection-start-line="73" selection-start-column="53" selection-end-line="73" selection-end-column="53" />
1007 
+          <folding>
1008 
+            <element signature="imports" expanded="true" />
1009 
+            <element signature="e#1169#1170#0" expanded="true" />
1010 
+            <element signature="e#1211#1212#0" expanded="true" />
1011 
+            <element signature="e#1298#1299#0" expanded="true" />
1012 
+          </folding>
1013 
+        </state>
1014 
+      </provider>
1015 
+    </entry>
1016 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java">
1017 
+      <provider selected="true" editor-type-id="text-editor">
1018 
+        <state relative-caret-position="606">
1019 
+          <caret line="978" column="23" selection-start-line="978" selection-start-column="23" selection-end-line="978" selection-end-column="23" />
1020 
+        </state>
1021 
+      </provider>
1022 
+    </entry>
1098 1023 
   </component>
1099 1024 
   <component name="masterDetails">
1100 1025 
     <states>

+ 12
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java 查看文件 

@@ -1,6 +1,7 @@
1 1 
 package com.community.huiju.model;
2 2
3 3 
 import java.util.Date;
4 
+import java.util.List;
4 5
5 6 
 public class TaUser {
6 7 
     private Integer id;

@@ -63,6 +64,17 @@ public class TaUser {
63 64 
     // 海康人员编号
64 65 
     private Long hkPersonNo;
65 66
67 
+    // 当前用户下的多套房产
68 
+    private List<TpBuildingOwnerInfo> houseList;
69 
+
70 
+    public void setHouseList(List<TpBuildingOwnerInfo> houseList) {
71 
+        this.houseList = houseList;
72 
+    }
73 
+
74 
+    public List<TpBuildingOwnerInfo> getHouseList() {
75 
+        return houseList;
76 
+    }
77 
+
66 78 
     public Integer getId() {
67 79 
         return id;
68 80 
     }

+ 11
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java 查看文件 

@@ -975,7 +975,16 @@ public class TaUserServiceImpl implements ITaUserService {
975 975 
     @Override
976 976 
     public ResponseBean userHouseList(UserElement userElement) {
977 977 
         ResponseBean response= new ResponseBean();
978 
-        List<TaUser> taUser= taUserMapper.getByLoginNameList(userElement.getLoginName());
979 
-        return null;
978 
+        /*根据手机号会查询所有小区的多套房产*/
979 
+        List<TaUser> taUserList= taUserMapper.getByLoginNameList(userElement.getLoginName());
980 
+
981 
+        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo=null;
982 
+        for (TaUser taUser:taUserList){
983 
+             tpBuildingOwnerInfo=tpBuildingOwnerInfoMapper.getByCommunityIdAndOwnerTel(taUser.getCommunityId(),taUser.getLoginName());
984 
+
985 
+             taUser.setHouseList(tpBuildingOwnerInfo);
986 
+        }
987 
+        response.addSuccess(taUserList);
988 
+        return response;
980 989 
     }
981 990 
 }