合并

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

@@ -2,15 +2,39 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/SysReportReasonMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReportMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/SysReportReason.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionReport.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/SysReportReasonMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionReportMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/CarouselSettingController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpCarouselSettingMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpCarouselSetting.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ICarouselSettingService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpCarouselSettingServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/menu.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/tels.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/menu.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/tels.js" afterDir="false" />
       <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/dao/TpMessageMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/router/index.js" 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/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" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TaSysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TaSysMenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/AnnouncementTel.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/AnnouncementTel.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITaSysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ITaSysMenuService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaSysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaSysMenuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TaSysMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TaSysMenuMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/banner.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/banner.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/banner.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/banner.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/property/add/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/property/add/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/property/edi/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/systemResources/app/property/edi/index.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -31,73 +55,19 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="159">
-              <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
-              <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/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="77" column="63" lean-forward="true" selection-start-line="77" selection-start-column="59" selection-end-line="77" selection-end-column="77" />
+            <state relative-caret-position="6401">
+              <caret line="468" column="9" selection-start-line="464" selection-start-column="30" selection-end-line="468" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <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" lean-forward="true" selection-start-line="42" selection-start-column="58" selection-end-line="42" selection-end-column="58" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-22">
-              <caret line="119" column="19" lean-forward="true" selection-start-line="119" selection-start-column="19" selection-end-line="119" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="767">
-              <caret line="101" column="50" selection-start-line="101" selection-start-column="50" selection-end-line="101" selection-end-column="50" />
-              <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/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="246" column="53" selection-start-line="246" selection-start-column="34" selection-end-line="246" selection-end-column="53" />
+            <state relative-caret-position="-1220">
+              <caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
             </state>
           </provider>
         </entry>
@@ -114,11 +84,18 @@
       <find>ticketId</find>
       <find>updateTicketsReply</find>
       <find>AddTempBillInvoice</find>
-      <find>tpMessageMapper</find>
       <find>tpannouncementTelMapper</find>
       <find>addAiTicketService</find>
       <find>111</find>
       <find>MessageMapper</find>
+      <find>DESC</find>
+      <find>ORDER BY create_date DESC</find>
+      <find>tpTicketMapper</find>
+      <find>message</find>
+      <find>tatus</find>
+      <find>tpMessageMapper</find>
+      <find>评价</find>
+      <find>Base_Column_List</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -146,18 +123,21 @@
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaSysUserRoleMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysUserRoleMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -179,11 +159,11 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-111" />
-    <option name="y" value="456" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="-69" />
+    <option name="y" value="95" />
     <option name="width" value="1940" />
-    <option name="height" value="1064" />
+    <option name="height" value="1044" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -201,25 +181,25 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -227,7 +207,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -236,7 +216,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -246,7 +226,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -257,7 +237,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -269,7 +249,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -281,7 +261,7 @@
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="property-api" 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" />
@@ -291,6 +271,23 @@
               <item name="service" type="462c0819:PsiDirectoryNode" />
               <item name="impl" 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="resources" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -306,7 +303,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="1551864485578" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551875905855" />
     <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" />
@@ -341,7 +338,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.PropertyApplication">
+  <component name="RunManager" selected="Spring Boot.AppApplication">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -464,18 +461,18 @@
       <workItem from="1551662011680" duration="1281000" />
       <workItem from="1551749121214" duration="1532000" />
       <workItem from="1551756299155" duration="11716000" />
-      <workItem from="1551834513428" duration="20443000" />
+      <workItem from="1551834513428" duration="30766000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="119856000" />
+    <option name="totallyTimeSpent" value="130179000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-69" y="95" width="1940" height="1044" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15565032" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24574468" />
       <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" />
@@ -486,18 +483,18 @@
       <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 active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8566098" visible="true" weight="0.18930958" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.85531914" visible="true" weight="0.27878103" />
       <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" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" />
+      <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.1433902" side_tool="true" weight="0.1091314" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14468086" side_tool="true" visible="true" weight="0.27878103" />
       <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.18262807" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" />
