合并

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

@@ -3,6 +3,9 @@
   <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/property-api/src/main/java/com/community/huiju/controller/ImageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/api/ticket.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/ticket.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/store/modules/ticket.js" 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" />
     </list>
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
@@ -23,65 +26,41 @@
   </component>
   <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">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7776">
-              <caret line="307" selection-start-line="307" selection-end-line="307" />
-            </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/TicketController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3267">
-              <caret line="143" column="43" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="56" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <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="3">
-              <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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">
+        <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="2403">
-              <caret line="104" selection-start-line="104" selection-end-line="104" />
+            <state relative-caret-position="275">
+              <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
+              <folding>
+                <element signature="e#2452#2460#0" 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/model/TpTicketRecordComment.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ImageServiceI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="432">
-              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+            <state relative-caret-position="312">
+              <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
             </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/TpTicketController.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="2511">
-              <caret line="109" column="60" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
+            <state relative-caret-position="246">
+              <caret line="90" column="6" lean-forward="true" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
+        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1782">
-              <caret line="68" selection-start-line="68" selection-end-line="68" />
+            <state relative-caret-position="545">
+              <caret line="64" selection-start-line="64" selection-end-line="64" />
             </state>
           </provider>
         </entry>
@@ -94,6 +73,7 @@
       <find>ticketId</find>
       <find>queryWrapper</find>
       <find>content</find>
+      <find>图片上传</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -106,6 +86,7 @@
         <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/service/impl/TpTicketServiceImpl.java" />
+        <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/ImageController.java" />
       </list>
     </option>
   </component>
@@ -127,10 +108,10 @@
     <option name="jreName" value="1.8" />
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="197" />
-    <option name="y" value="131" />
-    <option name="width" value="1687" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="793" />
+    <option name="y" value="2" />
+    <option name="width" value="1628" />
     <option name="height" value="1061" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -140,7 +121,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -148,90 +128,6 @@
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" 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" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="assembly" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="community" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="community" type="462c0819:PsiDirectoryNode" />
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="community" type="462c0819:PsiDirectoryNode" />
-              <item name="huiju" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
-              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
-              <item name="app-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
@@ -334,6 +230,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -343,7 +240,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="1550663036257" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550743197830" />
     <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" />
@@ -474,18 +371,19 @@
       <workItem from="1550547903821" duration="17904000" />
       <workItem from="1550580590425" duration="175000" />
       <workItem from="1550625046867" duration="10953000" />
-      <workItem from="1550663154868" duration="247000" />
+      <workItem from="1550663154868" duration="404000" />
+      <workItem from="1550711362440" duration="13311000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30321000" />
+    <option name="totallyTimeSpent" value="43789000" />
   </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.24200426" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.15242778" />
       <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" />
@@ -495,16 +393,16 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.70042646" visible="true" weight="0.96659243" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" weight="0.12624584" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.36302894" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.3530067" />
       <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.29957357" side_tool="true" visible="true" weight="0.96659243" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.7696567" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.3001066" side_tool="true" weight="0.5222717" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.19376393" />
       <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" />
@@ -519,6 +417,41 @@
       <window_info anchor="right" id="Theme Preview" order="8" />
       <window_info anchor="right" id="Bean Validation" order="9" weight="0.32983872" />
     </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15242778" />
+      <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" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <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.36302894" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.3776301" />
+      <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.3001066" side_tool="true" weight="0.5222717" />
+      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.49969268" weight="0.19376393" />
+      <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" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.025806451" />
+      <window_info anchor="right" id="Palette" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32983872" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -594,52 +527,97 @@
         </state>
       </provider>
     </entry>
-    <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="7776">
-          <caret line="307" selection-start-line="307" selection-end-line="307" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3267">
+        <state>
           <caret line="143" column="43" selection-start-line="143" selection-start-column="38" selection-end-line="143" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
+    <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="2403">
-          <caret line="104" selection-start-line="104" selection-end-line="104" />
+        <state>
+          <caret line="296" selection-start-line="296" selection-end-line="296" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
+        <state>
           <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TpTicketController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2511">
