合并

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

@@ -3,8 +3,14 @@
   <component name="ChangeListManager">
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/ticket/details.vue" 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$/../../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" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
@@ -25,73 +31,73 @@
   <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/service/impl/TpTicketServiceImpl.java">
+        <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="864">
-              <caret line="52" column="35" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="35" />
+            <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/dao/TpTicketMapper.java">
+        <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="405">
-              <caret line="23" column="109" selection-start-line="23" selection-start-column="101" selection-end-line="23" selection-end-column="109" />
+            <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>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml">
+      <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="459">
-              <caret line="17" column="17" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="17" />
+            <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/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java">
+        <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="162">
-              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+            <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/app-api/src/main/java/com/community/huiju/controller/FaceController.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="324">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
+            <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/app-api/src/main/java/com/community/huiju/AppApplication.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="162">
-              <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+            <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/controller/BillInvoiceController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="125" column="56" lean-forward="true" selection-start-line="125" selection-start-column="43" selection-end-line="125" selection-end-column="66" />
-            </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/service/impl/BillInvoiceServiceImpl.java">
+        <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="67">
-              <caret line="205" selection-start-line="205" selection-end-line="205" />
+            <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>
           </provider>
         </entry>
@@ -108,6 +114,11 @@
       <find>ticketId</find>
       <find>updateTicketsReply</find>
       <find>AddTempBillInvoice</find>
+      <find>tpMessageMapper</find>
+      <find>tpannouncementTelMapper</find>
+      <find>addAiTicketService</find>
+      <find>111</find>
+      <find>MessageMapper</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -120,10 +131,8 @@
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java" />
         <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/java/com/community/huiju/model/TpTicket.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/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
         <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" />
@@ -131,13 +140,24 @@
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.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/controller/TicketController.java" />
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java" />
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
         <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/service/impl/TicketServiceImpl.java" />
         <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" />
       </list>
     </option>
   </component>
@@ -159,11 +179,11 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="364" />
-    <option name="y" value="466" />
-    <option name="width" value="974" />
-    <option name="height" value="1047" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-111" />
+    <option name="y" value="456" />
+    <option name="width" value="1940" />
+    <option name="height" value="1064" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -171,8 +191,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -183,25 +201,25 @@
             <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="property-api" 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="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="app-api" 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="app-api" 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" />
@@ -209,7 +227,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -218,7 +236,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -228,7 +246,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -239,7 +257,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -251,7 +269,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -263,7 +281,7 @@
             <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="property-api" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -277,6 +295,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -286,7 +306,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="1551233880085" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551864485578" />
     <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" />
@@ -298,8 +318,16 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.community.huiju.dao" />
       <recent name="com.community.huiju.vo" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\dao" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\model" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\resources\mapper" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\service" />
+      <recent name="E:\idesWord\smartCommunity\CODE\smart-community\property-api\src\main\java\com\community\huiju\service\impl" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -432,17 +460,22 @@
       <workItem from="1551057295750" duration="236000" />
       <workItem from="1551143469375" duration="6771000" />
       <workItem from="1551229983710" duration="2843000" />
+      <workItem from="1551403008725" duration="3245000" />
+      <workItem from="1551662011680" duration="1281000" />
+      <workItem from="1551749121214" duration="1532000" />
+      <workItem from="1551756299155" duration="11716000" />
+      <workItem from="1551834513428" duration="20443000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="80962000" />
+    <option name="totallyTimeSpent" value="119856000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.07249467" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15565032" />
       <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" />
@@ -453,15 +486,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 active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.85776806" visible="true" weight="0.17483296" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8566098" visible="true" weight="0.18930958" />
       <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="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.14223194" side_tool="true" weight="0.86276716" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.26837417" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.1433902" side_tool="true" weight="0.1091314" />
+      <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="Database Changes" order="13" />
       <window_info anchor="bottom" id="Version Control" order="14" />