+      <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" />
+      <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -548,6 +545,32 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -563,66 +586,16 @@
           <properties />
           <option name="timeStamp" value="5" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java</url>
+          <line>204</line>
+          <properties />
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="27">
-          <caret line="314" column="25" selection-start-line="314" selection-start-column="25" selection-end-line="314" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="84" column="42" selection-start-line="84" selection-start-column="36" selection-end-line="84" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BillInvoiceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="125" column="56" selection-start-line="125" selection-start-column="43" selection-end-line="125" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ImageServiceI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/ImageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="40" column="45" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-        </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="405">
-          <caret line="18" column="36" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-        </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="2754">
-          <caret line="124" column="96" selection-start-line="124" selection-start-column="96" selection-end-line="124" selection-end-column="96" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/MqMessage.java" />
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MqMessageMapper.java" />
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java">
@@ -639,13 +612,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="42" column="54" lean-forward="true" selection-start-line="42" selection-start-column="54" selection-end-line="42" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TaSysUserRoleMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -684,13 +650,6 @@
         </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="405">
-          <caret line="23" column="109" selection-start-line="23" selection-start-column="101" selection-end-line="23" selection-end-column="109" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/BillStatementMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="351">
@@ -724,13 +683,6 @@
         </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.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2403">
-          <caret line="104" selection-start-line="104" selection-end-line="104" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/RoleMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="351">
@@ -770,131 +722,148 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml">
+    <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="2660">
-          <caret line="229" column="2" selection-start-line="229" selection-start-column="2" selection-end-line="229" selection-end-column="2" />
+        <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/TpTicketMapper.java">
+    <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="527">
-          <caret line="39" column="1" lean-forward="true" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" />
+        <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/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="164" column="65" selection-start-line="164" selection-start-column="47" selection-end-line="164" selection-end-column="65" />
+        <state relative-caret-position="480">
+          <caret line="26" column="27" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
+    <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="311">
-          <caret line="64" column="24" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="36" />
+        <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/app-api/src/main/resources/mapper/TpMessageMapper.xml">
+    <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="338">
-          <caret line="385" column="26" selection-start-line="385" selection-start-column="26" selection-end-line="385" selection-end-column="26" />
+        <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/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java">
+    <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="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 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/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="390" column="9" lean-forward="true" selection-start-line="390" selection-start-column="9" selection-end-line="390" selection-end-column="9" />
+        <state relative-caret-position="225">
+          <caret line="105" selection-start-line="105" selection-end-line="105" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpAnnouncementService.java">
+    <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="480">
-          <caret line="26" column="27" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="32" />
+        <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="jar://F:/maven3.5/maven/serverRepository/com/baomidou/mybatis-plus-core/3.0.6/mybatis-plus-core-3.0.6-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
+        <state relative-caret-position="190">
           <caret line="159" column="6" selection-start-line="159" selection-start-column="6" selection-end-line="159" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="48" column="18" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
+        <state relative-caret-position="131">
+          <caret line="226" column="3" selection-start-line="226" selection-start-column="3" selection-end-line="226" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
+    <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="-2218">
-          <caret line="201" column="24" selection-start-line="201" selection-start-column="24" selection-end-line="201" selection-end-column="24" />
+        <state relative-caret-position="407">
+          <caret line="186" column="71" selection-start-line="186" selection-start-column="71" selection-end-line="186" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
-          <caret line="119" column="19" lean-forward="true" selection-start-line="119" selection-start-column="19" selection-end-line="119" selection-end-column="19" />
+        <state relative-caret-position="378">
+          <caret line="48" column="19" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.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 relative-caret-position="267">
+          <caret line="237" column="28" selection-start-line="237" selection-start-column="28" selection-end-line="237" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.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" />
+        <state relative-caret-position="793">
+          <caret line="40" column="55" lean-forward="true" selection-start-line="40" selection-start-column="55" selection-end-line="40" selection-end-column="55" />
           <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/AnnouncementTelController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1570">
