添加账号功能

.idea/workspace.xml

@@ -2,13 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/RepairAdminControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/RepairAdminControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/SmsCodeControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/SmsCodeControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/SystemMenuControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/SystemMenuControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsExceptionHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsExceptionHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/ResponseStatusEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/LoginRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/loginRequest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -24,46 +27,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/template/MybatisPlusApplication.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+            <state relative-caret-position="391">
+              <caret line="41" column="52" selection-start-line="41" selection-start-column="52" selection-end-line="41" selection-end-column="52" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/result/CommonResult.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+            <state relative-caret-position="-2092">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/result/BaseResult.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+            <state relative-caret-position="345">
+              <caret line="69" column="14" lean-forward="true" selection-start-line="69" selection-start-column="14" selection-end-line="69" selection-end-column="14" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/result/PageUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="17" column="30" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="30" />
+            <state relative-caret-position="-161">
+              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+            <state relative-caret-position="211">
+              <caret line="86" column="12" selection-start-line="86" selection-start-column="12" selection-end-line="86" selection-end-column="12" />
             </state>
           </provider>
         </entry>
@@ -72,16 +84,46 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="276">
-              <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+              <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="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="22" column="3" lean-forward="true" selection-start-line="22" selection-start-column="3" selection-end-line="22" selection-end-column="3" />
+            <state relative-caret-position="46">
+              <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/loginRequest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="92">
+              <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="358">
+              <caret line="33" column="162" selection-start-line="33" selection-start-column="162" selection-end-line="33" selection-end-column="162" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -118,6 +160,7 @@
       <find>getResource</find>
       <find>getRepairByAccount</find>
       <find>@Ma</find>
+      <find>更新</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -143,11 +186,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/RepairAdminMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SystemMenuService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/result/ResponseStatusEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/utils/paramUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/LoginRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/utils/JWTUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/result/CommonResult.java" />
@@ -165,14 +205,17 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmsCodeControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eStatu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/LoginRequest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eStatu.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
       </list>
     </option>
   </component>
@@ -204,8 +247,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="953" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -256,6 +299,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="annotation" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Back-endDevelopmentFramework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="aop" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -378,6 +430,16 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="request" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Back-endDevelopmentFramework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
               <item name="result" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -424,6 +486,27 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Back-endDevelopmentFramework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Back-endDevelopmentFramework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Back-endDevelopmentFramework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -438,7 +521,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$/../../视频系统/videoShare" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="File.Encoding" />
@@ -518,12 +601,12 @@
       <workItem from="1688610829222" duration="217000" />
       <workItem from="1688611334908" duration="804000" />
       <workItem from="1688612583930" duration="14000" />
-      <workItem from="1688623572162" duration="2897000" />
+      <workItem from="1688623572162" duration="6039000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33192000" />
+    <option name="totallyTimeSpent" value="36334000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -535,10 +618,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="953" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17590618" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.36105034" />
       <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" />
@@ -558,7 +641,7 @@
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.33369803" />
+      <window_info anchor="bottom" id="Messages" order="11" visible="true" weight="0.33701658" />
       <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" />
@@ -642,44 +725,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/RSAUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <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/java/com/template/common/utils/paramUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="782">
-          <caret line="45" column="34" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/EncryptionUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.0.5/mybatis-plus-generator-3.0.5.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.0.5/mybatis-plus-generator-3.0.5.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1242">
@@ -795,13 +840,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="943">
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ExcelController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -830,13 +868,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LogInfoController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -851,13 +882,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/auto/controller/RepairAdminController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="345">
@@ -865,13 +889,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LogInfoControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -879,33 +896,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="22" column="103" lean-forward="true" selection-start-line="22" selection-start-column="75" selection-end-line="22" selection-end-column="103" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="26" column="45" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1643">
-          <caret line="91" column="43" selection-start-line="91" selection-start-column="43" selection-end-line="91" selection-end-column="43" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/auto/mapper/xml/RepairAdminMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -937,13 +927,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/result/CommonResult.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -993,17 +976,120 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/template/MybatisPlusApplicationTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="23">
+          <caret line="75" column="78" selection-start-line="75" selection-start-column="78" selection-end-line="75" selection-end-column="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/template/WrapperTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1071">
+          <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="358">
+          <caret line="33" column="162" selection-start-line="33" selection-start-column="162" selection-end-line="33" selection-end-column="162" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/loginRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2092">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="41" column="52" selection-start-line="41" selection-start-column="52" selection-end-line="41" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="69" column="14" lean-forward="true" selection-start-line="69" selection-start-column="14" selection-end-line="69" selection-end-column="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/result/PageUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-161">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
-          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
+          <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/template/services/impl/RepairAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="22" column="3" lean-forward="true" selection-start-line="22" selection-start-column="3" selection-end-line="22" selection-end-column="3" />
+        <state relative-caret-position="211">
+          <caret line="86" column="12" selection-start-line="86" selection-start-column="12" selection-end-line="86" selection-end-column="12" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/api/LoginControllerAPI.java

