Przeglądaj źródła

Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

魏熙美 6 lat temu
rodzic
commit
8949695a9f

+ 143
- 112
CODE/smart-community-word/.idea/workspace.xml Wyświetl plik

3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
4
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
6
+      <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" />
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" />
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" />
8
     </list>
8
     </list>
9
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
9
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
30
       <file pinned="false" current-in-tab="false">
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">
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">
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" />
33
+            <state relative-caret-position="366">
34
+              <caret line="256" column="57" selection-start-line="256" selection-start-column="57" selection-end-line="256" selection-end-column="57" />
35
             </state>
35
             </state>
36
           </provider>
36
           </provider>
37
         </entry>
37
         </entry>
39
       <file pinned="false" current-in-tab="false">
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">
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">
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>
48
-      <file pinned="false" current-in-tab="true">
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" />
42
+            <state relative-caret-position="363">
43
+              <caret line="136" column="26" lean-forward="true" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="30" />
53
             </state>
44
             </state>
54
           </provider>
45
           </provider>
55
         </entry>
46
         </entry>
56
       </file>
47
       </file>
57
       <file pinned="false" current-in-tab="false">
48
       <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">
49
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
59
           <provider selected="true" editor-type-id="text-editor">
50
           <provider selected="true" editor-type-id="text-editor">
60
             <state relative-caret-position="351">
51
             <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>
52
+              <caret line="64" selection-start-line="64" selection-end-line="64" />
68
             </state>
53
             </state>
69
           </provider>
54
           </provider>
70
         </entry>
55
         </entry>
71
       </file>
56
       </file>
72
       <file pinned="false" current-in-tab="false">
57
       <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">
58
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
74
           <provider selected="true" editor-type-id="text-editor">
59
           <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" />
60
+            <state relative-caret-position="162">
61
+              <caret line="6" column="35" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="35" />
77
             </state>
62
             </state>
78
           </provider>
63
           </provider>
79
         </entry>
64
         </entry>
80
       </file>
65
       </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">
66
+      <file pinned="false" current-in-tab="true">
67
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java">
83
           <provider selected="true" editor-type-id="text-editor">
68
           <provider selected="true" editor-type-id="text-editor">
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" />
69
+            <state relative-caret-position="351">
70
+              <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
71
+              <folding>
72
+                <element signature="imports" expanded="true" />
73
+              </folding>
86
             </state>
74
             </state>
87
           </provider>
75
           </provider>
88
         </entry>
76
         </entry>
89
       </file>
77
       </file>
90
       <file pinned="false" current-in-tab="false">
78
       <file pinned="false" current-in-tab="false">
91
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml">
79
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java">
92
           <provider selected="true" editor-type-id="text-editor">
80
           <provider selected="true" editor-type-id="text-editor">
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" />
81
+            <state relative-caret-position="89">
82
+              <caret line="24" selection-start-line="24" selection-end-line="27" selection-end-column="49" />
95
             </state>
83
             </state>
96
           </provider>
84
           </provider>
97
         </entry>
85
         </entry>
98
       </file>
86
       </file>
99
     </leaf>
87
     </leaf>
100
   </component>
88
   </component>
89
+  <component name="FileTemplateManagerImpl">
90
+    <option name="RECENT_TEMPLATES">
91
+      <list>
92
+        <option value="Class" />
93
+      </list>
94
+    </option>
95
+  </component>
101
   <component name="FindInProjectRecents">
96
   <component name="FindInProjectRecents">
102
     <findStrings>
97
     <findStrings>
103
       <find>ticketDetails</find>
98
       <find>ticketDetails</find>
179
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
174
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
180
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" />
175
         <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" />
176
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java" />
177
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java" />
178
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" />
182
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" />
179
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java" />
180
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java" />
183
       </list>
181
       </list>
184
     </option>
182
     </option>
185
   </component>
183
   </component>
202
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
200
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
203
   </component>
201
   </component>
204
   <component name="ProjectFrameBounds">
202
   <component name="ProjectFrameBounds">
205
-    <option name="x" value="185" />
206
-    <option name="y" value="38" />
203
+    <option name="x" value="249" />
204
+    <option name="y" value="77" />
207
     <option name="width" value="1605" />
205
     <option name="width" value="1605" />
208
     <option name="height" value="1047" />
206
     <option name="height" value="1047" />
209
   </component>
207
   </component>
290
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
288
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
291
               <item name="controller" type="462c0819:PsiDirectoryNode" />
289
               <item name="controller" type="462c0819:PsiDirectoryNode" />
292
             </path>
290
             </path>