+        <state>
           <caret line="109" column="60" selection-start-line="109" selection-start-column="53" selection-end-line="109" selection-end-column="65" />
         </state>
       </provider>
     </entry>
     <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="1782">
+        <state>
           <caret line="68" selection-start-line="68" selection-end-line="68" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+    <entry file="jar://F:/maven3.5/maven/serverRepository/org/springframework/spring-core/5.0.8.RELEASE/spring-core-5.0.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="27">
+          <caret line="104" selection-start-line="104" selection-end-line="104" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/operate-api/src/main/java/com/community/huiju/controller/ImageController.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>
+      </provider>
+    </entry>
+    <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="79">
+          <caret line="157" column="58" lean-forward="true" selection-start-line="157" selection-start-column="58" selection-end-line="157" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="246">
+          <caret line="90" column="6" lean-forward="true" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="545">
+          <caret line="64" selection-start-line="64" selection-end-line="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/Program Files/Java/jdk1.8.0_121/src.zip!/java/lang/String.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3">
-          <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/ImageServiceI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="312">
+          <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <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="275">
+          <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
+          <folding>
+            <element signature="e#2452#2460#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -13,12 +13,15 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import sun.misc.BASE64Decoder;
 
+import javax.sql.rowset.serial.SerialBlob;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,17 +55,24 @@ public class ImageController extends BaseController {
 
     @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
     @PostMapping(value = "/uploadimageBase64")
-    public ResponseBean uploadImgBase64AndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) String[] uploadFiles) throws Exception {
+    public ResponseBean uploadImgBase64AndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) String uploadFiles) throws Exception {
         ResponseBean responseBean = new ResponseBean();
         List<String> urls = new ArrayList<String>();
-        for (String base64Url : uploadFiles) {
-            BASE64Decoder base64Decoder = new BASE64Decoder();
-            byte[] bytes = base64Decoder.decodeBuffer(base64Url);
-            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
-            String url = imageService.getImageUrl(byteArrayInputStream);
-            urls.add(url);
-        }
+        BASE64Decoder base64Decoder = new BASE64Decoder();
+        // int index = uploadFiles.indexOf("data:image/jpeg;base64,");
+        uploadFiles = uploadFiles.substring(23);
+        SerialBlob serialBlob = decodeToImage(uploadFiles);
+
+        String url = imageService.getImageUrl(serialBlob.getBinaryStream());
+        urls.add(url);
         responseBean.addSuccess(urls);
         return responseBean;
     }
+
+    public static SerialBlob decodeToImage(String imageString) throws Exception {
+        BASE64Decoder decoder = new BASE64Decoder();
+        byte[] imageByte = decoder.decodeBuffer(imageString);
+        return new SerialBlob(imageByte);
+    }
+
 }

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

@@ -34,7 +34,7 @@ export function addRecordComment(data) {
     data: {
       ticketId: data.id,
       content: data.textContent,
-      imageUrl: data.img
+      imageUrl: data.contentImgAA
     }
   })
 }
@@ -72,3 +72,14 @@ export function updateTicket(data) {
   })
 }
 
+// // headers: {
+//   'Content-Type': 'application/x-www-form-urlencoded'
+// },
+export function imgAdd(data) {
+  return request({
+    url: '/uploadimageBase64',
+    method: 'post',
+    data: data
+  })
+}
+

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

@@ -1,4 +1,4 @@
-import { listTicket, ticketEdit, addRecordComment, addRecord, updateTicketStatus, updateTicket } from '@/api/ticket'
+import { listTicket, ticketEdit, addRecordComment, addRecord, updateTicketStatus, updateTicket, imgAdd } from '@/api/ticket'
 
 const ticket = {
   actions: {
@@ -58,6 +58,15 @@ const ticket = {
           reject(error)
         })
       })