@@ -1,15 +1,13 @@
 package com.template.api;
 
 import com.template.model.pojo.RepairAdmin;
-import com.template.model.request.LoginRequest;
+import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -18,12 +16,19 @@ import javax.validation.Valid;
 @Api(tags = {"LoginController"}, value = "登录")
 public interface LoginControllerAPI {
 
+    @GetMapping(value = "/queryReduce")
+    @ApiOperation(value = "查看系统版本", notes = "查看系统版本", httpMethod = "GET")
+    CommonResult queryReduce();
+
     @PostMapping(value = "/Register")
     @ApiOperation(value = "注册", notes = "注册", httpMethod = "POST")
     CommonResult Register(@Validated @RequestBody RepairAdmin loginRequest, BindingResult bindingResult);
 
     @PostMapping(value = "/Login")
     @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST")
-    CommonResult Login(@Validated @RequestBody LoginRequest lr, BindingResult bindingResult);
+    CommonResult Login(@Validated @RequestBody loginRequest lr, BindingResult bindingResult);
 
+    @PostMapping(value = "/ChangePassword")
+    @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST")
+    CommonResult ChangePassword(@Validated @RequestBody com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult);
 }

src/main/java/com/template/api/RepairAdminControllerAPI.java

@@ -5,13 +5,31 @@ import com.template.model.pojo.SystemMenu;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/api/repairAdmin")
 @Api(tags = {"RepairAdminController"}, value = "账号")
 public interface RepairAdminControllerAPI {
-    @PostMapping(value = "/InsertRepairAdmin")
-    @ApiOperation(value = "新增账号", notes = "新增账号数据", httpMethod = "POST")
-    CommonResult InsertRepairAdmin(@RequestBody RepairAdmin repairAdmin);
 
+    @PostMapping(value = "/insertRepairAdmin")
+    @ApiOperation(value = "添加账号", notes = "添加账号数据", httpMethod = "POST")
+    CommonResult InsertRepairAdmin(@Validated @RequestBody RepairAdmin repairAdmin, BindingResult bindingResult);
+
+    @GetMapping(value = "/queryPageRepairAdmins")
+    @ApiOperation(value = "账号分页数据", notes = "账号分页数据", httpMethod = "POST")
+    CommonResult queryPageRepairAdmins(@RequestParam int currentPage, @RequestParam int pageCount, String account, String phone, String userName);
+
+    @PostMapping(value = "/freezeRepairAdminById")
+    @ApiOperation(value = "根据ID冻结指定账号", notes = "根据ID冻结指定账户", httpMethod = "POST")
+    CommonResult freezeRepairAdminById(@Validated @RequestBody com.repair.model.request.freezeRepairAdminRequest frar, BindingResult bindingResult);
+
+    @GetMapping(value = "/deleteRepairAdminById")
+    @ApiOperation(value = "根据ID删除指定账号", notes = "根据ID删除指定账号", httpMethod = "POST")
+    CommonResult deleteRepairAdminById(@RequestParam String id);
+
+    @PostMapping(value = "/updateRepairAdminById")
+    @ApiOperation(value = "编辑账号数据", notes = "编辑账号数据", httpMethod = "POST")
+    CommonResult updateRepairAdminById(@Validated @RequestBody com.repair.model.request.updateRepairAdminRequest ra, @RequestHeader("user_head") String userhead, BindingResult bindingResult);
 }