291
+            <path>
292
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
293
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
294
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
295
+              <item name="src" type="462c0819:PsiDirectoryNode" />
296
+              <item name="main" type="462c0819:PsiDirectoryNode" />
297
+              <item name="java" type="462c0819:PsiDirectoryNode" />
298
+              <item name="com" type="462c0819:PsiDirectoryNode" />
299
+              <item name="community" type="462c0819:PsiDirectoryNode" />
300
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
301
+              <item name="service" type="462c0819:PsiDirectoryNode" />
302
+            </path>
303
+            <path>
304
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
305
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
306
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
307
+              <item name="src" type="462c0819:PsiDirectoryNode" />
308
+              <item name="main" type="462c0819:PsiDirectoryNode" />
309
+              <item name="java" type="462c0819:PsiDirectoryNode" />
310
+              <item name="com" type="462c0819:PsiDirectoryNode" />
311
+              <item name="community" type="462c0819:PsiDirectoryNode" />
312
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
313
+              <item name="service" type="462c0819:PsiDirectoryNode" />
314
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
315
+            </path>
293
           </expand>
316
           </expand>
294
           <select />
317
           <select />
295
         </subPane>
318
         </subPane>
303
     <property name="RequestMappingsPanelWidth1" value="75" />
326
     <property name="RequestMappingsPanelWidth1" value="75" />
304
     <property name="WebServerToolWindowFactoryState" value="false" />
327
     <property name="WebServerToolWindowFactoryState" value="false" />
305
     <property name="aspect.path.notification.shown" value="true" />
328
     <property name="aspect.path.notification.shown" value="true" />
306
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553741274409" />
329
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553753848390" />
307
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
330
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
308
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
331
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
309
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
332
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
467
     <servers />
490
     <servers />
468
   </component>
491
   </component>
469
   <component name="TimeTrackingManager">
492
   <component name="TimeTrackingManager">
470
-    <option name="totallyTimeSpent" value="153440000" />
493
+    <option name="totallyTimeSpent" value="157687000" />
471
   </component>
494
   </component>
472
   <component name="ToolWindowManager">
495
   <component name="ToolWindowManager">
473
-    <frame x="185" y="38" width="1605" height="1047" extended-state="0" />
496
+    <frame x="249" y="77" width="1605" height="1047" extended-state="0" />
474
     <editor active="true" />
497
     <editor active="true" />
475
     <layout>
498
     <layout>
476
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22847897" />
499
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34951457" />
477
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
500
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
478
       <window_info id="Designer" order="2" />
501
       <window_info id="Designer" order="2" />
479
       <window_info id="Image Layers" order="3" />
502
       <window_info id="Image Layers" order="3" />
484
       <window_info anchor="bottom" id="Message" order="0" />
507
       <window_info anchor="bottom" id="Message" order="0" />
485
       <window_info anchor="bottom" id="Find" order="1" />
508
       <window_info anchor="bottom" id="Find" order="1" />
486
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
509
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
487
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" weight="0.06013363" />
510
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.30033746" />
488
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
511
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
489
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
512
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
490
       <window_info anchor="bottom" id="TODO" order="6" />
513
       <window_info anchor="bottom" id="TODO" order="6" />
492
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49946696" weight="0.32962137" />
515
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49946696" weight="0.32962137" />
493
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
516
       <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
494
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
517
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
495
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27941176" />
518
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27784026" />
496
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
519
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
497
       <window_info anchor="bottom" id="Database Changes" order="13" />
520
       <window_info anchor="bottom" id="Database Changes" order="13" />
498
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
521
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
601
           <properties />
624
           <properties />
602
           <option name="timeStamp" value="5" />
625
           <option name="timeStamp" value="5" />
603
         </line-breakpoint>
626
         </line-breakpoint>
627
+        <line-breakpoint enabled="true" type="java-line">
628
+          <url>file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java</url>
629
+          <line>255</line>
630
+          <properties />
631
+          <option name="timeStamp" value="15" />
632
+        </line-breakpoint>
633
+        <line-breakpoint enabled="true" type="java-line">
634
+          <url>file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java</url>
635
+          <line>59</line>
636
+          <properties />
637
+          <option name="timeStamp" value="16" />
638
+        </line-breakpoint>
604
       </breakpoints>
639
       </breakpoints>
605
     </breakpoint-manager>
640
     </breakpoint-manager>
606
   </component>
641
   </component>
607
   <component name="editorHistoryManager">
642
   <component name="editorHistoryManager">