@@ -534,359 +567,355 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../smart-community/operate-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/BillServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
+        <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="jar://D:/Program Files/Java/jdk1.8.0_121/src.zip!/java/lang/String.java">
+    <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="392">
-          <caret line="1932" column="78" selection-start-line="1932" selection-start-column="72" selection-end-line="1932" selection-end-column="78" />
+        <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/service/ImageServiceI.java">
+    <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="513">
-          <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
+        <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/property-api/src/main/java/com/community/huiju/controller/BillController.java">
+    <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="1944">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
+        <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/property-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java">
+    <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="1512">
-          <caret line="64" selection-start-line="64" selection-end-line="64" />
+        <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/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java">
+    <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="219">
-          <caret line="448" column="19" selection-start-line="448" selection-start-column="19" selection-end-line="448" selection-end-column="19" />
+        <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/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
+    <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="771">
-          <caret line="103" selection-start-line="103" selection-end-line="103" />
+        <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/property-api/src/main/java/com/community/huiju/dao/UserMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="265">
-          <caret line="26" column="11" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
+        <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/resources/mapper/TaUserMapper.xml">
+    <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="310">
-          <caret line="365" column="60" selection-start-line="365" selection-start-column="60" selection-end-line="365" selection-end-column="60" />
+        <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/dao/TaUserMapper.java">
+    <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="557">
-          <caret line="70" column="121" lean-forward="true" selection-start-line="70" selection-start-column="121" selection-end-line="70" selection-end-column="121" />
+        <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/java/com/community/huiju/model/TaUser.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="233">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <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/java/com/community/huiju/model/TdImages.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="29" column="46" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="46" />
-        </state>
-      </provider>
+    <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/app-api/src/main/resources/mapper/TpTicketMapper.xml">
+    <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="761">
-          <caret line="257" column="2" selection-start-line="257" selection-start-column="2" selection-end-line="257" selection-end-column="2" />
+        <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="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/property-api/src/main/resources/mapper/SysMenuMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <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="54">
+          <caret line="2" column="43" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/vo/UserVO.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/metadata/IPage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="187">
+          <caret line="132" column="16" selection-start-line="132" selection-start-column="16" selection-end-line="132" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
+    <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="542">
-          <caret line="84" column="27" selection-start-line="84" selection-start-column="27" selection-end-line="84" selection-end-column="27" />
+        <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/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java">
+    <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="113">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state relative-caret-position="81">
+          <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.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="-1021">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        <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/controller/ImageController.java">
+    <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="275">
-          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="351">
+          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicket.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1453">
-          <caret line="43" column="49" selection-start-line="43" selection-start-column="33" selection-end-line="43" selection-end-column="49" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/BillStatementMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecord.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/target/classes/com/community/huiju/dao/MessageMapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-508">
-          <caret line="18" column="4" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
+        <state>
+          <folding>
+            <element signature="e#0#725#0" expanded="true" />
+          </folding>
         </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/resources/mapper/TpBillStatementMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="65" selection-start-line="65" selection-end-line="76" selection-end-column="5" />
+        <state relative-caret-position="297">
+          <caret line="95" column="39" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java">
+    <entry file="jar://F:/maven3.5/maven/serverRepository/com/alibaba/fastjson/1.2.56/fastjson-1.2.56-sources.jar!/com/alibaba/fastjson/JSONObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+        <state relative-caret-position="228">
+          <caret line="323" column="16" selection-start-line="323" selection-start-column="16" selection-end-line="323" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.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="378">
-          <caret line="16" column="28" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
+        <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/resources/mapper/TpTicketRecordMapper.xml">
+    <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="81">
-          <caret line="3" selection-start-line="3" selection-end-line="9" selection-end-column="9" />
+        <state relative-caret-position="351">
+          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        <state relative-caret-position="290">
+          <caret line="29" column="61" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="136" column="88" selection-start-line="136" selection-start-column="88" selection-end-line="136" selection-end-column="88" />
+        <state relative-caret-position="297">
+          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TdImagesMapper.xml">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
+        <state relative-caret-position="440">
+          <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
+          <folding>
+            <element signature="e#836#837#0" expanded="true" />
+            <element signature="e#903#904#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TdImagesMapper.java">
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/BannerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="13" column="8" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="8" />
+        <state relative-caret-position="14">
+          <caret line="29" column="62" lean-forward="true" selection-start-line="29" selection-start-column="62" selection-end-line="29" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.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="297">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpannouncementTelMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml">
+    <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="351">
-          <caret line="61" column="72" selection-start-line="61" selection-start-column="31" selection-end-line="61" selection-end-column="72" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordCommentMapper.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="216">
-          <caret line="13" selection-start-line="13" selection-end-line="14" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml">
+    <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="246">
-          <caret line="29" column="63" selection-start-line="29" selection-start-column="63" selection-end-line="29" selection-end-column="63" />
+        <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>
       </provider>
     </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/apache/tomcat/embed/tomcat-embed-core/8.5.32/tomcat-embed-core-8.5.32-sources.jar!/javax/servlet/http/HttpServlet.java">
+    <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="155">
-          <caret line="660" selection-start-line="660" selection-end-line="660" />
+        <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/model/TpTicketRecordComment.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="171">
-          <caret line="30" column="33" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="33" />
-          <folding>
-            <element signature="e#673#674#0" expanded="true" />
-            <element signature="e#709#710#0" expanded="true" />
-          </folding>
+        <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/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="132" column="135" selection-start-line="132" selection-start-column="114" selection-end-line="132" selection-end-column="135" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/community-common/src/main/java/com/community/commom/constant/Constant.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="229">
-          <caret line="94" column="31" selection-start-line="94" selection-start-column="31" selection-end-line="94" selection-end-column="31" />
+        <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/model/TaUser.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="-773">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="237">
+          <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/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/service/TpTicketService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3636">
-          <caret line="281" column="50" lean-forward="true" selection-start-line="281" selection-start-column="50" selection-end-line="281" selection-end-column="50" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.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="-1593">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <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>
       </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/property-api/src/main/resources/mapper/MessageMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="864">