src/main/java/com/template/common/exception/EmsExceptionHandler.java

@@ -6,7 +6,9 @@ import com.template.model.result.CommonResult;
 import org.mybatis.spring.MyBatisSystemException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -19,7 +21,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 统一异常拦截处理
@@ -31,6 +36,24 @@ public class EmsExceptionHandler {
     //org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'GET' not supported
     final static Logger logger=LoggerFactory.getLogger(EmsExceptionHandler.class);
 
+    //处理Get请求中 使用@Valid 验证路径中请求实体校验失败后抛出的异常
+    @ExceptionHandler(BindException.class)
+    @ResponseBody
+    public CommonResult BindExceptionHandler(BindException e) {
+        String message = e.getBindingResult().getAllErrors().stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.joining());
+        logger.error("错误信息",message);
+        return CommonResult.resultValue(ResponseStatusEnum.SYSTEM_NULL_POINTER);
+    }
+
+    //处理请求参数格式错误 @RequestParam上validate失败后抛出的异常是javax.validation.ConstraintViolationException
+    @ExceptionHandler(ConstraintViolationException.class)
+    @ResponseBody
+    public CommonResult ConstraintViolationExceptionHandler(ConstraintViolationException e) {
+        String message = e.getConstraintViolations().stream().map(ConstraintViolation::getMessage).collect(Collectors.joining());
+        logger.error("错误信息",message);
+        return CommonResult.resultValue(ResponseStatusEnum.SYSTEM_NULL_POINTER);
+    }
+
     @ResponseBody
     @ExceptionHandler(NullPointerException.class)
     public CommonResult exception(NullPointerException e) {
@@ -77,7 +100,7 @@ public class EmsExceptionHandler {
         logger.error("错误信息",e.fillInStackTrace());
 
         //String error=e.getFieldError().getDefaultMessage();
-        return CommonResult.errorMsg(name+"不能为空");
+        return CommonResult.fail(name+"不能为空");
     }
 
     @ExceptionHandler(MyCustomException.class)
@@ -141,7 +164,7 @@ public class EmsExceptionHandler {
         logger.error("错误信息",e.fillInStackTrace());
         BindingResult result = e.getBindingResult();
         Map<String, String> map = getErrors(result);
-        return CommonResult.errorMap(map);
+        return CommonResult.fail(map.values().toString().replace("[","").replace("]",""));
     }
 
     /**

src/main/java/com/template/common/result/ResponseStatusEnum.java

@@ -7,13 +7,13 @@ package com.template.common.result;
  */
 public enum ResponseStatusEnum implements Code{
 
-    EXISTS(999,false,"已存在"),
+
     SUCCESS(200, true, "操作成功！"),
     NO_PERMISSION(401,false,"没有权限"),
     MISSING_REQUEST_HEADER(499,false,"缺少请求头"),
     FAILED(500, false, "操作失败！"),
     SEND_PARAMS(501,false,"传入参数数据结构错误"),
-    SEND_PARAMS_TYPE(502,false,"传入参数数据数据类型错误"),
+    SEND_PARAMS_TYPE(502,false,"传入参数数据类型错误"),
     UN_SERVICES_ERROR(505,false,"操作失败，请联系管理员"),
 
     // 自定义系统级别异常 54x
@@ -36,7 +36,9 @@ public enum ResponseStatusEnum implements Code{
     SYSTEM_PHONE_ERROR(556,false,"手机号格式错误"),
     SYSTEM_SEND_PHONE_ERROR(557,false,"发送验证码失败"),
     SYSTEM_TOKEN_ERROR(558,false,"token为空"),
-    SYSTEM_LOGIN_ERROR(559,false,"无效token");
+    SYSTEM_LOGIN_ERROR(559,false,"无效token"),
+    PARAM_ERROR(560, false, "参数不能为空！"),
+    EXISTS(999,false,"已存在");
 
     // 响应业务状态
     private Integer status;

src/main/java/com/template/controller/LoginController.java

@@ -4,7 +4,7 @@ import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.RepairAdmin;
-import com.template.model.request.LoginRequest;
+import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.LoginVO;
 import com.template.services.RepairAdminService;
@@ -14,6 +14,7 @@ import com.template.common.utils.JWTUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -29,6 +30,16 @@ public class LoginController implements LoginControllerAPI {
     private RepairAdminService repairAdminService;
 
     /**
+     * 查看系统版本号
+     * @return
+     */
+    @Override
+    @PassToken
+    public CommonResult queryReduce() {
+        return CommonResult.ok("当前系统版本为：1V");
+    }
+
+    /**
      * 注册接口
      * @param registerdo
      * account 账号
@@ -47,8 +58,6 @@ public class LoginController implements LoginControllerAPI {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
         }
-        registerdo.setStatu(0);
-        registerdo.setPassword(AesUtils.encrypt(registerdo.getPassword()));
         int result = 0;
         try{
             result = repairAdminService.insertRepairAdmin(registerdo);
@@ -74,7 +83,7 @@ public class LoginController implements LoginControllerAPI {
      */
     @Override
     @PassToken
-    public CommonResult Login(@RequestBody LoginRequest loginRequest, BindingResult bindingResult) {
+    public CommonResult Login(@RequestBody loginRequest loginRequest, BindingResult bindingResult) {
         if(loginRequest == null){
             return CommonResult.fail("请传递参数");
         }
@@ -106,4 +115,47 @@ public class LoginController implements LoginControllerAPI {
 
         return CommonResult.ok("登录成功",login);
     }
+
+    /**
+     * 修改密码
+     * @param cpr
+     * oldPassword 旧密码
+     * newPassword 新密码
+     * confirmPassword 确认密码
+     * @param userhead
+     * @param bindingResult
+     * @return
+     */
+    @Override
+    public CommonResult ChangePassword(com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        if(!cpr.getNewPassword().equals(cpr.getConfirmPassword())){
+            return CommonResult.fail("确认密码和新密码不一致！");
+        }
+
+        String userID = AesUtils.decrypt(userhead);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        if(operateData == null){
+            return CommonResult.fail("当前账号不合法！");
+        }
+
+        if(operateData.getStatu() == eStatu.Freeze.getValue()){
+            return CommonResult.fail("该账号已被冻结");
+        }
+
+        if(!AesUtils.encrypt(cpr.getOldPassword()).equals(operateData.getPassword())){
+            return CommonResult.fail("原密码错误！");
+        }
+
+        RepairAdmin ra = new RepairAdmin();
+        ra.setId(userID);
+        ra.setPassword(AesUtils.encrypt(cpr.getNewPassword()));
+        int result = repairAdminService.updateRepairAdmin(ra);
+
+        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
+    }
 }

src/main/java/com/template/controller/RepairAdminController.java

@@ -1,19 +1,18 @@
 package com.template.controller;
 
 
-import com.template.annotation.PassToken;
-import com.template.api.LogInfoControllerAPI;
 import com.template.api.RepairAdminControllerAPI;
+import com.template.common.utils.AesUtils;
+import com.template.common.utils.paramUtils;
+import com.template.model.enumModel.eIsSuper;
+import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.RepairAdmin;
-import com.template.model.pojo.SystemMenu;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
 import com.template.services.RepairAdminService;
-import com.template.services.SystemMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -29,11 +28,136 @@ public class RepairAdminController implements RepairAdminControllerAPI {
     @Autowired
     private RepairAdminService repairAdminService;
 
+    /**
+     * 添加账号数据
+     *
+     * @param ra account 账号
+     *           password 密码
+     *           username 用户名称
+     *           phone 手机号
+     * @return
+     */
     @Override
-    @PassToken
-    public CommonResult InsertRepairAdmin(@RequestBody RepairAdmin ra){
-        int result = repairAdminService.insertRepairAdmin(ra); // 帮我们自动生成id
+    public CommonResult InsertRepairAdmin(@RequestBody RepairAdmin ra, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+        int result = 0; // 帮我们自动生成id
+        try {
+            result = repairAdminService.insertRepairAdmin(ra);
+        } catch (Exception e) {
+            if (e.getCause().getMessage().contains("'repair_admin.account_un'")) {
+                return CommonResult.fail("该账号已存在！");
+            }
+            return CommonResult.fail("系统异常，添加失败！");
+        }
         return result > 0 ? CommonResult.ok() : CommonResult.fail();
     }
+
+    /**
+     * 查询账户列表数据
+     *
+     * @param currentPage 当前页
+     * @param pageCount   一页数据条数
+     * @param account     账号
+     * @param phone       手机号
+     * @param userName    账号名称
+     * @return
+     */
+    @Override
+    public CommonResult queryPageRepairAdmins(@RequestParam int currentPage, @RequestParam int pageCount, String account, String phone, String userName) {
+        PageUtils<RepairAdmin> result = repairAdminService.queryPageList(currentPage, pageCount, account, phone, userName);
+
+        return CommonResult.ok(result);
+    }
+
+    /**
+     * 根据ID冻结账号账号数据
+     *
+     * @param frar id 数据ID
+     *             statu 状态
+     *             正常：0；冻结：1
+     * @return
+     */
+    @Override
+    public CommonResult freezeRepairAdminById(@RequestBody com.repair.model.request.freezeRepairAdminRequest frar, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+        RepairAdmin data = repairAdminService.getRepairById(frar.getId());
+        if (data == null) {
+            return CommonResult.fail("当前数据不存在，解冻失败！");
+        }
+        if (data.getStatu() == frar.getStatu()) {
+            String Message = frar.getStatu() == eStatu.Freeze.getValue() ? "当前处于冻结状态，请勿重复操作！" : "当前处于未冻结状态，请勿重复操作！";
+            return CommonResult.fail(Message);
+        }
+
+        String success = frar.getStatu() == eStatu.Freeze.getValue() ? "冻结成功！" : "解冻成功";
+        String fail = frar.getStatu() == eStatu.Freeze.getValue() ? "冻结失败！" : "解冻失败";
+        RepairAdmin ra = new RepairAdmin();
+        ra.setId(frar.getId());
+        ra.setStatu(frar.getStatu());
+        int result = repairAdminService.updateRepairAdmin(ra);
+        System.out.println(result);
+        return result > 0 ? CommonResult.ok(success) : CommonResult.fail(fail);
+    }
+
+    /**
+     * 根据ID删除账号数据
+     *
+     * @param id id 数据ID
+     * @return
+     */
+    @Override
+    public CommonResult deleteRepairAdminById(@RequestParam String id) {
+        RepairAdmin data = repairAdminService.getRepairById(id);
+        if (data == null) {
+            return CommonResult.fail("当前数据不存在，删除失败！");
+        }
+
+        int result = repairAdminService.deleteRepairAdminById(id);
+
+        return result > 0 ? CommonResult.ok() : CommonResult.fail();
+    }
+
+    /**
+     * 编辑账号
+     *
+     * @param ra id 数据ID
+     *           username 账号名称
+     *           phone 手机号
+     *           password 密码
+     * @return
+     */
+    @Override
+    public CommonResult updateRepairAdminById(com.repair.model.request.updateRepairAdminRequest ra, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        RepairAdmin data = repairAdminService.getRepairById(ra.getId());
+        if (data == null) {
+            return CommonResult.fail("当前数据不存在，编辑失败！");
+        }
+
+        //只有操作管理员才能编辑他人的密码
+        String userID = AesUtils.decrypt(userhead);
+        if (ra.getPassword() != null && !userID.equals(ra.getId())) {
+            RepairAdmin operateData = repairAdminService.getRepairById(userID);
+            if(operateData == null){
+                return CommonResult.fail("操作身份不合法，编辑失败！");
+            }
+            if(!data.getPassword().equals(AesUtils.encrypt(ra.getPassword())) && operateData.getIsSuper() != eIsSuper.Super.getValue()){
+                return CommonResult.fail("只有超级管理员才能更改密码！");
+            }
+        }
+
+        int result = repairAdminService.updateRepaiRadmin(ra);
+        return result > 0 ? CommonResult.ok("编辑成功") : CommonResult.fail("编辑失败");
+    }
 }
 

src/main/java/com/template/model/enumModel/eIsSuper.java

@@ -0,0 +1,32 @@
+package com.template.model.enumModel;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/7 星期五 15:14
+ * @Description: com.repair.model.enumModel
+ * @Version: 1.0
+ */
+public enum eIsSuper {
+    NotSuper(0),//非超级管理员
+    Super(1);//超级管理员
+
+    private int value;
+
+    eIsSuper(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eIsSuper valueOf(int value) {
+        switch (value) {
+            case 0:
+                return eIsSuper.NotSuper;
+            case 1:
+                return eIsSuper.Super;
+            default:
+                return null;
+        }
+    }
+}

src/main/java/com/template/model/pojo/RepairAdmin.java

@@ -51,6 +51,9 @@ public class RepairAdmin implements Serializable {
     @NotBlank(message = "手机号不能为空")
     private String phone;
 
+    @ApiModelProperty(value = "是否是超级管理员 正常：0；超级管理员：1")
+    private Integer isSuper;
+
     @ApiModelProperty(value = "状态 正常：0；冻结：1")
     private Integer statu;
 

src/main/java/com/template/model/request/changePasswordRequest.java

@@ -0,0 +1,29 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 修改密码
+ */
+@Data
+public class changePasswordRequest {
+    /**
+     * 原密码
+     */
+    @NotBlank(message = "原密码不能为空")
+    private String oldPassword;
+
+    /**
+     * 新密码
+     */
+    @NotBlank(message = "新密码不能为空")
+    private String newPassword;
+
+    /**
+     * 确认密码
+     */
+    @NotBlank(message = "确认密码不能为空")
+    private String confirmPassword;
+}

src/main/java/com/template/model/request/freezeRepairAdminRequest.java

@@ -0,0 +1,29 @@
+package com.repair.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/7 星期五 10:17
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class freezeRepairAdminRequest {
+    /**
+     * 数据ID
+     */
+    @NotBlank(message = "数据ID不能为空")
+    private String id;
+
+    /**
+     * 状态
+     * 正常：0；冻结：1
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer statu;
+}

src/main/java/com/template/model/request/LoginRequest.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank;
  * 登录请求参数
  */
 @Data
-public class LoginRequest {
+public class loginRequest {
     /**
      * 账号
      */

src/main/java/com/template/model/request/queryAccountPageRequest.java

@@ -0,0 +1,40 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 17:17
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class queryAccountPageRequest {
+
+    /**
+     * 当前页数
+     */
+    private int currentPage = 0;
+
+    /**
+     * 一页数据总条数
+     */
+    private int pageCount = 10;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 账号名称
+     */
+    private String userName;
+}

src/main/java/com/template/model/request/updateRepairAdminRequest.java

@@ -0,0 +1,34 @@
+package com.repair.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/7 星期五 14:27
+ * @Description: com.repair.model.request
+ * @Version: 1.0
+ */
+@Data
+public class updateRepairAdminRequest {
+    /**
+     * 数据ID
+     */
+    @NotBlank(message = "数据ID不能为空")
+    private String id;
+    /**
+     * 账号名称
+     */
+    private String username;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 密码
+     */
+    private String password;
+}

src/main/java/com/template/model/result/PageUtils.java

@@ -0,0 +1,64 @@
+package com.template.model.result;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页工具类
+ * @author Mark sunlightcs@gmail.com
+ */
+@Data
+public class PageUtils<T> implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 总记录数
+	 */
+	private int totalCount;
+	/**
+	 * 每页记录数
+	 */
+	private int pageSize;
+	/**
+	 * 总页数
+	 */
+	private int totalPage;
+	/**
+	 * 当前页数
+	 */
+	private int currPage;
+	/**
+	 * 列表数据
+	 */
+	private List<T> list;
+
+	/**
+	 * 分页
+	 * @param list        列表数据
+	 * @param totalCount  总记录数
+	 * @param pageSize    每页记录数
+	 * @param currPage    当前页数
+	 */
+	public PageUtils(List<T> list, int totalCount, int pageSize, int currPage) {
+		this.list = list;
+		this.totalCount = totalCount;
+		this.pageSize = pageSize;
+		this.currPage = currPage;
+		this.totalPage = (int)Math.ceil((double)totalCount/pageSize);
+	}
+
+	/**
+	 * 分页
+	 */
+	public PageUtils(IPage<T> page) {
+		this.list = page.getRecords();
+		this.totalCount = (int)page.getTotal();
+		this.pageSize = (int)page.getSize();
+		this.currPage = (int)page.getCurrent();
+		this.totalPage = (int)page.getPages();
+	}
+
+}

src/main/java/com/template/services/RepairAdminService.java

@@ -3,6 +3,7 @@ package com.template.services;
 import com.template.model.pojo.RepairAdmin;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
 
 /**
  * <p>
@@ -14,6 +15,16 @@ import com.template.model.result.CommonResult;
  */
 public interface RepairAdminService extends IService<RepairAdmin> {
     int insertRepairAdmin(RepairAdmin ra);
-    int deleteRepairAdmin();
+
+    int deleteRepairAdminById(String id);
+
     RepairAdmin getRepairByAccount(String Account);
+
+    PageUtils<RepairAdmin> queryPageList(int currentPage, int pageCount, String account, String phone, String userName);
+
+    RepairAdmin getRepairById(String id);
+
+    int updateRepaiRadmin(com.repair.model.request.updateRepairAdminRequest urar);
+
+    int updateRepairAdmin(RepairAdmin ra);
 }

src/main/java/com/template/services/impl/RepairAdminServiceImpl.java

@@ -1,14 +1,19 @@
 package com.template.services.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.template.common.utils.AesUtils;
 import com.template.model.pojo.RepairAdmin;
 import com.template.mapper.RepairAdminMapper;
 import com.template.model.pojo.SystemMenu;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
 import com.template.services.RepairAdminService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -29,13 +34,16 @@ public class RepairAdminServiceImpl extends ServiceImpl<RepairAdminMapper, Repai
 
     @Override
     public int insertRepairAdmin(RepairAdmin ra) {
+        ra.setIsSuper(0);
+        ra.setStatu(0);
+        ra.setPassword(AesUtils.encrypt(ra.getPassword()));//加密密码
         int result = repairAdminMapper.insert(ra);
         return result;
     }
 
     @Override
-    public int deleteRepairAdmin() {
-        int result = repairAdminMapper.deleteById("b4acf4dae4484ccfb15b8d6666beb144");
+    public int deleteRepairAdminById(String id) {
+        int result = repairAdminMapper.deleteById(id);
         return result;
     }
 
@@ -46,4 +54,42 @@ public class RepairAdminServiceImpl extends ServiceImpl<RepairAdminMapper, Repai
         RepairAdmin result = repairAdminMapper.selectOne(queryWrapper);
         return result;
     }
+
+    @Override
+    public RepairAdmin getRepairById(String id) {
+        RepairAdmin result = repairAdminMapper.selectById(id);
+        return result;
+    }
+
+    @Override
+    public int updateRepaiRadmin(com.repair.model.request.updateRepairAdminRequest urar) {
+        //只更改有值的字段
+        RepairAdmin ra = new RepairAdmin();
+        ra.setId(urar.getId());
+        //超级管理员用户才能更改密码
+        if(urar.getPassword() != null){
+            urar.setPassword(AesUtils.encrypt(urar.getPassword()));//加密密码
+        }
+        ra.setUsername(urar.getUsername());
+        ra.setPhone(urar.getPhone());
+        int result = repairAdminMapper.updateById(ra);
+        return result;
+    }
+
+    @Override
+    public int updateRepairAdmin(RepairAdmin ra) {
+        int result = repairAdminMapper.updateById(ra);
+        return result;
+    }
+
+    @Override
+    public PageUtils<RepairAdmin> queryPageList(int currentPage, int pageCount, String account, String phone, String userName) {
+        Page<RepairAdmin> page = new Page<>(currentPage, pageCount);
+        QueryWrapper<RepairAdmin> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.hasText(account), "account", account);
+        queryWrapper.like(StringUtils.hasText(phone), "phone", phone);
+        queryWrapper.like(StringUtils.hasText(userName), "username", userName);
+        IPage<RepairAdmin> result = repairAdminMapper.selectPage(page, queryWrapper);
+        return new PageUtils(result);
+    }
 }

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

@@ -12,10 +12,10 @@ com\template\annotation\PassToken.class
 com\template\controller\RepairAdminController.class
 com\template\common\exception\EmsExceptionHandler.class
 com\template\common\utils\JWTUtil.class
-com\template\model\request\LoginRequest.class
 com\template\model\vo\SystemMenuVo.class
 com\template\mapper\RepairAdminMapper.class
 com\template\controller\SendController.class
+com\repair\model\request\queryAccountPageRequest.class
 com\template\core\CORSConfiguration.class
 com\template\api\LogInfoControllerAPI.class
 com\template\common\exception\EmsException.class
@@ -28,19 +28,22 @@ com\template\core\JwtlnterceptorConfig.class
 com\template\common\exception\MyCustomException.class
 com\template\controller\LoginController.class
 com\template\services\impl\SystemUserServiceImpl.class
+com\template\model\result\PageUtils.class
 com\template\common\utils\ValidateCode.class
 com\template\common\utils\AesUtils.class
 com\template\config\smsConfig.class
 com\template\handler\MyMetaObjectHandler.class
 com\template\api\SmsCodeControllerAPI.class
 com\template\common\result\ResponseStatusEnum.class
-com\template\model\result\ResponseStatusEnum.class
 com\template\common\utils\CommonUtil.class
 com\template\api\SystemMenuControllerAPI.class
 com\template\AutoCode.class
+com\repair\model\request\freezeRepairAdminRequest.class
+com\repair\model\request\updateRepairAdminRequest.class
 com\template\model\result\CommonResult.class
 com\template\core\CORSConfiguration$1.class
 com\template\mapper\SystemMenuMapper.class
+com\template\model\request\loginRequest.class
 com\template\MybatisPlusApplication.class
 com\template\annotation\ControllerIsShow.class
 com\template\model\pojo\SmsCode.class
@@ -48,8 +51,10 @@ com\template\services\SystemMenuService.class
 com\template\common\result\Code.class
 com\template\services\impl\SystemMenuServiceImpl.class
 com\template\controller\SmsCodeController.class
+com\template\model\enumModel\eIsSuper.class
 com\template\model\pojo\RepairAdmin.class
 com\template\api\RepairAdminControllerAPI.class
+com\template\model\enumModel\eStatu.class
 com\template\common\utils\EncryptionUtil.class
 com\template\model\vo\LoginVO.class
 com\template\core\SwaggerConfiguration.class
@@ -63,6 +68,7 @@ com\template\common\utils\RSAUtils.class
 com\template\core\JwtAuthenticationInterceptor.class
 com\template\services\impl\RepairAdminServiceImpl.class
 com\template\common\utils\paramUtils.class
+com\repair\model\request\changePasswordRequest.class
 com\template\aop\LoginCheckAspect.class
 com\template\config\MySecurity.class
 com\template\model\pojo\SystemUser.class

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

@@ -30,6 +30,7 @@ D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\pojo\SystemRole.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\common\utils\RSAUtils.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\controller\LogInfoController.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\enumModel\eIsSuper.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\services\impl\SystemUserServiceImpl.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\config\MyBatisPlusConfig.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\pojo\SmsCode.java
@@ -45,20 +46,25 @@ D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\handle\NonStaticResourceHttpRequestHandler.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\common\utils\SendSms.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\config\MySecurity.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\freezeRepairAdminRequest.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\services\impl\RepairAdminServiceImpl.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\mapper\SmsCodeMapper.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\common\result\Code.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\controller\LoginController.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\pojo\SystemMenu.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\changePasswordRequest.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\enumModel\eStatu.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\result\PageUtils.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\services\SystemUserService.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\AutoCode.java
-D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\result\ResponseStatusEnum.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\updateRepairAdminRequest.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\aop\LoginCheckAspect.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\common\utils\CommonUtil.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\controller\ExcelController.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\annotation\ControllerIsShow.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\vo\SystemMenuVo.java
-D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\LoginRequest.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\loginRequest.java
+D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\model\request\queryAccountPageRequest.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\core\JwtAuthenticationInterceptor.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\common\exception\EmsException.java
 D:\Bingo\Desktop\工作内容\项目模板\Back-endDevelopmentFramework\src\main\java\com\template\mapper\SystemUserMapper.java