608
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java">
609
-      <provider selected="true" editor-type-id="text-editor">
610
-        <state relative-caret-position="440">
611
-          <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
612
-          <folding>
613
-            <element signature="e#836#837#0" expanded="true" />
614
-            <element signature="e#903#904#0" expanded="true" />
615
-          </folding>
616
-        </state>
617
-      </provider>
618
-    </entry>
619
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BannerController.java">
620
-      <provider selected="true" editor-type-id="text-editor">
621
-        <state relative-caret-position="14">
622
-          <caret line="29" column="62" lean-forward="true" selection-start-line="29" selection-start-column="62" selection-end-line="29" selection-end-column="62" />
623
-        </state>
624
-      </provider>
625
-    </entry>
626
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml">
627
-      <provider selected="true" editor-type-id="text-editor">
628
-        <state relative-caret-position="338">
629
-          <caret line="385" column="26" selection-start-line="385" selection-start-column="26" selection-end-line="385" selection-end-column="26" />
630
-        </state>
631
-      </provider>
632
-    </entry>
633
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java">
634
-      <provider selected="true" editor-type-id="text-editor">
635
-        <state relative-caret-position="473">
636
-          <caret line="46" column="7" lean-forward="true" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
637
-        </state>
638
-      </provider>
639
-    </entry>
640
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
641
-      <provider selected="true" editor-type-id="text-editor">
642
-        <state relative-caret-position="231">
643
-          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
644
-        </state>
645
-      </provider>
646
-    </entry>
647
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java">
648
-      <provider selected="true" editor-type-id="text-editor">
649
-        <state relative-caret-position="318">
650
-          <caret line="33" column="14" selection-start-line="33" selection-start-column="14" selection-end-line="33" selection-end-column="14" />
651
-          <folding>
652
-            <element signature="imports" expanded="true" />
653
-          </folding>
654
-        </state>
655
-      </provider>
656
-    </entry>
657
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java">
658
-      <provider selected="true" editor-type-id="text-editor">
659
-        <state relative-caret-position="235">
660
-          <caret line="42" column="58" selection-start-line="42" selection-start-column="58" selection-end-line="42" selection-end-column="58" />
661
-        </state>
662
-      </provider>
663
-    </entry>
664
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
665
-      <provider selected="true" editor-type-id="text-editor">
666
-        <state relative-caret-position="306">
667
-          <caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
668
-        </state>
669
-      </provider>
670
-    </entry>
671
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml">
643
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml">
672
       <provider selected="true" editor-type-id="text-editor">
644
       <provider selected="true" editor-type-id="text-editor">
673
         <state relative-caret-position="407">
645
         <state relative-caret-position="407">
993
         </state>
965
         </state>
994
       </provider>
966
       </provider>
995
     </entry>
967
     </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">
968
     <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">
969
       <provider selected="true" editor-type-id="text-editor">
1005
         <state relative-caret-position="351">
970
         <state relative-caret-position="351">
1013
         </state>
978
         </state>
1014
       </provider>
979
       </provider>
1015
     </entry>
980
     </entry>
981
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java">
982
+      <provider selected="true" editor-type-id="text-editor">
983
+        <state relative-caret-position="465">
984
+          <caret line="34" column="46" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="46" />
985
+        </state>
986
+      </provider>
987
+    </entry>
988
+    <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">
989
+      <provider selected="true" editor-type-id="text-editor">
990
+        <state relative-caret-position="402">
991
+          <caret line="225" selection-start-line="225" selection-end-line="225" />
992
+        </state>
993
+      </provider>
994
+    </entry>
995
+    <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">
996
+      <provider selected="true" editor-type-id="text-editor">
997
+        <state relative-caret-position="197">
998
+          <caret line="157" column="18" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
999
+        </state>
1000
+      </provider>
1001
+    </entry>
1002
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
1003
+      <provider selected="true" editor-type-id="text-editor">
1004
+        <state relative-caret-position="366">
1005
+          <caret line="256" column="57" selection-start-line="256" selection-start-column="57" selection-end-line="256" selection-end-column="57" />
1006
+        </state>
1007
+      </provider>
1008
+    </entry>
1009
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java">
1010
+      <provider selected="true" editor-type-id="text-editor">
1011
+        <state relative-caret-position="363">
1012
+          <caret line="136" column="26" lean-forward="true" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="30" />
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">
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">
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" />
1018
+        <state relative-caret-position="351">
1019
+          <caret line="981" column="5" lean-forward="true" selection-start-line="981" selection-start-column="5" selection-end-line="981" selection-end-column="5" />
1020
+        </state>
1021
+      </provider>
1022
+    </entry>
1023
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java">
1024
+      <provider selected="true" editor-type-id="text-editor">
1025
+        <state relative-caret-position="351">
1026
+          <caret line="64" selection-start-line="64" selection-end-line="64" />
1027
+        </state>
1028
+      </provider>
1029
+    </entry>
1030
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfo.java">
1031
+      <provider selected="true" editor-type-id="text-editor">
1032
+        <state relative-caret-position="162">
1033
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="35" />
1034
+        </state>
1035
+      </provider>
1036
+    </entry>
1037
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/HkController.java">
1038
+      <provider selected="true" editor-type-id="text-editor">
1039
+        <state relative-caret-position="89">
1040
+          <caret line="24" selection-start-line="24" selection-end-line="27" selection-end-column="49" />
1041
+        </state>
1042
+      </provider>
1043
+    </entry>
1044
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java">
1045
+      <provider selected="true" editor-type-id="text-editor">
1046
+        <state relative-caret-position="351">
1047
+          <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
1048
+          <folding>
1049
+            <element signature="imports" expanded="true" />
1050
+          </folding>
1020
         </state>