-          <caret line="52" column="35" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="35" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketMapper.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="405">
-          <caret line="23" column="109" selection-start-line="23" selection-start-column="101" selection-end-line="23" selection-end-column="109" />
+        <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/property-api/src/main/resources/mapper/TpTicketMapper.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="459">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="17" />
+        <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/service/impl/FaceServicelimpl.java">
+    <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="162">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java">
+    <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="324">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java">
+    <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="162">
-          <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+        <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>
       </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/dao/MessageMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="49" column="27" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="35" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BillInvoiceController.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="425">
-          <caret line="125" column="56" lean-forward="true" selection-start-line="125" selection-start-column="43" selection-end-line="125" selection-end-column="66" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.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="67">
-          <caret line="205" selection-start-line="205" selection-end-line="205" />
+        <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>

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

@@ -36,4 +36,14 @@ public interface TpMessageMapper {
      * @return
      */
     TpMessage selectTicketMessage(TpMessage tpMessage);
+
+    /**
+     * 维护物业端消息推送
+     */
+    void updateTickMessage(@Param("message") TpMessage message);
+
+    /**
+     * 查询工单id是否为空
+     */
+    Integer selectTicket(@Param(value = "communityId") Integer ticketId);
 }

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

@@ -299,7 +299,6 @@ public class TicketServiceImpl implements ITicketService {
 
         // 把工单信息添加到消息表
         insertTicketMessage(tpTicket, userId);
-
         response.addSuccess(tpTicketReco);
         return response;
     }
