合并

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

@@ -2,39 +2,16 @@
 <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/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.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/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" />
+      <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/ToCommunitiesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.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$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -55,10 +32,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.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 relative-caret-position="227">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
             </state>
           </provider>
         </entry>
@@ -66,8 +43,26 @@
       <file pinned="false" current-in-tab="true">
         <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 relative-caret-position="338">
+              <caret line="526" column="37" selection-start-line="526" selection-start-column="12" selection-end-line="526" selection-end-column="37" />
+            </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/TransactionController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="324">
+              <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="453">
+              <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
             </state>
           </provider>
         </entry>
@@ -94,8 +89,10 @@
       <find>message</find>
       <find>tatus</find>
       <find>tpMessageMapper</find>
-      <find>评价</find>
       <find>Base_Column_List</find>
+      <find>评价</find>
+      <find>终止</find>
+      <find>举报</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -109,7 +106,6 @@
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml" />
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecord.java" />
@@ -123,20 +119,23 @@
         <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/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/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/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.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/dao/ToCommunitiesMapper.java" />
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
       </list>
     </option>
@@ -159,11 +158,11 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="-69" />
-    <option name="y" value="95" />
-    <option name="width" value="1940" />
-    <option name="height" value="1044" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="481" />
+    <option name="y" value="103" />
+    <option name="width" value="1345" />
+    <option name="height" value="906" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -256,7 +255,7 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="community" type="462c0819:PsiDirectoryNode" />
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="dao" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
@@ -269,7 +268,6 @@
               <item name="community" type="462c0819:PsiDirectoryNode" />
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
@@ -288,6 +286,62 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="mapper" 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" />
+            </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="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="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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+            </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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="community" type="462c0819:PsiDirectoryNode" />
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -303,7 +357,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="1551875905855" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551939462303" />
     <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" />
@@ -338,7 +392,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.AppApplication">
+  <component name="RunManager" selected="Spring Boot.PropertyApplication">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -461,18 +515,19 @@
       <workItem from="1551662011680" duration="1281000" />
       <workItem from="1551749121214" duration="1532000" />
       <workItem from="1551756299155" duration="11716000" />
-      <workItem from="1551834513428" duration="30766000" />
+      <workItem from="1551834513428" duration="31209000" />
+      <workItem from="1551920868695" duration="9458000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="130179000" />
+    <option name="totallyTimeSpent" value="140080000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-69" y="95" width="1940" height="1044" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24574468" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34168443" />
       <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" />
@@ -483,15 +538,15 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.85531914" visible="true" weight="0.27878103" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.08351893" />
       <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="Spring" order="7" sideWeight="0.5698294" weight="0.32962137" />
       <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.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="Event Log" order="10" sideWeight="0.14552239" side_tool="true" weight="0.37750557" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.27941176" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49946696" weight="0.32962137" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49946696" weight="0.32850778" />
@@ -570,6 +625,20 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -586,42 +655,10 @@
           <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/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">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="25" column="17" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ActivityController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
-        </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>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/UserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="35" column="60" selection-start-line="35" selection-start-column="60" selection-end-line="35" selection-end-column="86" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/SysMenuMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="54">
@@ -636,13 +673,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="427">
-          <caret line="32" column="19" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -781,168 +811,217 @@
         </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">
+    <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="190">
-          <caret line="159" column="6" selection-start-line="159" selection-start-column="6" selection-end-line="159" selection-end-column="6" />
+        <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/app-api/src/main/resources/mapper/TpTicketMapper.xml">
+    <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="131">
-          <caret line="226" column="3" selection-start-line="226" selection-start-column="3" selection-end-line="226" selection-end-column="3" />
+        <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/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml">
+    <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="407">
-          <caret line="186" column="71" selection-start-line="186" selection-start-column="71" selection-end-line="186" selection-end-column="71" />
+        <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/TpTicketService.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="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 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/service/impl/TpTicketServiceImpl.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="-2187" />
+      </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="267">
-          <caret line="237" column="28" selection-start-line="237" selection-start-column="28" selection-end-line="237" selection-end-column="28" />
+        <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/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/TaSysUserRoleMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java">
+    <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="-1570">
-          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
+        <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/property-api/src/main/java/com/community/huiju/controller/TpAnnouncementController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="1377">
+          <caret line="67" column="65" 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">
+    <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="331">
-          <caret line="74" column="25" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="25" />
+        <state relative-caret-position="264">
+          <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/model/TpTicket.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
         </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="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 relative-caret-position="243">