+          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="77" column="63" lean-forward="true" selection-start-line="77" selection-start-column="59" selection-end-line="77" selection-end-column="77" />
+        <state relative-caret-position="410">
+          <caret line="67" column="64" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="331">
+          <caret line="74" column="25" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="246" column="53" selection-start-line="246" selection-start-column="34" selection-end-line="246" selection-end-column="53" />
+        <state relative-caret-position="401">
+          <caret line="133" column="46" lean-forward="true" selection-start-line="120" selection-start-column="16" selection-end-line="133" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="25" column="20" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
+        <state relative-caret-position="324">
+          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
+        <state relative-caret-position="120">
           <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -902,20 +871,78 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysRoleMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="767">
-          <caret line="101" column="50" selection-start-line="101" selection-start-column="50" selection-end-line="101" selection-end-column="50" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-2187" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="212">
+          <caret line="164" column="56" selection-start-line="164" selection-start-column="47" selection-end-line="164" selection-end-column="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="42" column="58" lean-forward="true" selection-start-line="42" selection-start-column="58" selection-end-line="42" selection-end-column="58" />
+        <state relative-caret-position="312">
+          <caret line="61" column="47" lean-forward="true" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaSysUserRoleMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysUserRoleMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="453">
+          <caret line="101" column="11" lean-forward="true" selection-start-line="101" selection-start-column="11" selection-end-line="101" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="452">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="43" column="63" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="391" column="28" lean-forward="true" selection-start-line="391" selection-start-column="23" selection-end-line="391" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="371">
+          <caret line="72" column="26" lean-forward="true" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6401">
+          <caret line="468" column="9" selection-start-line="464" selection-start-column="30" selection-end-line="468" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1220">
+          <caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
         </state>
       </provider>
     </entry>

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -30,4 +31,11 @@ public interface TaSysUserRoleMapper {
      * @return
      */
     TaSysUserRole selectByCommunityIdAndUserId(Map<String,Object> map);
+
+    /**
+     *查询角色
+     * @param userId
+     * @return
+     */
+    TaSysUserRole selectRole(@Param("communityId") Integer communityId,@Param("userId") Integer userId);
 }

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

@@ -562,6 +562,23 @@ public class SocialServiceImpl implements SocialServiceI {
         record.setCreateUser(userId);
         record.setCreateDate(new Date());
         tpTicketRecordMapper.insertSelective(record);
+
+        //1.5版本推送消息message
+        TpMessage message = new TpMessage();
+        message.setCommunityId(communityId);
+        message.setModelType("1");
+         TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+        message.setMessageType(tic.getType());
+        message.setAdviceType("4");
+        message.setUuid(userId);
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“"+tic.getTicketTitle() +"”已经验收并评价，点击查看评分");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(userId);
+        message.setCreateDate(new Date());
+        tpMessageMapper.insert(message);
     }
 
     @Override

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

@@ -52,6 +52,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TpannouncementTelMapper tpannouncementTelMapper;
 