@@ -380,6 +379,16 @@ public class TicketServiceImpl implements ITicketService {
         ticket.setTicketContent(tpTicket.getTicketContent());
 
         tpTicketMapper.updateByPrimaryKeySelective(ticket);
+        // 维护1.5版本消息
+        Integer messageTicket= tpMessageMapper.selectTicket(ticketId);
+        if (!"".equals(messageTicket)) {
+            TpMessage tpMessage = new TpMessage();
+            tpMessage.setTicketId(ticketId);
+            tpMessage.setMessageContent("工单“" + tpTicket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+            tpMessage.setUpdateDate(new Date());
+            tpMessage.setUpdateUser(userId);
+            tpMessageMapper.updateTickMessage(tpMessage);
+        }
         responseBean.addSuccess("操作成功!");
         return responseBean;
     }
@@ -405,6 +414,13 @@ public class TicketServiceImpl implements ITicketService {
             tpTicketRecord.setCreateUser(userId);
             tpTicketRecord.setCreateDate(new Date());
             tpTicketRecordMapper.insertSelective(tpTicketRecord);
+            //1.5版本需求推送消息
+            TpMessage tpMessage= new TpMessage();
+                      tpMessage.setTicketId(ticketId);
+                      tpMessage.setStatus("0");
+                      tpMessage.setUpdateUser(userId);
+                      tpMessage.setUpdateDate(new Date());
+                      tpMessageMapper.updateTickMessage(tpMessage);
             return responseBean;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -366,5 +366,28 @@
     and ticket_id=#{ticketId}
     and model_type=#{modelType}
   </select>
-
+  <update id="updateTickMessage" parameterType="com.community.huiju.model.TpMessage" >
+    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},
+    </if>
+    <if test="message.updateDate != null" >
+      update_date = #{message.updateDate,jdbcType=TIMESTAMP},
+    </if>
+    <if test="message.status != null" >
+      status = #{status,jdbcType=CHAR},
+    </if>
+    where ticket_id = #{message.ticketId,jdbcType=INTEGER}
+  </update>
+  <select id="selectTicket" resultType="int">
+    select
+    ticket_id
+    from
+    tp_message
+    when ticket_id=#{ticketId}
+  </select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -0,0 +1,73 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import com.community.huiju.common.base.BaseController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业端消息表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "消息通知API", description = "消息通知API")
+public class MessageController extends BaseController {
+
+    @Autowired
+    private IMessageService messageService;
+    @ApiOperation(value = "消息待办", notes = "消息待办")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:待办消息类型(-1:论坛，-2:工单，-3:缴费),status:(0:无效，1:有效)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/messageLiset", method = RequestMethod.POST)
+    public ResponseBean messageLiset(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.messageLiset(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "我的消息", notes = "我的消息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:消息类型(-1:论坛，-2:工单，-3:缴费),readStatus:(0:未读，1:已读)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/myMessageList", method = RequestMethod.POST)
+    public ResponseBean myMessageList(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.myMessageList(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "消息已读", notes = "消息已读")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:(多个) ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/delectRead", method = RequestMethod.POST)
+    public ResponseBean delectRead(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getId());
+        return responseBean;
+    }
+}
+
+

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

@@ -0,0 +1,61 @@
+package com.community.huiju.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.Message;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端用户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@Mapper
+public interface MessageMapper extends BaseMapper<Message> {
+    /**
+     * 消息待办
+     * @param page
+     * @param messageType
+     * @param status
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> messageLiset(Page page, @Param("messageType")String messageType, @Param("status")String status, @Param("createDate") Date createDate, @Param("messageContent")String messageContent,@Param("uuid") Integer uuid);
+
+    /**
+     * 公告消息推送
+     * @param message
+     */
+    void updateMessage(@Param("message") Message message);
+
+    /**
+     * 工单消息推送
+     * @param message
+     */
+    void updateTicketMessage(Message message);
+
+    /**
+     * 关于我的消息
+     * @param page
+     * @param messageType
+     * @param readStatus
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> myMessageList(Page<Message> page, @Param("messageType") String messageType, @Param("readStatus")String readStatus, @Param("createDate")Date createDate, @Param("messageContent")String messageContent, @Param("uuid")Integer uuid);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Message.java

@@ -0,0 +1,128 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物业端消息表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_message")
+public class Message implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    /**
+     * 工单id 非工单不填
+     */
+    private Integer ticketId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动
+     */
+    private String messageType;
+
+    /**
+     * 通知方式  1 是app内通知  2是短信通知 3 是通知栏消息  4 是 web端消息
+     */
+    private String adviceType;
+
+    /**
+     * 模板类型 1 是消息模板 2是待办模板
+     */
+    private String modelType;
+
+    /**
+     * 接收人id
+     */
+    private Integer uuid;
+
+    /**
+     * 接收人id的类型  1是app用户 2是物业端用户
+     */
+    private String uuidType;
+
+    /**
+     * 来源 1 是app端  2是物业端
+     */
+    private String source;
+
+    /**
+     * 消息内容
+     */
+    private String messageContent;
+
+    /**
+     * 状态 1 是有效 0是无效
+     */
+    private String status;
+
+    /**
+     * 推送结果
+     */
+    private String result;
+
+    /**
+     * 事件类型表的id 预留字段
+     */
+    private String meaasgeTypeId;
+
+    /**
+     * 阅读状态 0 是未读  1是已读
+     */
+    private String readStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 缴费项ID
+     */
+    private Integer billId;
+
+    /**
+     * 活动Id
+     */
+    private Integer activityId;
+
+    /**
+     * 公告Id
+     */
+    private Integer announcementId;
+
+
+}

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

@@ -0,0 +1,40 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.Message;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 物业端消息表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface IMessageService extends IService<Message> {
+    /**
+     * 查询消息待办列表
+     * @param parameter
+     * @param communityId
+     * @return
+     */
+    ResponseBean messageLiset(String parameter, Integer communityId,Integer userID);
+
+    /**
+     * 查询关于我的所有消息
+     * @param parameter
+     * @param communityId
+     * @param id
+     * @return
+     */
+    ResponseBean myMessageList(String parameter, Integer communityId, Integer id);
+
+    /**
+     * 批量删除（已读）
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean delectRead(String parameter, Integer id);
+}

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

@@ -0,0 +1,107 @@
+package com.community.huiju.service.impl;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.MessageMapper;
+import com.community.huiju.model.Message;
+import com.community.huiju.service.IMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 物业端消息表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Service
+public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+    @Autowired
+    private MessageMapper messageMapper;
+    @Override
+    public ResponseBean messageLiset(String parameter, Integer communityId,Integer user) {
+        ResponseBean response= new  ResponseBean();
+        JSONObject  object = JSONObject.parseObject(parameter);
+        //待办消息类型(-1:论坛，-2:工单，-3:缴费)
+        String  messageType = object.getString("messageType");
+        //0:无效，1:有效
+        String  status = object.getString("status");
+        Date createDate = object.getDate("createDate");
+
+        String  messageContent = object.getString("messageContent");
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Message> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Message> pageInfo = messageMapper.messageLiset(page,messageType,status,createDate,messageContent,user);
+        List<Message> ticketList = pageInfo.getRecords();
+        HashMap map=new HashMap<>();
+        map.put("list",ticketList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean myMessageList(String parameter, Integer communityId, Integer user) {
+        ResponseBean response= new  ResponseBean();
+        JSONObject  object = JSONObject.parseObject(parameter);
+        //待办消息类型(-1:论坛，-2:工单，-3:缴费)
+        String  messageType = object.getString("messageType");
+        //0:无效，1:有效
+        String  readStatus = object.getString("readStatus");
+        Date createDate = object.getDate("createDate");
+
+        String  messageContent = object.getString("messageContent");
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Message> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Message> pageInfo = messageMapper.myMessageList(page,messageType,readStatus,createDate,messageContent,user);
+        List<Message> ticketList = pageInfo.getRecords();
+        HashMap map=new HashMap<>();
+        map.put("list",ticketList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean delectRead(String parameter, Integer userID) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(parameter);
+
+        JSONArray message = parseObject.getJSONArray("id");
+        Integer[] messageListID = message.toArray(new Integer[]{});
+        for (Integer id : messageListID) {
+            Message mes= new Message();
+                    mes.setId(id);
+                    mes.setReadStatus("1");
+                    mes.setUpdateDate(LocalDateTime.now());
+                    mes.setUpdateUser(userID);
+                    messageMapper.updateById(mes);
+        }
+                response.addSuccess("成功");
+                return response;
+    }
+}

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

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.MessageMapper;
 import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpAnnouncementMapper;
 import com.community.huiju.dao.UserMapper;
+import com.community.huiju.model.Message;
 import com.community.huiju.model.TdImages;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpBuildingOwnerInfo;
@@ -48,6 +50,8 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private MessageMapper messageMapper;
 
 
     @Override
@@ -112,8 +116,23 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             return response;
         }
         tpAnnouncementMapper.insert(tpAnnouncement);
-
-
+        //根据1.5需求维护tp_message
+            if ("2".equals(tpAnnouncement.getStatus())) {
+                Message message = new Message();
+                message.setCommunityId(communityId);
+                message.setMessageType("5");
+                message.setAdviceType("4");
+                message.setUuid(userId);
+                message.setUuidType("2");
+                message.setSource("2");
+                message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
+                message.setStatus("0");
+                message.setReadStatus("0");
+                message.setCreateUser(userId);
+                message.setCreateDate(LocalDateTime.now());
+                message.setAnnouncementId(tpAnnouncement.getId());
+                messageMapper.insert(message);
+            }
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();
             tdImages.setImageUrl(img);
@@ -182,6 +201,27 @@ 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.setAnnouncementId(tpAnnouncement.getId());
+                message.setUpdateDate(LocalDateTime.now());
+                message.setUpdateUser(userId);
+                message.setStatus("0");
+                messageMapper.updateMessage(message);
+            }
         }
         return response;
     }
@@ -199,6 +239,13 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tpAnnouncement.setCommunityId(communityId);
             tpAnnouncement.setStatus("0");
             tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
+            //1.5版本维护消息
+            Message message= new Message();
+            message.setStatus("1");
+            message.setAnnouncementId(id);
+            message.setUpdateUser(userId);
+            message.setUpdateDate(LocalDateTime.now());
+            messageMapper.updateMessage(message);
         }
         return response;
     }

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

@@ -49,6 +49,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Autowired
     private TaUserMapper taUserMapper;
+
+    @Autowired
+    private MessageMapper messageMapper;
+
     @Override
     public ResponseBean ticketLiset(String parameter,Integer communityId) {
          ResponseBean response= new ResponseBean<>();
@@ -220,6 +224,25 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setCreateUser(id);
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
+
+        QueryWrapper<TpTicket> messageTpTicket = new QueryWrapper<>();
+        messageTpTicket.lambda().eq(TpTicket::getId,ticketId);
+        TpTicket ticket=tpTicketMapper.selectById(messageTpTicket);
+        Message message = new Message();
+        message.setCommunityId(communityId);
+        message.setMessageType("5");
+        message.setAdviceType("4");
+        message.setUuid(ticketId);
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+        message.setStatus("0");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(LocalDateTime.now());
+        message.setTicketId(ticketId);
+        messageMapper.insert(message);
+
         response.addSuccess("成功");
         return response;
     }
@@ -259,6 +282,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ticketRecordComment.setCreateDate(LocalDateTime.now());
         response.addSuccess("成功");
         tpTicketRecordCommentMapper.insert(ticketRecordComment);
+
+        //维护1.5版本
+        Message message = new Message();
+        message.setTicketId(ticketId);
+        message.setUpdateUser(id);
+        message.setUpdateDate(LocalDateTime.now());
+        message.setStatus("0");
+        messageMapper.updateTicketMessage(message);
         return response;
     }
 

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

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.MessageMapper">
+    <select id="messageLiset" resultType="com.community.huiju.model.Message">
+        SELECT
+        id,
+        ticket_id,
+        community_id,
+        message_type,
+        advice_type,
+        model_type,
+        uuid,
+        uuid_type,
+        source,
+        message_content,
+        STATUS,
+        result,
+        meaasge_type_id,
+        read_status,
+        create_user,
+        create_date,
+        update_user,
+        update_date,
+        bill_id,
+        activity_id,
+        announcement_id
+    FROM
+      tp_message
+      <where>
+          <if test='messageType == "-1"'>
+              and  message_type in(5,8,9)
+          </if>
+          <if test='messageType == "-2"'>
+              and  message_type in(1,2,3)
+          </if>
+          <if test='messageType == "-3"'>
+              and  message_type=7
+          </if>
+          <if test="status != null and status !=''">
+              and  status=#{status,jdbcType=VARCHAR}
+          </if>
+          <if test="createDate != null">
+              and  date_format(create_date,'%Y%m%d')=date_format(#{createDate},'%Y%m%d')
+          </if>
+          <if test="messageContent != null and messageContent !=''">
+              and message_content like concat('%',#{ messageContent,jdbcType=VARCHAR},'%')
+          </if>
+          and uuid =#{uuid,jdbcType=INTEGER}
+          and uuid_type = 2
+      </where>
+    </select>
+    <update id="updateMessage" parameterType="com.community.huiju.model.Message" >
+    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},
+        </if>
+        <if test="message.updateDate != null" >
+            update_date = #{message.updateDate,jdbcType=TIMESTAMP},
+        </if>
+        <if test="message.status != null" >
+            status = #{status,jdbcType=CHAR},
+        </if>
+    where announcement_id = #{message.announcementId,jdbcType=INTEGER}
+  </update>
+
+    <update id="updateTicketMessage" parameterType="com.community.huiju.model.Message" >
+        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},
+        </if>
+        <if test="message.updateDate != null" >
+            update_date = #{message.updateDate,jdbcType=TIMESTAMP},
+        </if>
+        <if test="message.status != null" >
+            status = #{status,jdbcType=CHAR},
+        </if>
+        where ticket_id = #{message.ticketId,jdbcType=INTEGER}
+    </update>
+
+    <select id="myMessageList" resultType="com.community.huiju.model.Message">
+        SELECT
+        id,
+        ticket_id,
+        community_id,
+        message_type,
+        advice_type,
+        model_type,
+        uuid,
+        uuid_type,
+        source,
+        message_content,
+        STATUS,
+        result,
+        meaasge_type_id,
+        read_status,
+        create_user,
+        create_date,
+        update_user,
+        update_date,
+        bill_id,
+        activity_id,
+        announcement_id
+        FROM
+        tp_message
+        <where>
+            <if test='messageType == "-1"'>
+                and  message_type in(5,8,9)
+            </if>
+            <if test='messageType == "-2"'>
+                and  message_type in(1,2,3)
+            </if>
+            <if test='messageType == "-3"'>
+                and  message_type=7
+            </if>
+            <if test="readStatus != null and readStatus !=''">
+                and  read_status=#{readStatus,jdbcType=VARCHAR}
+            </if>
+            <if test="createDate != null">
+                and  date_format(create_date,'%Y%m%d')=date_format(#{createDate},'%Y%m%d')
+            </if>
+            <if test="messageContent != null and messageContent !=''">
+                and message_content like concat('%',#{ messageContent,jdbcType=VARCHAR},'%')
+            </if>
+            and uuid =#{uuid,jdbcType=INTEGER}
+        </where>
+    </select>
+</mapper>

VUECODE/smart-property-manage/src/api/message.js

@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function listMessage(data) {
+  return request({
+    url: '/messageLiset',
+    method: 'post',
+    data: {
+      id: data.id,
+      messageContent: data.messageContent,
+      messageType: data.messageType,
+      createDate: data.dataValue,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      status: data.status
+    }
+  })
+}
+export function myMessageList(data) {
+  return request({
+    url: '/myMessageList',
+    method: 'post',
+    data: {
+      id: data.id,
+      messageContent: data.messageContent,
+      messageType: data.messageType,
+      createDate: data.dataValue,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      readStatus: data.readStatus
+    }
+  })
+}
+export function delectRead(data) {
+  return request({
+    url: '/delectRead',
+    method: 'post',
+    data: {
+      id: data
+    }
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -285,6 +285,28 @@ export const constantRouterMap = [
         meta: { title: '工单详情', icon: 'table' }
       }
     ]
+  },
+  {
+    path: '/message',
+    component: Layout,
+    redirect: '/message/index',
+    name: 'message',
+    alwaysShow: true,
+    meta: { title: '消息管理', icon: 'zip' },
+    children: [
+      {
+        path: '/message/index',
+        component: () => import('@/views/message/index'),
+        name: 'message-index',
+        meta: { title: '待办', icon: 'table' }
+      },
+      {
+        path: '/message/messageIndex',
+        component: () => import('@/views/message/messageIndex'),
+        name: 'message-messageIndex',
+        meta: { title: '消息', icon: 'table' }
+      }
+    ]
   }
 ]
 

VUECODE/smart-property-manage/src/store/index.js

@@ -16,6 +16,7 @@ import billInvoice from './modules/billInvoice'
 import ticket from './modules/ticket'
 import bill from './modules/bill'
 import billStatement from './modules/billStatement'
+import message from './modules/message'
 
 Vue.use(Vuex)
 
@@ -35,7 +36,8 @@ const store = new Vuex.Store({
     billInvoice,
     ticket,
     bill,
-    billStatement
+    billStatement,
+    message
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/message.js

@@ -0,0 +1,37 @@
+import { listMessage, myMessageList, delectRead } from '@/api/message'
+
+const ticket = {
+  actions: {
+    /**
+     *获取当前小区所有的待办消息
+     */
+    ListMessage({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        listMessage(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    MyMessageList({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        myMessageList(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    DelectRead({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        delectRead(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+export default ticket

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

@@ -0,0 +1,242 @@
+<template>
+    <div>
+        <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item">
+        <el-select v-model="listQuery.messageType" placeholder="待办类型">
+         <el-option label="选择状态" value="" />
+         <el-option label="论坛待办" value="-1"/>
+         <el-option label="工单待办" value="-2"/>
+         <el-option label="费用待办" value="-3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item >
+        <el-select v-model="listQuery.status" placeholder="是否有效">
+         <el-option label="选择状态" value="" />
+         <el-option label="正在处理" value="1"/>
+         <el-option label="无效" value="0"/>
+        </el-select>
+      </el-form-item>
+      <span >
+        <span class="demonstration">默认</span>
+        <el-date-picker
+        v-model="listQuery.dataValue"
+        type="datetime"
+        placeholder="选择日期时间">
+        </el-date-picker>
+      </span>
+      <el-form-item class="filter-item" label="消息内容">
+        <el-input v-model="listQuery.messageContent" placeholder="消息内容" />
+      </el-form-item>    
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listData"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <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">
+       <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 }}
+          </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 }}
+          </span>
+        </a>
+      </template> 
+       </el-table-column>
+        <el-table-column prop="id" label="操作" align="center">
+        <template slot-scope="scope">
+            <!--无效的-->
+          <span  v-if="scope.row.status==='0'">
+          <!--公告-->
+          <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==='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==='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==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
+          </span>
+             <!--有效的-->
+          <span v-if="scope.row.status==='1'" 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==='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==='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==='3'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>
+          <!--缴费-->
+          <a><span v-if="scope.row.messageType==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+        <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>    
+    
+</div>
+    
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+          listQuery: {
+            id: '',
+            messageContent: '',   
+            status: '',
+            //待办类型  
+            messageType:'',
+            pageNum: 1,
+            pageSize: 10,
+            dataValue: ''
+          },
+           total: 0,  
+           listLoading: true, // 加载圈
+           listData: [],
+        }
+    },
+    mounted(){
+        //  this.listLoading = false
+    this.dataQuery()
+    },
+    methods:{
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('ListMessage', this.listQuery).then((res) => {
+        const resData = res.data
+        console.log('resData',resData.list)
+        this.listData = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListMessage')
+      })
+    },        
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.messageContent = ''
+      this.listQuery.status = ''
+      this.listQuery.messageType = ''
+      this.listQuery.dataValue = ''  
+      this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.dataQuery()
+    },
+    search() {
+      this.dataQuery()
+    },
+    handleSelectionChange(data) {
+      this.deleteIds = [] // 设置为 空
+      for (let i = 0; i < data.length; i++) {
+      this.deleteIds.push(data[i].id)
+    }
+    },
+     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+      padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    // 公告详情
+    announcementDetails(id) {
+      console.log('id11',id)
+      this.$router.push({ name: 'contentParticulars-details', params: { id: id }})
+    },
+    // 活动
+     activityDetails(id) { // 查看活动
+      this.$router.push({ name: 'activity-info', params: { id: id }})
+    },
+    //工单
+    ticketDetails(id) {
+      console.log('111111'+id)
+      this.$router.push({ name: 'ticket-details', query: { id: id }})
+    },
+    // 缴费
+    billDetails(billId){
+        this.$router.push({ name: 'bill-info', query: { id: billId }})
+    },
+    // 二手租赁
+    handleLook(id) {
+      this.$router.push({ name: 'transaction-info', params: { id: id }})
+    },
+    }
+
+}
+</script>
+
+<style>
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.spanSize{
+    color:aqua
+}
+</style>

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

@@ -0,0 +1,264 @@
+<template>
+    <div>
+        <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item">
+        <el-select v-model="listQuery.messageType" placeholder="待办类型">
+         <el-option label="选择状态" value="" />
+         <el-option label="论坛待办" value="-1"/>
+         <el-option label="工单待办" value="-2"/>
+         <el-option label="费用待办" value="-3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item >
+        <el-select v-model="listQuery.readStatus" placeholder="是否已读">
+         <el-option label="选择状态" value="" />
+         <el-option label="已读" value="1"/>
+         <el-option label="未读" value="0"/>
+        </el-select>
+      </el-form-item>
+      <span >
+        <span class="demonstration">默认</span>
+        <el-date-picker
+        v-model="listQuery.dataValue"
+        type="datetime"
+        placeholder="选择日期时间">
+        </el-date-picker>
+      </span>
+      <el-form-item class="filter-item" label="消息内容">
+        <el-input v-model="listQuery.messageContent" placeholder="消息内容" />
+      </el-form-item>    
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+         <el-button type="success" @click="readMessage">标记为已读</el-button>
+      </el-form-item>
+    </el-form>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="listData"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        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">
+       <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 }}
+          </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 }}
+          </span>
+        </a>
+      </template> 
+       </el-table-column>
+        <el-table-column prop="id" label="操作" align="center">
+        <template slot-scope="scope">
+            <!--无效的-->
+          <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==='8'" @click="activityDetails(scope.row.activityId)">{{'查看帖子详情'}}</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==='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==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
+          </span>
+             <!--有效的-->
+          <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==='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==='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==='3'" @click="ticketDetails(scope.row.ticketId)">{{'查看工单详情'}}</span></a>
+          <!--缴费-->
+          <a><span v-if="scope.row.messageType==='7'" @click="billDetails(scope.row.billId)">{{'查看费用单详情'}}</span></a>        
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+        <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>    
+    
+</div>
+    
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+          listQuery: {
+            id: '',
+            readStatus: '',
+            messageContent: '',   
+            status: '',
+            //待办类型  
+            messageType:'',
+            pageNum: 1,
+            pageSize: 10,
+            dataValue: ''
+          },
+           total: 0,  
+           listLoading: true, // 加载圈
+           listData: [],
+           deleteIds: [], // 选择的id集合
+        }
+    },
+    mounted(){
+        //  this.listLoading = false
+    this.dataQuery()
+    },
+    methods:{
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('MyMessageList', this.listQuery).then((res) => {
+        const resData = res.data
+        console.log('resData',resData.list)
+        this.listData = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListMessage')
+      })
+    },        
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.readStatus = ''
+      this.listQuery.messageContent = ''
+      this.listQuery.status = ''
+      this.listQuery.messageType = ''
+      this.listQuery.dataValue = ''  
+      this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.dataQuery()
+    },
+    search() {
+      this.dataQuery()
+    },
+    handleSelectionChange(data) {
+      this.deleteIds = [] // 设置为 空
+      for (let i = 0; i < data.length; i++) {
+      this.deleteIds.push(data[i].id)
+    }
+    },
+     formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+      padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    // 公告详情
+    announcementDetails(id) {
+      console.log('id11',id)
+      this.$router.push({ name: 'contentParticulars-details', params: { id: id }})
+    },
+    // 活动
+     activityDetails(id) { // 查看活动
+      this.$router.push({ name: 'activity-info', params: { id: id }})
+    },
+    //工单
+    ticketDetails(id) {
+      console.log('111111'+id)
+      this.$router.push({ name: 'ticket-details', query: { id: id }})
+    },
+    // 缴费
+    billDetails(billId){
+        this.$router.push({ name: 'bill-info', query: { id: billId }})
+    },
+    // 二手租赁
+    handleLook(id) {
+      this.$router.push({ name: 'transaction-info', params: { id: id }})
+    },
+    readMessage(){
+     //  批量作废
+      const ide= this.deleteIds
+       console.log('this.listQuery.id',ide)
+       if ( ide.length<=0) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      this.$store.dispatch('DelectRead', ide).then((res) => {
+        this.$message({
+          message: '成功',
+          type: 'success'
+        });
+       this.dataQuery()     
+      })    
+    }
+  }   
+}
+</script>
+
+<style>
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.spanSize{
+    color:aqua
+}
+</style>

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

@@ -161,9 +161,6 @@ export default {
     },
 	  search() {
       this.listQuery.pageNum = 1
-      this.dataQuery()
-    },
-    handleFilter() {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 10
       this.listQuery.ownerName =''
@@ -178,6 +175,9 @@ export default {
       this.listQuery.updateUserNmae=''
       this.dataQuery()
     },
+    handleFilter() {
+      this.dataQuery()
+    },
     clickTitle(id) {
       console.log('111111'+id)
       this.$router.push({ name: 'ticket-details', query: { id: id }})