+          <caret line="156" column="79" lean-forward="true" selection-start-line="153" selection-start-column="12" selection-end-line="156" selection-end-column="79" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="378">
+          <caret line="48" column="21" 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/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="446">
+          <caret line="35" column="7" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <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="308">
+          <caret line="250" column="2" selection-start-line="250" selection-start-column="2" selection-end-line="250" selection-end-column="2" />
+        </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="396">
+          <caret line="72" column="18" 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/property-api/src/main/resources/mapper/MessageMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="473">
+          <caret line="131" column="17" lean-forward="true" selection-start-line="131" selection-start-column="17" selection-end-line="131" selection-end-column="17" />
         </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="120">
-          <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
+        <state relative-caret-position="564">
+          <caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TaSysRoleMapper.xml">
+    <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="-2187" />
+        <state relative-caret-position="1199">
+          <caret line="236" column="30" selection-start-line="236" selection-start-column="24" selection-end-line="236" selection-end-column="30" />
+        </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/impl/MessageServiceImpl.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 relative-caret-position="1593">
+          <caret line="77" column="54" selection-start-line="77" selection-start-column="54" selection-end-line="77" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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/app-api/src/main/java/com/community/huiju/controller/MessageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="264">
+          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TaSysUserRoleMapper.java">
+    <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="506">
-          <caret line="39" column="18" selection-start-line="39" selection-start-column="18" selection-end-line="39" selection-end-column="18" />
+        <state relative-caret-position="536">
+          <caret line="164" column="54" 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/app-api/src/main/resources/mapper/TaSysUserRoleMapper.xml">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.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 relative-caret-position="458">
+          <caret line="141" column="52" selection-start-line="141" selection-start-column="52" selection-end-line="141" selection-end-column="52" />
         </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/service/impl/TicketServiceImpl.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 relative-caret-position="242">
+          <caret line="295" column="29" lean-forward="true" selection-start-line="295" selection-start-column="29" selection-end-line="295" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.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 relative-caret-position="588">
+          <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.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 relative-caret-position="227">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
         </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/service/impl/TransactionServiceImpl.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 relative-caret-position="426">
+          <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.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 relative-caret-position="324">
+          <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+        </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="453">
+          <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
         </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 relative-caret-position="338">
+          <caret line="526" column="37" selection-start-line="526" selection-start-column="12" selection-end-line="526" selection-end-column="37" />
         </state>
       </provider>
     </entry>

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

@@ -22,4 +22,11 @@ public interface ToCommunitiesMapper {
     int updateByPrimaryKey(ToCommunities record);
     
     List<ToCommunities> selectByCommunityName(@Param(value="communityName") String communityName);
+
+    /**
+     * 查询超级管理员
+     * @param communityId
+     * @return
+     */
+    Integer selectAndmin(@Param("communityId") Integer communityId);
 }

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

@@ -37,4 +37,12 @@ public interface TpTicketMapper {
 	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 
     void updateTpUserId(@Param("ticketId") Integer ticketId);
+
+    /**
+     * 查看当前工单分配人
+     * @param ticketId
+     * @param communityId
+     * @return
+     */
+    TpTicket getTicketTpUserId(@Param("ticketId") Integer ticketId, @Param("communityId") Integer communityId);
 }

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

@@ -80,6 +80,8 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpTransactionReportMapper tpTransactionReportMapper;
 