+    @Autowired
+    private TaSysUserRoleMapper taSysUserRoleMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -299,6 +302,26 @@ public class TicketServiceImpl implements ITicketService {
 
         // 把工单信息添加到消息表
         insertTicketMessage(tpTicket, userId);
+        //1.5版本维护消息推送
+        TpMessage message = new TpMessage();
+        message.setCommunityId(user.getCommunityId());
+        message.setModelType("1");
+        message.setMessageType("5");
+        message.setAdviceType("4");
+        message.setUuid(userId);
+        message.setUuidType("2");
+        message.setSource("2");
+         TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(userId,user.getCommunityId());
+         String userName = null;
+        if("1".equals(taSysUserRole.getRoleId())){userName="业主"; }
+        if("2".equals(taSysUserRole.getRoleId())){userName="家属" ;}
+        if("3".equals(taSysUserRole.getRoleId())){userName="租客" ;}
+        message.setMessageContent(userName+user.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(userId);
+        message.setCreateDate(new Date());
+        tpMessageMapper.insert(message);
         response.addSuccess(tpTicketReco);
         return response;
     }
@@ -421,6 +444,23 @@ public class TicketServiceImpl implements ITicketService {
                       tpMessage.setUpdateUser(userId);
                       tpMessage.setUpdateDate(new Date());
                       tpMessageMapper.updateTickMessage(tpMessage);
+
+            //1.5版本推送消息message
+            TpMessage message = new TpMessage();
+            message.setCommunityId(communityId);
+            message.setModelType("1");
+            TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+            message.setMessageType(tic.getType());
+            message.setAdviceType("4");
+            message.setUuid(userId);
+            message.setUuidType("2");
+            message.setSource("2");
+            message.setMessageContent("工单“"+tic.getTicketTitle() +"”被住户终止了，点击查看详情");
+            message.setStatus("1");
+            message.setReadStatus("0");
+            message.setCreateUser(userId);
+            message.setCreateDate(new Date());
+            tpMessageMapper.insert(message);
             return responseBean;
         } catch (Exception e) {
             e.printStackTrace();
@@ -503,6 +543,21 @@ public class TicketServiceImpl implements ITicketService {
                 tdImagesMapper.insert(tdImages);
             }
         }
+        //1.5版本推送消息message
+        TpMessage message = new TpMessage();
+        message.setCommunityId(communityId);
+        message.setModelType("1");
+        message.setMessageType(tpTicket.getStatus());
+        message.setAdviceType("4");
+        message.setUuid(id);
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“"+ tpTicket.getTicketTitle()+"”发起人发来消息："+content+"，点击查看并处理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(new Date());
+        tpMessageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

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

@@ -93,4 +93,11 @@
     from ta_sys_user_role
     where community_id = #{communityId,jdbcType=INTEGER} and user_id = #{userId,jdbcType=INTEGER}
   </select>
+
+  <select id="selectRole">
+    select
+    <include refid="Base_Column_List" />
+    from ta_sys_user_role
+    where community_id = #{communityId,jdbcType=INTEGER} and user_id = #{userId,jdbcType=INTEGER}
+  </select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java

@@ -39,7 +39,7 @@ public interface MessageMapper extends BaseMapper<Message> {
      * 公告消息推送
      * @param message
      */
-    void updateMessage(@Param("message") Message message);
+    void updateMessage(@Param(value = "message") Message message);
 
     /**
      * 工单消息推送

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -126,7 +126,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 message.setUuidType("2");
                 message.setSource("2");
                 message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
-                message.setStatus("0");
+                message.setStatus("1");
                 message.setReadStatus("0");
                 message.setCreateUser(userId);
                 message.setCreateDate(LocalDateTime.now());

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -225,18 +225,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
 
-        QueryWrapper<TpTicket> messageTpTicket = new QueryWrapper<>();
-        messageTpTicket.lambda().eq(TpTicket::getId,ticketId);
-        TpTicket ticket=tpTicketMapper.selectById(messageTpTicket);
+
+        TpTicket ticket=tpTicketMapper.selectById(ticketId);
         Message message = new Message();
         message.setCommunityId(communityId);
-        message.setMessageType("5");
+        message.setMessageType(ticket.getType());
         message.setAdviceType("4");
-        message.setUuid(ticketId);
+        message.setUuid(id);
         message.setUuidType("2");
         message.setSource("2");
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
-        message.setStatus("0");
+        message.setStatus("1");
         message.setReadStatus("0");
         message.setCreateUser(id);
         message.setCreateDate(LocalDateTime.now());

CODE/smart-community/property-api/src/main/resources/mapper/MessageMapper.xml

@@ -47,40 +47,41 @@
           </if>
           and uuid =#{uuid,jdbcType=INTEGER}
           and uuid_type = 2
+           ORDER BY create_date DESC
       </where>
     </select>
-    <update id="updateMessage" parameterType="com.community.huiju.model.Message" >
+    <update id="updateMessage">
     update tp_message
     set
         <if test="message.messageContent!= null" >
             message_content = #{message.messageContent,jdbcType=VARCHAR},
         </if>
         <if test="message.updateUser != null" >
-            update_user = #{updateUser.updateUser,jdbcType=INTEGER},
+            update_user = #{message.updateUser,jdbcType=INTEGER},
         </if>
         <if test="message.updateDate != null" >
             update_date = #{message.updateDate,jdbcType=TIMESTAMP},
         </if>
         <if test="message.status != null" >
-            status = #{status,jdbcType=CHAR},
+            status = #{message.status,jdbcType=CHAR}
         </if>
-    where announcement_id = #{message.announcementId,jdbcType=INTEGER}
+        where announcement_id = #{message.announcementId,jdbcType=INTEGER}
   </update>
 
-    <update id="updateTicketMessage" parameterType="com.community.huiju.model.Message" >
+    <update id="updateTicketMessage" >
         update tp_message
         set
         <if test="message.messageContent!= null" >
             message_content = #{message.messageContent,jdbcType=VARCHAR},
         </if>
         <if test="message.updateUser != null" >
-            update_user = #{updateUser.updateUser,jdbcType=INTEGER},
+            update_user = #{message.updateUser,jdbcType=INTEGER},
         </if>
         <if test="message.updateDate != null" >
             update_date = #{message.updateDate,jdbcType=TIMESTAMP},
         </if>
         <if test="message.status != null" >
-            status = #{status,jdbcType=CHAR},
+            status = #{message.status,jdbcType=CHAR}
         </if>
         where ticket_id = #{message.ticketId,jdbcType=INTEGER}
     </update>

VUECODE/smart-property-manage/src/views/message/messageIndex.vue

@@ -63,7 +63,7 @@
         <el-table-column prop="id" label="操作" align="center">
         <template slot-scope="scope">
             <!--无效的-->
-          <span  v-if="scope.row.readStatus==='1'">
+          <!-- <span  v-if="scope.row.readStatus==='1'"> -->
           <!--公告-->
           <a><span v-if="scope.row.messageType==='5'" @click="announcementDetails(scope.row.announcementId)">{{'查看帖子详情'}}</span></a>
           <!--活动标题-->
@@ -78,24 +78,24 @@
           <a><span v-if="scope.row.messageType==='3'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>
           <!--缴费-->
           <a><span v-if="scope.row.messageType==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
-          </span>
+          <!-- </span> -->
              <!--有效的-->
-          <span v-if="scope.row.readStatus==='0'" style="color:	#5599FF">
+          <!-- <span v-if="scope.row.readStatus==='0'" style="color:	#5599FF"> -->
           <!--公告-->
-          <a><span v-if="scope.row.messageType==='5'" @click="announcementDetails(scope.row.announcementId)">{{'查看帖子详情'}}</span></a>
+          <!-- <a><span v-if="scope.row.messageType==='5'" @click="announcementDetails(scope.row.announcementId)">{{'查看帖子详情'}}</span></a> -->
           <!--活动标题-->
-          <a><span v-if="scope.row.messageType==='8'" @click="activityDetails(scope.row.activityId)">{{'查看帖子详情'}}</span></a>  
+          <!-- <a><span v-if="scope.row.messageType==='8'" @click="activityDetails(scope.row.activityId)">{{'查看帖子详情'}}</span></a>   -->
           <!--二手租赁-->
-          <a><span v-if="scope.row.messageType==='9'" @click="handleLook()">{{'查看帖子详情'}}</span></a>
+          <!-- <a><span v-if="scope.row.messageType==='9'" @click="handleLook()">{{'查看帖子详情'}}</span></a> -->
           <!--投诉-->
-          <a><span v-if="scope.row.messageType==='1'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>
+          <!-- <a><span v-if="scope.row.messageType==='1'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a> -->
           <!--报修-->
-          <a><span v-if="scope.row.messageType==='2'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>    
+          <!-- <a><span v-if="scope.row.messageType==='2'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>     -->
           <!--联系物业-->
-          <a><span v-if="scope.row.messageType==='3'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>
+          <!-- <a><span v-if="scope.row.messageType==='3'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a> -->
           <!--缴费-->
-          <a><span v-if="scope.row.messageType==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
-          </span>
+          <!-- <a><span v-if="scope.row.messageType==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>         -->
+          <!-- </span> -->
         </template>
       </el-table-column>
     </el-table>