Browse Source

消息中心

夏文涛 2 years ago
parent
commit
1fb460a456

+ 155 - 117
.idea/workspace.xml

@@ -2,8 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -36,19 +42,55 @@
   <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/services/impl/RepairAdminServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="76" column="73" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="73" />
+            <state relative-caret-position="89">
+              <caret line="209" column="66" selection-start-line="209" selection-start-column="11" selection-end-line="209" selection-end-column="66" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="94" column="38" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="369">
+              <caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/aop/LoginCheckAspect.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="277">
+              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="913">
-              <caret line="96" column="73" selection-start-line="96" selection-start-column="73" selection-end-line="96" selection-end-column="73" />
+            <state relative-caret-position="161">
+              <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+            </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="3743">
+              <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
             </state>
           </provider>
         </entry>
@@ -65,10 +107,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>金额不一致</find>
-      <find>setScale</find>
-      <find>周一</find>
-      <find>eWeekStatu</find>
       <find>nonceStr</find>
       <find>strToDate</find>
       <find>.isP</find>
@@ -95,6 +133,10 @@
       <find>head</find>
       <find>insertRepairAdmin</find>
       <find>updateRepairAdmin</find>
+      <find>一键</find>
+      <find>readAllManageMessage</find>
+      <find>querySystemMessagePage</find>
+      <find>queryMessageUnreadCount</find>
     </findStrings>
     <replaceStrings>
       <replace>repairConsumables</replace>
@@ -135,13 +177,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/finishOrderRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairRefundRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRefundRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSchoolController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairShiftSettingsController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTrackRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairTransferRecordControllerAPI.java" />
@@ -186,6 +225,9 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java" />
       </list>
     </option>
   </component>
@@ -217,7 +259,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="958" />
     <option name="height" value="1039" />
@@ -657,12 +699,12 @@
       <workItem from="1695273589677" duration="7033000" />
       <workItem from="1695342790191" duration="1226000" />
       <workItem from="1695621473813" duration="357000" />
-      <workItem from="1695628762126" duration="3945000" />
+      <workItem from="1695628762126" duration="6334000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1098226000" />
+    <option name="totallyTimeSpent" value="1100615000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -674,7 +716,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Designer" order="0" />
@@ -686,10 +728,10 @@
       <window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
       <window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
-      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.34135666" />
+      <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.18603411" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.5348066" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.4354486" />
       <window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.1487965" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
@@ -706,7 +748,7 @@
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="2" weight="0.7253829" />
+      <window_info anchor="right" id="Maven" order="2" weight="0.82196164" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.32889125" />
@@ -859,87 +901,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairManageCountVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-23">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="103" column="23" selection-start-line="103" selection-start-column="23" selection-end-line="103" selection-end-column="23" />
-        </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="437">
-          <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PayResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/ClassSettingDateVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <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="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/time/LocalDate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="1345" column="21" selection-start-line="1345" selection-start-column="21" selection-end-line="1345" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eWeekStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="8" column="22" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="56350">
-          <caret line="2510" column="22" selection-start-line="2510" selection-start-column="22" selection-end-line="2510" selection-end-column="22" />
-          <folding>
-            <element signature="e#106317#106318#0" expanded="true" />
-            <element signature="e#106377#106378#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eDispatchResult.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
-        </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="368">
-          <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.3/spring-core-5.3.3.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2024">
@@ -1115,13 +1076,6 @@
         </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="161">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairTransferRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="322">
@@ -1181,13 +1135,6 @@
         </state>
       </provider>
     </entry>
-    <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="1074">
-          <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
-        </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="407">
@@ -1212,6 +1159,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemSetting.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="11">
+          <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$/src/main/java/com/repair/model/pojo/RepairShiftSettings.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <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$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="338">
@@ -1226,6 +1187,83 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairSystemMessages.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <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$/src/main/java/com/repair/api/RepairTrackRecordControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemSettingControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="23" column="74" selection-start-line="23" selection-start-column="74" selection-end-line="23" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/SystemMessagePageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="35" column="27" lean-forward="true" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <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="3743">
+          <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
+        </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="161">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/aop/LoginCheckAspect.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="277">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairSystemMessagesMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="7" column="52" lean-forward="true" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairSystemMessagesServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="94" column="38" selection-start-line="94" selection-start-column="15" selection-end-line="94" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairSystemMessagesController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="89">
+          <caret line="209" column="66" selection-start-line="209" selection-start-column="11" selection-end-line="209" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="369">
+          <caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 4 - 0
src/main/java/com/repair/api/RepairSystemMessagesControllerAPI.java

@@ -47,4 +47,8 @@ public interface RepairSystemMessagesControllerAPI {
     @GetMapping(value = "/queryMessageUnreadCount")
     @ApiOperation(value = "获取未读数量", notes = "获取未读数量", httpMethod = "GET")
     CommonResult queryMessageUnreadCount(int userId);
+
+    @GetMapping(value = "/queryPCMessageUnreadCount")
+    @ApiOperation(value = "获取管理端未读数量", notes = "获取管理端未读数量", httpMethod = "GET")
+    CommonResult queryPCMessageUnreadCount(@RequestHeader("user_head") String userhead);
 }

+ 28 - 0
src/main/java/com/repair/controller/RepairSystemMessagesController.java

@@ -200,5 +200,33 @@ public class RepairSystemMessagesController implements RepairSystemMessagesContr
 
         return CommonResult.ok();
     }
+
+    /**
+     * 管理端未读数据查询
+     * @param userhead 请求头
+     * @return
+     */
+    @Override
+    public CommonResult queryPCMessageUnreadCount(String userhead) {
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if (operateData == null) {
+            return CommonResult.fail("操作人信息不合法,无法进行已读操作!");
+        }
+
+        //发送人
+        Integer userId = 0;//超级管理员用ID为0
+        if (!operateData.getIsSuper().equals(eIsSuper.Super.getValue())) {
+            RepairUser user = repairUserService.getRepairByCardNumber(operateData.getCardNumber());
+            if (user == null) {
+                return CommonResult.fail("管理端账号未与移动端账号绑定,无法进行已读操作!");
+            }
+            userId = user.getId();
+        }
+        int result = repairSystemMessagesService.queryMessageUnreadCount(userId);
+        UnreadMessageCountVo data = new UnreadMessageCountVo();
+        data.setCount(result);
+        return CommonResult.ok(data);
+    }
 }
 

+ 7 - 2
src/main/java/com/repair/model/pojo/RepairSystemSetting.java

@@ -36,10 +36,15 @@ public class RepairSystemSetting implements Serializable {
     @NotNull(message = "自动好评时间设置不能为空")
     private Integer hour;
 
-    @ApiModelProperty(value = "紧急电话")
-    @NotBlank(message = "紧急电话不能为空")
+    @ApiModelProperty(value = "黄家湖紧急电话")
+    @NotBlank(message = "黄家湖紧急电话不能为空")
     private String emergencyCall;
 
+    @ApiModelProperty(value = "墨轩湖紧急电话")
+    @NotBlank(message = "墨轩湖紧急电话不能为空")
+    private String emergencyMxh;
+
+
     @ApiModelProperty(value = "服务监督电话")
     @NotBlank(message = "服务监督电话不能为空")
     private String servicePhone;

BIN
target/repair_system-0.0.1-SNAPSHOT.jar.original