+    },
+    ImgAdd({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        imgAdd(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

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

@@ -91,7 +91,7 @@
                            <td>                        
                             	<div class="processing_content_detail" style="float:left;width:70%">
                                     <span>{{itemContent.userName}}:{{itemContent.content}}                                 
-                                    <span style="color:#219AFF">'sssss'</span>
+                                    <span style="color:#219AFF"></span>
                                     </span>
                                     </div>
                               <div class="processing_content_detail" style="float:right;"><span ><i class="el-icon-time"></i>{{formatDate(itemContent.createDate)}}</span> </div>
@@ -102,7 +102,7 @@
                             	<div class="processing_content_detail" style="float:left;width:70%">
                                 <div style="float:left;width: 2px;height: 20px; background:#C7D4E9;margin-left:10px;margin-right:10px"></div> 
                                 <!-- <img :src="contentImgURL.imageUrl"  v-for="contentImgURL in itemContent.imgURL" preview preview-text="描述"  width="200" style="margin:5px;"> -->
-                                <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="200" height="200"  style="margin:5px;">                                                      
+                                <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="100" height="100"  style="margin:5px;">                                                      
                                 </div>                           
                             </td>
                           </tr>
@@ -114,7 +114,8 @@
            </el-step>
         </el-steps>
   </div>
-        <div v-if="listQuery.status==='0'||listQuery.status==='3'">
+  <!-- v-if="listQuery.status==='0'||listQuery.status==='3'" -->
+        <div >
         <div>
         <span>参与沟通</span>
         </div>
@@ -129,10 +130,10 @@
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
-          :file-list="listQuery.img"
-          :show-file-list="Ass"
           name="uploadFiles"
           action="http://106.14.20.193:8086/property-api/uploadimage"
+          :file-list="listQuery.img"
+          :show-file-list="Ass"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -143,32 +144,32 @@
         <el-button type="primary" @click="submitContent">提交</el-button>
         </div>
         </div>
-
-        <div v-if="listQuery.status==='3'">
+      <!-- //v-if="listQuery.status==='3'" -->
+        <div >
         <div>
-        <span>流程操作</span>
+        <span>流程操作(压缩测试)</span>
         </div>
         <br>
           <div>   
           <textarea v-model="listQuery.relationContent" placeholder="请输入内容" class="textarea-inherit" id="message_textarea" rows="4"></textarea> 
         </div>
         <div>
-        <!-- <el-form-item label="图片附件">
+        <el-form-item label="图片附件">
         <el-upload
           :before-upload="handleCompress"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           :on-success="handleSuccessContentImg"
           :file-list="contentImgList"
-          name="uploadFiles"
+           action=""
           list-type="picture-card">
           <i class="el-icon-plus"/>
           </el-upload>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
           </el-dialog>
-        </el-form-item> -->
-        <el-form-item label="图片附件">
+        </el-form-item>
+        <!-- <el-form-item label="图片附件">
         <el-upload
           :limit="8"
           :on-preview="handlePictureCardPreviewIO"
@@ -184,7 +185,7 @@
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrlIO" width="100%" alt="">
         </el-dialog>
-      </el-form-item>
+      </el-form-item> -->
         <el-button type="primary" @click="succeedClick">提交</el-button>
         </div>
         </div>
@@ -206,6 +207,7 @@
 </template>
 <script>
 import { mapActions } from 'vuex'
+import Qs from 'qs'
 export default {
   data() {
     return {
@@ -293,6 +295,7 @@ export default {
     },
     handleSuccessContentImg(response, file, fileList) { // 配图上传成功时回调
       const resImg = response.data[0]
+      console.log('resImg',resImg)
       this.contentImgAA.push(resImg)
     },
     //流程
@@ -311,102 +314,92 @@ export default {
       const resImg = response.data[0]
       this.contentImgIO.push(resImg)
     },
-    // handleRemove(file, fileList) { // 配图移除时
-    //   this.listQuery.contentImg = []
-    //   for (let i = 0; i < fileList.length; i++) {
-    //     this.listQuery.contentImg.push(fileList[i].response.data[0])
-    //   }
-    //   console.log(file, fileList)
-    // },
-    // handlePictureCardPreview(file) { // 点击配图文件列表中已上传的文件时的钩子
-    //   this.dialogImageUrl = file.url
-    //   this.dialogVisible = true
-    // },
-    // handleSuccessContentImg(response, file, fileList) { // 活动上传成功时回调
-    //   const resImg = response.data[0]
-    //   this.listQuery.contentImg.push(resImg)
-    // },
-    // handleCompress(file) {  // 图片压缩
-    //   let self = this;
-    //   return new Promise((resolve, reject) => {
-    //     var reader = new FileReader()
-    //     reader.onload = function (e) {
-    //       var data = e.target.result
-    //       // 加载图片获取图片真实宽度和高度
-    //       var image = new Image()
-    //       image.onload = function () {
-    //         let newdata = self.compress(image);
-    //         let blob = self.dataURItoBlob(newdata);
-    //         var formData = new FormData();
-    //         formData.append("file", blob);
-    //         console.log("********将blob对象转成formData对象********");
-    //         console.log(formData.get("file"));
-    //         let config = {
-    //           headers: { "Content-Type": "multipart/form-data" }
-    //         };
-    //         self.axios.post(self.imgUploadUrl, formData, config).then(res => {
-    //           // if (res.data.code == 200) {
-    //           //   self.$emit(
-    //           //     "getImgsrc",
-    //           //     res.data.data.resultftphost,
-    //           //     res.data.data.resulturl
-    //           //   );
-    //           // } else {
-    //           //   self.$message({
-    //           //     message: "图片上传失败，请重试",
-    //           //     type: "warning"
-    //           //   });
-    //           // }
-    //         });
-    //       }
-    //       image.src = data
-    //     }
-    //     reader.readAsDataURL(file)
-    //   })
-    // },
-    // // 压缩图片
-    // compress(img) {
-    //   let canvas = document.createElement("canvas");
-    //   let ctx = canvas.getContext("2d");
-    //   let initSize = img.src.length;
-    //   let width = img.width;
-    //   let height = img.height;
-    //   canvas.width = width;
-    //   canvas.height = height;
-    //   // 铺底色
-    //   ctx.fillStyle = "#fff";
-    //   ctx.fillRect(0, 0, canvas.width, canvas.height);
-    //   ctx.drawImage(img, 0, 0, width, height);
+    handleCompress(file) {  // 图片压缩
+      let self = this;
+      return new Promise((resolve, reject) => {
+        var reader = new FileReader()
+        reader.onload = function (e) {
+          var data = e.target.result
+          // 加载图片获取图片真实宽度和高度
+            var image = new Image()
+            image.onload = function () {
+            let newdata = self.compress(image);
+            let blob = self.dataURItoBlob(newdata);
+            var formData = new FormData();
+            formData.append("file", blob);
+            formData.append("newdata", newdata);
+            console.log("********将blob对象转成formData对象********");
+            console.log(formData.get("file"));
+            console.log('formData',formData) 
+
+                console.log(formData)
+                let data = {"uploadFiles": newdata }
+
+                self.$store.dispatch('ImgAdd', Qs.stringify(data)).then((res) => {
+                if (res.data.code == 200) {
+                self.$emit(
+                  "getImgsrc",
+                  res.data.data.resultftphost,
+                  res.data.data.resulturl
+                );
+              } else {
+                self.$message({
+                  message: "图片上传失败，请重试",
+                  type: "warning"
+                });
+              }  
+          }).catch(() => {
+            console.log('imgAdd error')
+          })
+
+
+
+          }
+          image.src = data
+        }
+        reader.readAsDataURL(file)
+      })
+    },
+    // 压缩图片
+    compress(img) {
+      let canvas = document.createElement("canvas");
+      let ctx = canvas.getContext("2d");
+      let initSize = img.src.length;
+      let width = img.width;
+      let height = img.height;
+      canvas.width = width;
+      canvas.height = height;
+      // 铺底色
+      ctx.fillStyle = "#fff";
+      ctx.fillRect(0, 0, canvas.width, canvas.height);
+      ctx.drawImage(img, 0, 0, width, height);
+
+      //进行最小压缩
+      let ndata = canvas.toDataURL("image/jpeg", 0.1);
+      console.log("*******压缩后的图片大小*******");
+      // window.atob(ndata);
+      // console.log(' window.atob(ndata);', window.atob(ndata))
+      console.log(ndata)
+      console.log(ndata.length);
+      return ndata;
+    },
+    // base64转成bolb对象
+    dataURItoBlob(base64Data) {
+      var byteString;
+      if (base64Data.split(",")[0].indexOf("base64") >= 0)
+        byteString = atob(base64Data.split(",")[1]);
+      else byteString = unescape(base64Data.split(",")[1]);
+      var mimeString = base64Data
+        .split(",")[0]
+        .split(":")[1]
+        .split(";")[0];
+      var ia = new Uint8Array(byteString.length);
+      for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+      }
+      return new Blob([ia], { type: mimeString });
+    },
 
-    //   //进行最小压缩
-    //   let ndata = canvas.toDataURL("image/jpeg", 0.1);
-    //   // console.log("*******压缩后的图片大小*******");
-    //   // console.log(ndata)
-    //   // console.log(ndata.length);
-    //   return ndata;
-    // },
-    // // base64转成bolb对象
-    // dataURItoBlob(base64Data) {
-    //   var byteString;
-    //   if (base64Data.split(",")[0].indexOf("base64") >= 0)
-    //     byteString = atob(base64Data.split(",")[1]);
-    //   else byteString = unescape(base64Data.split(",")[1]);
-    //   var mimeString = base64Data
-    //     .split(",")[0]
-    //     .split(":")[1]
-    //     .split(";")[0];
-    //   var ia = new Uint8Array(byteString.length);
-    //   for (var i = 0; i < byteString.length; i++) {
-    //     ia[i] = byteString.charCodeAt(i);
-    //   }
-    //   return new Blob([ia], { type: mimeString });
-    // },
-    // handleRemove(file, fileList) { // 配图移除时
-    //   this.listQuery.contentImg = []
-    //   for (let i = 0; i < fileList.length; i++) {
-    //   this.listQuery.contentImg.push(fileList[i].response.data[0])
-    //   }
-    // },
     formatDate(val) {
       var value = new Date(val)
       var year = value.getFullYear()
@@ -415,6 +408,8 @@ export default {
       var hour = value.getHours()
       var minutes = value.getMinutes()
       var seconds = value.getSeconds()
+      // var minut=minutes<10?minutes:'0'+minutes
+
       return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       // return year + '-' + month + '-' + day
     },
@@ -433,13 +428,13 @@ export default {
          return
       }
         //  console.log("contentImg",this.listQuery.contentImg)
+        console.log('this.listQuery.img',this.listQuery.img)
         console.log('sss',this.listQuery.textContent)
         this.listQuery.img=this.contentImgAA
-        this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
-            this.Ass=false
-            this.contentImgAA=[]
-          this.dataQuery()
-         
+      this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
+          this.Ass=false
+          this.contentImgAA=[]
+          this.dataQuery()    
           this.Ass=true
           loading.close()
       }).catch(() => {
@@ -528,34 +523,6 @@ export default {
         console.log('error addRecordComment')
       })
     },
-
-    //拒绝受理弹框
-    // noAccept() {
-    //     this.$prompt('拒绝受理', {
-    //       confirmButtonText: '确定',
-    //       cancelButtonText: '取消'
-    //     }).then(({ value }) => {
-    //        updateTicketStatus(value)      
-    //       this.$message({
-    //         type: 'success',
-    //         message: '你的邮箱是: ' + value,
-           
-    //       });
-    //     }).catch(() => {
-    //       this.$message({
-    //         type: 'info',
-    //         message: '取消输入'
-    //       });       
-    //     });
-    //   },
-      //拒绝受理
-    // updateTicketStatus(value){ 
-    //     console.log('sss',this.listQuery.textContent)
-    //     this.$store.dispatch('UpdateTicketStatus', this.listQuery).then((res) => {
-    //   }).catch(() => {
-    //     console.log('error AddRecord')
-    //   })
-    // },
      next() {
         if (this.active++ > 2) this.active = 0;
       },