+    @Autowired
+    private ToCommunitiesMapper  toCommunitiesMapper;
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -517,14 +519,17 @@ public class SocialServiceImpl implements SocialServiceI {
             // 插入消息表
             TpMessage message = new TpMessage();
             message.setCommunityId(userId);
-            message.setMessageType("7");
+            message.setMessageType("9");
             message.setAdviceType("4");
             message.setModelType("2");
-            message.setUuid(userId);
+            //超级管理员
+            message.setUuid(toCommunitiesMapper.selectAndmin(communityId));
             message.setUuidType("2");
             message.setSource("1");
             message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() +  "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
             message.setStatus("1");
+            message.setReadStatus("0");
+            message.setAnnouncementId(transactionId);
             message.setCreateDate(new Date());
             message.setCreateUser(userId);
             tpMessageMapper.insertSelective(message);
@@ -561,10 +566,11 @@ public class SocialServiceImpl implements SocialServiceI {
         TpMessage message = new TpMessage();
         message.setCommunityId(communityId);
         message.setModelType("1");
-         TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+        TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
         message.setMessageType(tic.getType());
         message.setAdviceType("4");
-        message.setUuid(userId);
+        message.setModelType("1");
+        message.setUuid(tic.getTpUserId());
         message.setUuidType("2");
         message.setSource("2");
         message.setMessageContent("工单“"+tic.getTicketTitle() +"”已经验收并评价，点击查看评分");

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

@@ -55,6 +55,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TaSysUserRoleMapper taSysUserRoleMapper;
 
+    @Autowired
+    private  ToCommunitiesMapper toCommunitiesMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -308,9 +311,11 @@ public class TicketServiceImpl implements ITicketService {
         message.setModelType("1");
         message.setMessageType("5");
         message.setAdviceType("4");
-        message.setUuid(userId);
         message.setUuidType("2");
         message.setSource("2");
+        //当前插入为超级管理员
+        Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());
+        message.setUuid(uuserID);
          TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(userId,user.getCommunityId());
          String userName = null;
         if("1".equals(taSysUserRole.getRoleId())){userName="业主"; }
@@ -455,6 +460,7 @@ public class TicketServiceImpl implements ITicketService {
             message.setUuid(userId);
             message.setUuidType("2");
             message.setSource("2");
+            message.setModelType("1");
             message.setMessageContent("工单“"+tic.getTicketTitle() +"”被住户终止了，点击查看详情");
             message.setStatus("1");
             message.setReadStatus("0");
@@ -547,9 +553,11 @@ public class TicketServiceImpl implements ITicketService {
         TpMessage message = new TpMessage();
         message.setCommunityId(communityId);
         message.setModelType("1");
-        message.setMessageType(tpTicket.getStatus());
+        message.setMessageType(tpTicket.getType());
         message.setAdviceType("4");
-        message.setUuid(id);
+        //查询当前工单水处理
+         TpTicket ticket= tpTicketMapper.getTicketTpUserId(ticketId,communityId);
+        message.setUuid(ticket.getTpUserId());
         message.setUuidType("2");
         message.setSource("2");
         message.setMessageContent("工单“"+ tpTicket.getTicketTitle()+"”发起人发来消息："+content+"，点击查看并处理");

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

@@ -136,4 +136,11 @@
       and community_name like concat('%',#{communityName,jdbcType=VARCHAR},'%')
     </if>
   </select>
+
+  <select id="selectAndmin" resultType="int">
+    SELECT u.id  FROM  tp_user u
+    LEFT JOIN to_communities co ON u.login_name = co.login_name
+    WHERE co.id = #{communityId,jdbcType=VARCHAR}
+    AND u.community_id=#{communityId,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -247,13 +247,17 @@
     WHERE
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
-  </select>
+</select>
   <update id="updateTpUserId" parameterType="int" >
     update tp_ticket
     set
       tp_user_id =null
     where id = #{ticketId,jdbcType=INTEGER}
   </update>
-
-
+  <select id="getTicketTpUserId" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from tp_ticket
+    where id = #{ticketId,jdbcType=INTEGER} and community_id= #{communityId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -201,27 +201,15 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 tdImages.setCreateUser(userId);
                 imagesMapper.insert(tdImages);
             }
-
-             String sta= tpAnnouncement.getStatus();
-            if ("0".equals(sta)||"2".equals(sta)||"3".equals(sta)) {
-                //1.5版本维护消息表
-                Message message = new Message();
-                message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
-                //草稿状态公告被发布或被作废后待办变为已经无效
-                message.setAnnouncementId(tpAnnouncement.getId());
-                message.setUpdateDate(LocalDateTime.now());
-                message.setUpdateUser(userId);
-
-                messageMapper.updateMessage(message);
-            }else {
                 // 公告发布成功删除时消息变为无效
                 Message message = new Message();
+                message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
                 message.setAnnouncementId(tpAnnouncement.getId());
                 message.setUpdateDate(LocalDateTime.now());
                 message.setUpdateUser(userId);
                 message.setStatus("0");
                 messageMapper.updateMessage(message);
-            }
+
         }
         return response;
     }
@@ -241,7 +229,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
             //1.5版本维护消息
             Message message= new Message();
-            message.setStatus("1");
+            message.setStatus("0");
             message.setAnnouncementId(id);
             message.setUpdateUser(userId);
             message.setUpdateDate(LocalDateTime.now());

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

@@ -225,13 +225,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
 
-
-        TpTicket ticket=tpTicketMapper.selectById(ticketId);
+        //待办模板
+        QueryWrapper<TpTicket> TpTicketWrapper = new QueryWrapper<>();
+        TpTicketWrapper.lambda().eq(TpTicket::getId,ticketId);
+        TpTicketWrapper.lambda().eq(TpTicket::getCommunityId,communityId);
+       TpTicket ticket = tpTicketMapper.selectById(TpTicketWrapper);
         Message message = new Message();
         message.setCommunityId(communityId);
         message.setMessageType(ticket.getType());
         message.setAdviceType("4");
-        message.setUuid(id);
+        message.setUuid(userID);
+        message.setModelType("2");
         message.setUuidType("2");
         message.setSource("2");
         message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
@@ -241,7 +245,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         message.setCreateDate(LocalDateTime.now());
         message.setTicketId(ticketId);
         messageMapper.insert(message);
-
+        //消息模板
+        message.setModelType("1");
+        messageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

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

@@ -131,6 +131,8 @@
                 and message_content like concat('%',#{ messageContent,jdbcType=VARCHAR},'%')
             </if>
             and uuid =#{uuid,jdbcType=INTEGER}
+            and uuid_type = 2
+            ORDER BY create_date DESC
         </where>
     </select>
 </mapper>

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

@@ -45,13 +45,13 @@
        <template slot-scope="scope" >
         <a :title="scope.row.messageContent" v-if="scope.row.status==='1'">
           <span style="color: black	" >
-           {{ scope.row.messageContent.length>='15'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
+           {{ scope.row.messageContent.length>='100'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
           </span>
         </a>
 
         <a :title="scope.row.messageContent" v-if="scope.row.status==='0'">
           <span style="color: #666666	" >
-           {{ scope.row.messageContent.length>='15'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
+           {{ scope.row.messageContent.length>='100'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
           </span>
         </a>
       </template> 

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

@@ -45,17 +45,17 @@
         type="selection"
         width="55"/>
       <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>  
-      <el-table-column prop="messageContent" label="待办内容" align="center">
+      <el-table-column prop="messageContent" label="消息内容" align="center">
        <template slot-scope="scope" >
         <a :title="scope.row.messageContent" v-if="scope.row.readStatus==='0'">
           <span style="color: black	" >
-           {{ scope.row.messageContent.length>='15'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
+           {{ scope.row.messageContent.length>='100'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
           </span>
         </a>
 
         <a :title="scope.row.messageContent" v-if="scope.row.readStatus==='1'">
           <span style="color:#AAAAAA" >
-           {{ scope.row.messageContent.length>='15'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
+           {{ scope.row.messageContent.length>='100'?scope.row.messageContent.substring(0,15)+'..':scope.row.messageContent }}
           </span>
         </a>
       </template> 
@@ -63,39 +63,39 @@
         <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>
+          <a><span v-if="scope.row.messageType==='5'" @click="announcementDetails(scope.row.announcementId,scope.row.id)">{{'查看帖子详情'}}</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,scope.row.id)">{{'查看帖子详情'}}</span></a>  
           <!--二手租赁-->
           <a><span v-if="scope.row.messageType==='9'">{{'查看帖子详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看费用单详情'}}</span></a>        
+          </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,scope.row.id)">{{'查看帖子详情'}}</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,scope.row.id)">{{'查看帖子详情'}}</span></a>  
           <!--二手租赁-->
-          <!-- <a><span v-if="scope.row.messageType==='9'" @click="handleLook()">{{'查看帖子详情'}}</span></a> -->
+          <a><span v-if="scope.row.messageType==='9'" @click="handleLook(scope.row.activityId,scope.row.id)">{{'查看帖子详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看工单详情'}}</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,scope.row.id)">{{'查看费用单详情'}}</span></a>        
+          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -203,26 +203,31 @@ export default {
       return value
     },
     // 公告详情
-    announcementDetails(id) {
+    announcementDetails(id,ide) {
       console.log('id11',id)
       this.$router.push({ name: 'contentParticulars-details', params: { id: id }})
+      this.already(ide)
     },
     // 活动
-     activityDetails(id) { // 查看活动
+     activityDetails(id,ide) { // 查看活动
       this.$router.push({ name: 'activity-info', params: { id: id }})
+      this.already(ide)
     },
     //工单
-    ticketDetails(id) {
+    ticketDetails(id,ide) {
       console.log('111111'+id)
       this.$router.push({ name: 'ticket-details', query: { id: id }})
+      this.already(ide)
     },
     // 缴费
-    billDetails(billId){
+    billDetails(billId,ide){
         this.$router.push({ name: 'bill-info', query: { id: billId }})
+        this.already(ide)
     },
     // 二手租赁
-    handleLook(id) {
+    handleLook(id,ide) {
       this.$router.push({ name: 'transaction-info', params: { id: id }})
+       this.already(ide)
     },
     readMessage(){
      //  批量作废
@@ -239,6 +244,11 @@ export default {
         });
        this.dataQuery()     
       })    
+    },
+    //点击详情修改当前状态为已读
+    already(ide){
+      this.$store.dispatch('DelectRead', ide).then((res) => {
+      })    
     }
   }   
 }