优化接口

.idea/workspace.xml

@@ -5,7 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/repair/config/AddResponseHeaderFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -21,92 +22,49 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="111">
-              <caret line="57" column="29" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="29" />
+            <state relative-caret-position="569">
+              <caret line="3078" column="76" selection-start-line="3078" selection-start-column="66" selection-end-line="3078" selection-end-column="76" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="621">
-              <caret line="428" column="13" selection-start-line="428" selection-start-column="13" selection-end-line="428" selection-end-column="13" />
+            <state relative-caret-position="526">
+              <caret line="1087" column="73" selection-start-line="1087" selection-start-column="73" selection-end-line="1087" selection-end-column="73" />
+              <folding>
+                <element signature="e#814#818#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="15" column="53" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6624">
-              <caret line="330" column="40" selection-start-line="330" selection-start-column="40" selection-end-line="330" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="33" selection-start-line="33" selection-end-line="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1012">
-              <caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAreaVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="874">
-              <caret line="53" column="62" selection-start-line="53" selection-start-column="52" selection-end-line="53" selection-end-column="62" />
+            <state relative-caret-position="115">
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>delete</find>
-      <find>删除的</find>
-      <find>deletedArticleBuildByIds</find>
-      <find>待支付</find>
-      <find>Unpaid</find>
-      <find>待确认</find>
-      <find>queryMyRepairRecordList</find>
-      <find>maintenanceWorker</find>
-      <find>updateRepairUserSettingByld</find>
-      <find>SettingByld</find>
       <find>MaintenanceWorker</find>
       <find>if (userPages.getList() == null ||</find>
       <find>queryUserPage</find>
@@ -127,6 +85,16 @@
       <find>builds</find>
       <find>存在</find>
       <find>importRepairClassesSettingExcel</find>
+      <find>&quot;,&quot;</find>
+      <find>过期</find>
+      <find>login</find>
+      <find>getToken</find>
+      <find>Openid</find>
+      <find>支付</find>
+      <find>repairAreaTotal</find>
+      <find>orders_compensation</find>
+      <find>repairArea</find>
+      <find>select</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -148,12 +116,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairPayRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/config/AddResponseHeaderFilter.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
       </list>
     </option>
   </component>
@@ -189,7 +158,7 @@
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
-    <option name="width" value="974" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectId" id="2ahuEEqvb7VL7aZNfgOouNVEGo4" />
@@ -347,7 +316,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../定时器方法/repair_backend" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RebelAgentSelection">
@@ -483,12 +452,16 @@
       <workItem from="1718184937229" duration="647000" />
       <workItem from="1718263818280" duration="68000" />
       <workItem from="1718693040194" duration="291000" />
-      <workItem from="1720064017651" duration="1793000" />
+      <workItem from="1720064017651" duration="1831000" />
+      <workItem from="1720489648674" duration="1437000" />
+      <workItem from="1721015153273" duration="867000" />
+      <workItem from="1721130294493" duration="2017000" />
+      <workItem from="1721196026572" duration="5276000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="133797000" />
+    <option name="totallyTimeSpent" value="143432000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -503,7 +476,7 @@
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21162046" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.4059081" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -515,7 +488,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.41466084" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.06345733" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.062363237" />
       <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" weight="0.32932165" />
@@ -542,7 +515,7 @@
       <window_info anchor="right" id="Bean Validation" order="10" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21375267" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -554,7 +527,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.41466084" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.17396061" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.06345733" />
       <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" weight="0.32932165" />
@@ -571,7 +544,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.24945295" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.96608317" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.53501093" />
       <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" />
@@ -657,58 +630,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairPayRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="184" column="27" selection-start-line="184" selection-start-column="18" selection-end-line="184" selection-end-column="27" />
-          <folding>
-            <element signature="method#repairPayment#0;class#RepairPayRecordController#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/repairRecordRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/WxUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="383" column="25" selection-start-line="383" selection-start-column="25" selection-end-line="383" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JaxbUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/TongYiReturn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/EndPay.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
@@ -800,13 +721,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="32" column="19" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4439">
@@ -821,16 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21367">
-          <caret line="929" column="58" selection-start-line="929" selection-start-column="36" selection-end-line="929" selection-end-column="58" />
-          <folding>
-            <element signature="e#814#818#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAreaServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="299">
@@ -901,23 +805,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1610">
-          <caret line="86" column="52" selection-start-line="86" selection-start-column="52" selection-end-line="86" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2852">
-          <caret line="168" column="41" selection-start-line="167" selection-start-column="17" selection-end-line="168" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairWorkTypeMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -934,24 +821,24 @@
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairShiftSettingsMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6624">
-          <caret line="330" column="40" selection-start-line="330" selection-start-column="40" selection-end-line="330" selection-end-column="40" />
+        <state relative-caret-position="193">
+          <caret line="211" selection-start-line="211" selection-end-line="211" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.0/poi-4.1.0-sources.jar!/org/apache/poi/ss/usermodel/CellBase.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="33" selection-start-line="33" selection-end-line="33" />
+        <state relative-caret-position="167">
+          <caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1012">
-          <caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+        <state relative-caret-position="897">
+          <caret line="57" column="29" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="29" />
         </state>
       </provider>
     </entry>
@@ -962,10 +849,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="57" column="29" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="29" />
+        <state relative-caret-position="8786">
+          <caret line="428" column="13" selection-start-line="428" selection-start-column="13" selection-end-line="428" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairArticleTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3588">
+          <caret line="181" column="127" selection-start-line="181" selection-start-column="119" selection-end-line="181" selection-end-column="127" />
         </state>
       </provider>
     </entry>
@@ -973,33 +867,120 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
-      <provider selected="true" editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1426">
+          <caret line="62" column="7" selection-start-line="62" selection-start-column="7" selection-end-line="62" selection-end-column="7" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="345">
-          <caret line="15" column="53" selection-start-line="15" selection-start-column="53" selection-end-line="15" selection-end-column="53" />
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="211" selection-start-line="211" selection-end-line="211" />
+        <state relative-caret-position="3841">
+          <caret line="209" column="62" selection-start-line="209" selection-start-column="51" selection-end-line="209" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.0/poi-4.1.0-sources.jar!/org/apache/poi/ss/usermodel/CellBase.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/WxAccessTokenController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
+        <state relative-caret-position="322">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8763">
+          <caret line="417" column="40" selection-start-line="417" selection-start-column="38" selection-end-line="417" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1472">
+          <caret line="64" column="9" selection-start-line="64" selection-start-column="9" selection-end-line="64" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="621">
-          <caret line="428" column="13" selection-start-line="428" selection-start-column="13" selection-end-line="428" selection-end-column="13" />
+          <caret line="35" column="23" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/JWTUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
+          <folding>
+            <element signature="e#2081#2082#0" expanded="true" />
+            <element signature="e#2111#2112#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtAuthenticationInterceptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="33" selection-start-line="33" selection-end-line="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/common/result/ResponseStatusEnum.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1380">
+          <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/core/JwtlnterceptorConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/AddResponseHeaderFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairAreaVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="569">
+          <caret line="3078" column="76" selection-start-line="3078" selection-start-column="66" selection-end-line="3078" selection-end-column="76" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="526">
+          <caret line="1087" column="73" selection-start-line="1087" selection-start-column="73" selection-end-line="1087" selection-end-column="73" />
+          <folding>
+            <element signature="e#814#818#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/com/repair/config/AddResponseHeaderFilter.java

@@ -0,0 +1,25 @@
+package com.repair.config;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @Author: binguo
+ * @Date: 2024/7/17 星期三 14:03
+ * @Description: com.repair.config
+ * @Version: 1.0
+ */
+@Component
+public class AddResponseHeaderFilter extends OncePerRequestFilter {
+    protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        httpServletResponse.addHeader("X-Content-Type-Options", "nosniff");
+        filterChain.doFilter(httpServletRequest, httpServletResponse);
+    }
+}