1051
         </state>
1021
       </provider>
1052
       </provider>
1022
     </entry>
1053
     </entry>

+ 21
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/IBuildingOwnerInfoController.java Wyświetl plik

1
+package com.community.huiju.controller;
2
+
3
+import io.swagger.annotations.Api;
4
+import org.springframework.cloud.context.config.annotation.RefreshScope;
5
+import org.springframework.web.bind.annotation.RequestMapping;
6
+import org.springframework.web.bind.annotation.RestController;
7
+
8
+/**
9
+ * version V1.0
10
+ * class_name: $METHOD_NAME$
11
+ * param: $METHOD_PARAM$
12
+ * describe: TODO
13
+ * creat_user:fannaixi
14
+ * creat_time: 2019/3/28
15
+ **/
16
+@RestController
17
+@RefreshScope
18
+@RequestMapping("/")
19
+@Api(value = "楼栋资料库API",description = "楼栋资料库API")
20
+public class IBuildingOwnerInfoController {
21
+}

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java Wyświetl plik

249
 
249
 
250
     @ApiOperation(value = "查看当前用户所有关联房产",notes = "查看当前用户所有关联房产")
250
     @ApiOperation(value = "查看当前用户所有关联房产",notes = "查看当前用户所有关联房产")
251
     @ApiImplicitParams({
251
     @ApiImplicitParams({
252
-            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
252
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
253
     })
253
     })
254
     @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
254
     @RequestMapping(value ="/userhouse" ,method = RequestMethod.GET)
255
     public ResponseBean userHouseList(HttpSession session){
255
     public ResponseBean userHouseList(HttpSession session){
256
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
256
+        UserElement userElement= getUserElement(session);
257
         ResponseBean responseBean= iTaUserService.userHouseList(userElement);
257
         ResponseBean responseBean= iTaUserService.userHouseList(userElement);
258
         return responseBean;
258
         return responseBean;
259
     }
259
     }

+ 3
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java Wyświetl plik

30
 
30
 
31
     //根据手机号查询当前信息
31
     //根据手机号查询当前信息
32
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
32
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
33
+
34
+    @Select("select * from tp_building_owner_info where owner_tel=#{ownerTel}")
35
+    List<TpBuildingOwnerInfo> sellectHouseList(@Param("ownerTel") String ownerTel);
33
 }
36
 }

+ 2
- 9
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java Wyświetl plik

958
     public ResponseBean userHouseList(UserElement userElement) {
958
     public ResponseBean userHouseList(UserElement userElement) {
959
         ResponseBean response= new ResponseBean();
959
         ResponseBean response= new ResponseBean();
960
         /*根据手机号会查询所有小区的多套房产*/
960
         /*根据手机号会查询所有小区的多套房产*/
961
-        List<TaUser> taUserList= taUserMapper.getByLoginNameList(userElement.getLoginName());
962
-
963
-        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo=null;
964
-        for (TaUser taUser:taUserList){
965
-             tpBuildingOwnerInfo=tpBuildingOwnerInfoMapper.getByCommunityIdAndOwnerTel(taUser.getCommunityId(),taUser.getLoginName());
966
-
967
-             taUser.setHouseList(tpBuildingOwnerInfo);
968
-        }
969
-        response.addSuccess(taUserList);
961
+        List<TpBuildingOwnerInfo> tpBuildingOwnerInfo  = tpBuildingOwnerInfoMapper.sellectHouseList(userElement.getLoginName());
962
+        response.addSuccess(tpBuildingOwnerInfo);
970
         return response;
963
         return response;
971
     }
964
     }
972
 }
965
 }

+ 943
- 698
文档/MYSQL/smartCommunity.pdb
Plik diff jest za duży
Wyświetl plik


+ 943
- 698
文档/MYSQL/smartCommunity.pdm
Plik diff jest za duży
Wyświetl plik