夏文涛 3 years ago
parent
commit
6a558e32b7

+ 80 - 75
.idea/workspace.xml

@@ -2,12 +2,8 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
-      <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/api/SmsCodeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmsCodeControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.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/model/result/ResponseStatusEnum.java" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eStatu.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" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -22,41 +18,32 @@
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ExcelController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <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="470">
+              <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eStatu.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1014">
-              <caret line="51" column="12" selection-start-line="51" selection-start-column="12" selection-end-line="51" selection-end-column="12" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="207">
+              <caret line="9" column="19" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="19" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+            <state relative-caret-position="555">
+              <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -109,7 +96,16 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <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">
+              <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="138">
             <state relative-caret-position="138">
@@ -149,6 +145,7 @@
       <find>自动填充</find>
       <find>自动填充</find>
       <find>setTablePrefix</find>
       <find>setTablePrefix</find>
       <find>getResource</find>
       <find>getResource</find>
+      <find>getRepairByAccount</find>
     </findStrings>
     </findStrings>
     <replaceStrings>
     <replaceStrings>
       <replace />
       <replace />
@@ -179,7 +176,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/utils/paramUtils.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/model/request/LoginRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.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/common/utils/JWTUtil.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/vo/LoginVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/result/CommonResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/result/CommonResult.java" />
@@ -197,12 +193,14 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <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/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/SystemMenuControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmsCodeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmsCodeControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.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>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -234,7 +232,7 @@
   <component name="MavenRunner">
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
     <option name="skipTests" value="true" />
   </component>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="953" />
     <option name="x" value="953" />
     <option name="width" value="974" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
     <option name="height" value="1039" />
@@ -388,6 +386,16 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="enumModel" 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="pojo" type="462c0819:PsiDirectoryNode" />
               <item name="pojo" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -538,12 +546,12 @@
       <workItem from="1688610829222" duration="217000" />
       <workItem from="1688610829222" duration="217000" />
       <workItem from="1688611334908" duration="804000" />
       <workItem from="1688611334908" duration="804000" />
       <workItem from="1688612583930" duration="14000" />
       <workItem from="1688612583930" duration="14000" />
-      <workItem from="1688623572162" duration="660000" />
+      <workItem from="1688623572162" duration="1708000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30955000" />
+    <option name="totallyTimeSpent" value="32003000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -555,10 +563,10 @@
     </todo-panel>
     </todo-panel>
   </component>
   </component>
   <component name="ToolWindowManager">
   <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" />
     <editor active="true" />
     <layout>
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21428572" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.43982494" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -644,13 +652,13 @@
       <breakpoints>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
-          <line>41</line>
+          <line>42</line>
           <properties />
           <properties />
           <option name="timeStamp" value="16" />
           <option name="timeStamp" value="16" />
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
-          <line>54</line>
+          <line>55</line>
           <properties />
           <properties />
           <option name="timeStamp" value="17" />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
         </line-breakpoint>
@@ -674,30 +682,6 @@
     <option name="FILTER_TARGETS" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <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="391">
-          <caret line="17" column="15" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SystemMenuServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="952">
-          <caret line="60" column="68" lean-forward="true" selection-start-line="56" selection-start-column="8" selection-end-line="60" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.10.0/java-jwt-3.10.0.jar!/com/auth0/jwt/JWTVerifier.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="492">
-          <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="437">
         <state relative-caret-position="437">
@@ -994,16 +978,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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="1014">
-          <caret line="51" column="12" selection-start-line="51" selection-start-column="12" selection-end-line="51" selection-end-column="12" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SystemMenuControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
         <state relative-caret-position="230">
@@ -1039,6 +1013,13 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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/api/LoginControllerAPI.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
         <state relative-caret-position="368">
@@ -1049,10 +1030,34 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/ExcelControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LogInfoController.java">
       <provider selected="true" editor-type-id="text-editor">
       <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 relative-caret-position="115">
+          <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/template/services/impl/RepairAdminServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="9" column="19" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="19" />
+        </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="470">
+          <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>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 5 - 0
src/main/java/com/template/controller/LoginController.java

@@ -2,6 +2,7 @@ package com.template.controller;
 
 
 import com.template.annotation.PassToken;
 import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.api.LoginControllerAPI;
+import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.RepairAdmin;
 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.result.CommonResult;
@@ -87,6 +88,10 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("账号或密码错误");
             return CommonResult.fail("账号或密码错误");
         }
         }
 
 
+        if(result.getStatu() == eStatu.Freeze.getValue()){
+            return CommonResult.fail("该账号已被冻结");
+        }
+
         String encPassword = AesUtils.encrypt(loginRequest.getPassword());
         String encPassword = AesUtils.encrypt(loginRequest.getPassword());
         if(!encPassword.equals(result.getPassword())){
         if(!encPassword.equals(result.getPassword())){
             return CommonResult.fail("密码错误");
             return CommonResult.fail("密码错误");

+ 33 - 0
src/main/java/com/template/model/enumModel/eStatu.java

@@ -0,0 +1,33 @@
+package com.template.model.enumModel;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 账号状态
+ */
+public enum  eStatu {
+    Freeze(1),//冻结
+    Unfrozen(0);//未冻结
+
+    private int value;
+
+    eStatu(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eStatu valueOf(int value) {
+        switch (value) {
+            case 1:
+                return eStatu.Freeze;
+            case 0:
+                return eStatu.Unfrozen;
+            default:
+                return null;
+        }
+    }
+}