src/main/resources/mapper/repair/RepairRecordMapper.xml

@@ -998,16 +998,8 @@
         FROM (SELECT count(rr.area_id)   AS orders_total,
                      rs.`name`           AS school_name,
                      rr.area_id          AS area_name,
-                     (SELECT COUNT(area_id)
-                      FROM `repair_record`
-                      WHERE price > 0
-                        AND rr.area_id = area_id
-                        AND deleted = 0) AS orders_compensation,
-                     (SELECT COUNT(area_id)
-                      FROM `repair_record`
-                      WHERE (price IS NULL OR price = 0)
-                        AND rr.area_id = area_id
-                        AND deleted = 0) AS orders_gratis,
+                     SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+                     SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
                      SUM(rr.price)       AS total_price
               FROM `repair_record` rr
                        LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1021,28 +1013,8 @@
         FROM (SELECT count(rr.area_id) AS orders_total,
         rs.`name` AS school_name,
         rr.area_id AS area_name,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND price > 0
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND (price IS NULL OR price = 0)
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1050,7 +1022,7 @@
         <where>
             AND rr.deleted=0
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         GROUP BY rr.area_id) ra
@@ -1060,16 +1032,8 @@
         FROM (SELECT rat.`name`           AS article_name,
                      rat.school_id as school_id,
                      count(rr.article_id) AS orders_total,
-                     (SELECT COUNT(article_id)
-                      FROM `repair_record`
-                      WHERE price > 0
-                        AND rr.article_id = article_id
-                        AND deleted = 0)  AS orders_compensation,
-                     (SELECT COUNT(article_id)
-                      FROM `repair_record`
-                      WHERE (price IS NULL OR price = 0)
-                        AND rr.article_id = article_id
-                        AND deleted = 0)  AS orders_gratis,
+                     SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+                     SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
                      SUM(rr.price)        AS total_price
               FROM `repair_record` rr
                        LEFT JOIN repair_article_type rat ON rr.article_id = rat.id
@@ -1082,26 +1046,8 @@
         FROM (SELECT rat.`name` AS article_name,
         rat.school_id as school_id,
         count(rr.article_id) AS orders_total,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and price > 0 AND rr.article_id = article_id AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and (price IS NULL OR price = 0)
-            AND rr.article_id = article_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_article_type rat ON rr.article_id = rat.id
@@ -1118,28 +1064,8 @@
         FROM (SELECT count(rr.area_id) AS orders_total,
         rs.`name` AS school_name,
         rr.area_id AS area_name,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND price > 0
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND (price IS NULL OR price = 0)
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1158,26 +1084,8 @@
         FROM (SELECT rat.`name` AS article_name,
         rat.school_id as school_id,
         count(rr.article_id) AS orders_total,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and price > 0 AND rr.article_id = article_id AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and (price IS NULL OR price = 0)
-            AND rr.article_id = article_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_article_type rat ON rat.deleted = 0

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -998,16 +998,8 @@
         FROM (SELECT count(rr.area_id)   AS orders_total,
                      rs.`name`           AS school_name,
                      rr.area_id          AS area_name,
-                     (SELECT COUNT(area_id)
-                      FROM `repair_record`
-                      WHERE price > 0
-                        AND rr.area_id = area_id
-                        AND deleted = 0) AS orders_compensation,
-                     (SELECT COUNT(area_id)
-                      FROM `repair_record`
-                      WHERE (price IS NULL OR price = 0)
-                        AND rr.area_id = area_id
-                        AND deleted = 0) AS orders_gratis,
+                     SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+                     SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
                      SUM(rr.price)       AS total_price
               FROM `repair_record` rr
                        LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1021,28 +1013,8 @@
         FROM (SELECT count(rr.area_id) AS orders_total,
         rs.`name` AS school_name,
         rr.area_id AS area_name,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND price > 0
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND (price IS NULL OR price = 0)
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1050,7 +1022,7 @@
         <where>
             AND rr.deleted=0
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
+                and rr.report_time between #{startTime} and #{endTime}
             </if>
         </where>
         GROUP BY rr.area_id) ra
@@ -1060,16 +1032,8 @@
         FROM (SELECT rat.`name`           AS article_name,
                      rat.school_id as school_id,
                      count(rr.article_id) AS orders_total,
-                     (SELECT COUNT(article_id)
-                      FROM `repair_record`
-                      WHERE price > 0
-                        AND rr.article_id = article_id
-                        AND deleted = 0)  AS orders_compensation,
-                     (SELECT COUNT(article_id)
-                      FROM `repair_record`
-                      WHERE (price IS NULL OR price = 0)
-                        AND rr.article_id = article_id
-                        AND deleted = 0)  AS orders_gratis,
+                     SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+                     SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
                      SUM(rr.price)        AS total_price
               FROM `repair_record` rr
                        LEFT JOIN repair_article_type rat ON rr.article_id = rat.id
@@ -1082,26 +1046,8 @@
         FROM (SELECT rat.`name` AS article_name,
         rat.school_id as school_id,
         count(rr.article_id) AS orders_total,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and price > 0 AND rr.article_id = article_id AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and (price IS NULL OR price = 0)
-            AND rr.article_id = article_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_article_type rat ON rr.article_id = rat.id
@@ -1118,28 +1064,8 @@
         FROM (SELECT count(rr.area_id) AS orders_total,
         rs.`name` AS school_name,
         rr.area_id AS area_name,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND price > 0
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(area_id)
-        FROM `repair_record`
-        <where>
-            AND (price IS NULL OR price = 0)
-            AND rr.area_id = area_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_school rs ON rs.deleted = 0
@@ -1158,26 +1084,8 @@
         FROM (SELECT rat.`name` AS article_name,
         rat.school_id as school_id,
         count(rr.article_id) AS orders_total,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and price > 0 AND rr.article_id = article_id AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_compensation,
-        (SELECT COUNT(article_id)
-        FROM `repair_record`
-        <where>
-            and (price IS NULL OR price = 0)
-            AND rr.article_id = article_id
-            AND deleted = 0
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and report_time between #{startTime} and #{endTime}
-            </if>
-        </where>
-        ) AS orders_gratis,
+        SUM(case when rr.price > 0 then 1 else 0 end) AS orders_compensation,
+        SUM(case when rr.price IS NULL OR rr.price = 0 then 1 else 0 end) AS orders_gratis,
         SUM(rr.price) AS total_price
         FROM `repair_record` rr
         LEFT JOIN repair_article_type rat ON rat.deleted = 0

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -9,6 +9,7 @@ com\repair\api\RepairTransferRecordControllerAPI.class
 com\repair\model\vo\MaintenanceTechnicianVo.class
 com\repair\MybatisPlusApplication.class
 com\repair\model\pojo\RepairCollaborateRecord.class
+com\repair\config\AddResponseHeaderFilter.class
 com\repair\services\RepairConsumeService.class
 com\repair\api\RepairArticleTypeControllerAPI.class
 com\repair\model\vo\ConsumableExcelVo.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -227,6 +227,7 @@ D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repa
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\cooperationOrdersRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\updateArticleDetailRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\collaborateApplyRequest.java
+D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\config\AddResponseHeaderFilter.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\controller\RepairDispatchRecordController.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\model\request\MaintenanceConsumeablesRequest.java
 D:\Bingo\Desktop\工作内容\报修系统\repair_backend\src\main\java\com\repair\mapper\RepairCloseMapper.java