删除用户

.idea/workspace.xml

@@ -2,7 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -18,97 +28,91 @@
   <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/model/pojo/SmartSubject.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="45" selection-start-line="45" selection-end-line="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="163">
-              <caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="40" />
+            <state relative-caret-position="1357">
+              <caret line="2730" column="25" selection-start-line="2730" selection-start-column="25" selection-end-line="2730" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <caret line="86" column="14" lean-forward="true" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
+            <state relative-caret-position="261">
+              <caret line="84" lean-forward="true" selection-start-line="84" selection-end-line="84" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemUser.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="401">
-              <caret line="69" column="40" selection-start-line="69" selection-start-column="40" selection-end-line="69" selection-end-column="40" />
+            <state relative-caret-position="332">
+              <caret line="88" lean-forward="true" selection-start-line="88" selection-end-line="88" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/UnitTimeHelpModel.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <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="118">
+              <caret line="194" column="31" selection-start-line="194" selection-start-column="16" selection-end-line="194" 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/controller/SmartIdentityController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="453">
-              <caret line="123" column="38" selection-start-line="123" selection-start-column="34" selection-end-line="123" selection-end-column="38" />
+            <state relative-caret-position="309">
+              <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#6225#6226#0" expanded="true" />
+                <element signature="e#6284#6285#0" expanded="true" />
+                <element signature="e#7254#7255#0" expanded="true" />
+                <element signature="e#7310#7311#0" 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/SmartIdentity.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="410">
-              <caret line="64" column="67" selection-start-line="64" selection-start-column="67" selection-end-line="64" selection-end-column="67" />
+            <state relative-caret-position="355">
+              <caret line="148" column="13" selection-start-line="148" selection-start-column="13" selection-end-line="148" 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/aop/LoginCheckAspect.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="217">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+            <state relative-caret-position="560">
+              <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="57" column="22" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="-449">
+              <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" 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/annotation/DESRespondSecret.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+            <state relative-caret-position="146">
+              <caret line="25" column="47" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="47" />
             </state>
           </provider>
         </entry>
@@ -124,36 +128,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>setInPlaceOld(</find>
-      <find>importExcel</find>
-      <find>)</find>
-      <find>deleteOldParentShip</find>
-      <find>delete</find>
-      <find>insertSmartSubjectManage</find>
-      <find>importEx</find>
-      <find>getAffiliateList</find>
-      <find>deleteSmartUserById</find>
-      <find>studentDatas</find>
-      <find>importExc</find>
-      <find>importExce</find>
-      <find>应用</find>
-      <find>Apply</find>
-      <find>querySmartSemesters</find>
-      <find>Build</find>
-      <find>queryExamTypes</find>
       <find>querySubjects</find>
       <find>楼栋</find>
       <find>@NotEmpty</find>
       <find>.join</find>
       <find>insertSmartGradeToBaisheng</find>
       <find>StringUtils.join</find>
-      <find>updateSmartGradeById</find>
       <find>@TableField(</find>
       <find>applyIds</find>
       <find>queryPageSmartGrade</find>
       <find>queryPageSmartIdentity</find>
       <find>@TableField(fill = FieldFill.INSERT)</find>
       <find>@TableField(fill = FieldFill.INSERT_UPDATE)</find>
+      <find>update</find>
+      <find>TableLogic</find>
+      <find>updateSmartSubject</find>
+      <find>queryAffiliateParents</find>
+      <find>warningPushList</find>
+      <find>warningUserList</find>
+      <find>queryAffiliateUserById</find>
+      <find>getAffiliateList</find>
+      <find>&lt;update</find>
+      <find>updateMonthMeter</find>
+      <find>ur</find>
+      <find>allowMultiQueries</find>
+      <find>updateSmartSubjectById</find>
+      <find>up</find>
+      <find>updateSmartGradeById</find>
+      <find>deleted</find>
+      <find>分页</find>
+      <find>queryAppletSubjects</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -162,8 +166,9 @@
       <replace>Subject</replace>
       <replace>Semester</replace>
       <replace>科目</replace>
-      <replace>学期</replace>
       <replace>@TableField(fill = FieldFill.INSERT)</replace>
+      <replace>updateSmartGradeById</replace>
+      <replace>学期</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -172,21 +177,9 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartSubjectMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartSemesterMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartSubjectService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartSemesterService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartSemesterControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartSubjectControllerAPI.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertScoreRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateScoreRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartGradeRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/updateSmartGradeRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSemesterServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeterDetail.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMenu.java" />
@@ -194,7 +187,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartCodeOpenId.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartCarAccess.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemMenu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmsCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" />
@@ -209,7 +201,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDuties.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFaceDiscern.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFreezeRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartNotification.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java" />
@@ -223,6 +214,20 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/daleteUserVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java" />
       </list>
     </option>
   </component>
@@ -253,9 +258,9 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
-    <option name="width" value="958" />
+    <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
   <component name="ProjectView">
@@ -341,15 +346,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="mapper" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
-              <item name="backend_code" 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" />
             </path>
             <path>
@@ -360,7 +356,7 @@
               <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="vo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -417,7 +413,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$/../../报修系统/repair_backend" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../智慧酒店/ihotel-backend" />
     <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="MavenSettings" />
@@ -525,18 +521,18 @@
       <workItem from="1709604835831" duration="41000" />
       <workItem from="1709604890825" duration="250000" />
       <workItem from="1709606083794" duration="10623000" />
-      <workItem from="1709688259937" duration="40775000" />
+      <workItem from="1709688259937" duration="46788000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="191490000" />
+    <option name="totallyTimeSpent" value="197503000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.54704595" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2675906" />
       <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" />
@@ -548,7 +544,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.3237569" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.24530387" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" visible="true" weight="0.40262583" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -638,7 +634,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2858</line>
+          <line>2956</line>
           <properties />
           <option name="timeStamp" value="91" />
         </line-breakpoint>
@@ -667,12 +663,6 @@
           <option name="timeStamp" value="112" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java</url>
-          <line>85</line>
-          <properties />
-          <option name="timeStamp" value="114" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java</url>
           <line>93</line>
           <properties />
@@ -685,366 +675,375 @@
     <SUITE FILE_PATH="coverage/mybatis_plus$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1709618808702" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAttendance.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFaceDiscern.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="108" column="4" lean-forward="true" selection-start-line="108" selection-start-column="4" selection-end-line="109" selection-end-column="15" />
+        <state relative-caret-position="-496">
+          <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/model/pojo/SmartApply.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFreezeRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="81" column="5" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="5" />
+        <state relative-caret-position="-312">
+          <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/model/pojo/SmartAuthorGroup.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMenu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="70" column="15" selection-start-line="70" selection-start-column="15" selection-end-line="70" selection-end-column="15" />
+        <state relative-caret-position="309">
+          <caret line="51" column="5" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthorGroupManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="470">
+          <caret line="61" column="37" lean-forward="true" selection-start-line="61" selection-start-column="37" selection-end-line="61" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartAuthority.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeterDetail.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="70" column="15" selection-start-line="70" selection-start-column="15" selection-end-line="70" selection-end-column="15" />
+        <state relative-caret-position="424">
+          <caret line="62" column="30" selection-start-line="62" selection-start-column="30" selection-end-line="62" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartBuild.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartNotification.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-105">
+        <state relative-caret-position="-519">
           <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/model/pojo/SmartBuildMeter.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-243">
           <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/model/pojo/SmartCarAccess.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="54" column="5" selection-start-line="54" selection-start-column="5" selection-end-line="54" selection-end-column="5" />
+        <state relative-caret-position="-726">
+          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartClass.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-381">
+        <state relative-caret-position="-864">
           <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/model/pojo/SmartCodeOpenId.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+        <state relative-caret-position="-174">
+          <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/model/pojo/SmartDataClass.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshotRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="-174">
+          <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/model/pojo/SmartDataSource.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-358">
-          <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="-1564">
+          <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/model/pojo/SmartDataSourceJobParams.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartWarning.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-59">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="-519">
+          <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/model/pojo/SmartDataSourceLog.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemRole.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-128">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="401">
+          <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataTask.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemMenu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1462">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="194">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataTaskDebug.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmsCode.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="516">
+          <caret line="49" column="4" selection-start-line="49" selection-start-column="4" selection-end-line="49" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataTaskErr.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="148">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="401">
+          <caret line="69" column="40" selection-start-line="69" selection-start-column="40" selection-end-line="69" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDataTaskLog.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/UnitTimeHelpModel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1140">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        <state relative-caret-position="230">
+          <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/pojo/SmartDataTaskSetDebugSql.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/2.0.12/fastjson-2.0.12.jar!/com/alibaba/fastjson/JSON.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="295">
+          <caret line="907" column="25" selection-start-line="907" selection-start-column="25" selection-end-line="907" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDepartment.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/annotation/DESRespondSecret.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-243">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="253">
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDsColumnCor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDuties.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-174">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="163">
+          <caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFaceDiscern.java">
+    <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="-496">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="479">
+          <caret line="154" column="13" selection-start-line="154" selection-start-column="13" selection-end-line="154" selection-end-column="13" />
+          <folding>
+            <element signature="e#4303#4304#0" expanded="true" />
+            <element signature="e#4345#4346#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFreezeRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-312">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="539">
+          <caret line="94" lean-forward="true" selection-start-line="94" selection-end-line="94" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/LoginCheckAspect.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="65" column="35" selection-start-line="65" selection-start-column="35" selection-end-line="65" selection-end-column="35" />
+        <state relative-caret-position="217">
+          <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/model/pojo/SmartMenu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="51" column="5" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
+        <state relative-caret-position="405">
+          <caret line="81" column="39" selection-start-line="81" selection-start-column="39" selection-end-line="81" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeter.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="61" column="37" lean-forward="true" selection-start-line="61" selection-start-column="37" selection-end-line="61" selection-end-column="37" />
+        <state relative-caret-position="102">
+          <caret line="86" column="14" lean-forward="true" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartMeterDetail.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="424">
-          <caret line="62" column="30" selection-start-line="62" selection-start-column="30" selection-end-line="62" selection-end-column="30" />
+        <state relative-caret-position="103">
+          <caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartNotification.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-519">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="447">
+          <caret line="157" column="4" selection-start-line="157" selection-start-column="4" selection-end-line="157" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/WechatScanLoginMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-243">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="100">
+          <caret line="111" column="32" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSchool.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-726">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+        <state relative-caret-position="146">
+          <caret line="15" column="175" selection-start-line="15" selection-start-column="158" selection-end-line="15" selection-end-column="175" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-864">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="146">
+          <caret line="15" column="175" selection-start-line="15" selection-start-column="158" selection-end-line="15" selection-end-column="175" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshot.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/DepartmentTreeVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-174">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="379">
+          <caret line="26" column="25" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="26" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScreenshotRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-174">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="379">
+          <caret line="55" column="25" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/WechatScanLoginMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="141" column="5" selection-start-line="141" selection-start-column="5" selection-end-line="141" selection-end-column="5" />
+        <state relative-caret-position="146">
+          <caret line="48" column="66" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1564">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="138">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartWarning.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-519">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
+        <state relative-caret-position="341">
+          <caret line="41" column="23" selection-start-line="41" selection-start-column="8" selection-end-line="41" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemRole.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
+        <state relative-caret-position="246">
+          <caret line="126" lean-forward="true" selection-start-line="126" selection-end-line="126" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemMenu.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/deleteUserVo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        <state relative-caret-position="241">
+          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmsCode.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="516">
-          <caret line="49" column="4" selection-start-line="49" selection-start-column="4" selection-end-line="49" selection-end-column="37" />
+        <state relative-caret-position="332">
+          <caret line="88" lean-forward="true" selection-start-line="88" selection-end-line="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SystemUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartGradeControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="69" column="40" selection-start-line="69" selection-start-column="40" selection-end-line="69" selection-end-column="40" />
+        <state relative-caret-position="146">
+          <caret line="25" column="47" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/UnitTimeHelpModel.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartClassController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <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="-449">
+          <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="45" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="309">
+          <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
+          <folding>
+            <element signature="e#6225#6226#0" expanded="true" />
+            <element signature="e#6284#6285#0" expanded="true" />
+            <element signature="e#7254#7255#0" expanded="true" />
+            <element signature="e#7310#7311#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/aop/LoginCheckAspect.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="118">
+          <caret line="194" column="31" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/2.0.12/fastjson-2.0.12.jar!/com/alibaba/fastjson/JSON.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="907" column="25" selection-start-line="907" selection-start-column="25" selection-end-line="907" selection-end-column="25" />
+        <state relative-caret-position="1357">
+          <caret line="2730" column="25" selection-start-line="2730" selection-start-column="25" selection-end-line="2730" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/annotation/DESRespondSecret.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSubject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+        <state relative-caret-position="34">
+          <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/aop/DESResponseSecretAspect.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSubjectController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="57" column="22" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="261">
+          <caret line="84" lean-forward="true" selection-start-line="84" selection-end-line="84" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartIdentity.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.11/commons-lang3-3.11.jar!/org/apache/commons/lang3/StringUtils.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="64" column="67" selection-start-line="64" selection-start-column="67" selection-end-line="64" selection-end-column="67" />
+        <state relative-caret-position="172">
+          <caret line="1503" column="25" selection-start-line="1503" selection-start-column="25" selection-end-line="1503" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartSubjectServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="453">
-          <caret line="123" column="38" selection-start-line="123" selection-start-column="34" selection-end-line="123" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="560">
+          <caret line="72" column="49" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSemesterController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartGrade.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="86" column="14" lean-forward="true" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
+        <state relative-caret-position="172">
+          <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartSemester.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartGradeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="50" column="40" lean-forward="true" selection-start-line="50" selection-start-column="40" selection-end-line="50" selection-end-column="40" />
+        <state relative-caret-position="355">
+          <caret line="148" column="13" selection-start-line="148" selection-start-column="13" selection-end-line="148" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -77,6 +77,10 @@ public interface SmartUserControllerAPI {
     @ApiOperation(value = "根据ID删除指定用户", notes = "根据ID删除指定用户", httpMethod = "POST")
     CommonResult deleteSmartUserById(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
 
+    @PostMapping(value = "/deleteSmartUserByIdBak")
+    @ApiOperation(value = "根据ID删除指定用户", notes = "根据ID删除指定用户", httpMethod = "POST")
+    CommonResult deleteSmartUserByIdBak(@Validated @RequestBody useridsRequest ur, BindingResult bindingResult) throws Exception;
+
     /**
      * 学生家长预约信息填写界面获取受访学生列表
      */

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

@@ -9,6 +9,7 @@ import com.template.common.utils.*;
 import com.template.config.ControlConfig;
 import com.template.model.pojo.SmartGrade;
 import com.template.model.pojo.SmartSchool;
+import com.template.model.pojo.SmartSubject;
 import com.template.model.request.insertSmartGradeRequest;
 import com.template.model.request.updateSmartGradeRequest;
 import com.template.model.result.CommonResult;
@@ -17,6 +18,7 @@ import com.template.model.vo.BsGradeNoVo;
 import com.template.model.vo.BsGradeVo;
 import com.template.model.vo.SemesterVo;
 import com.template.services.SmartGradeService;
+import com.template.services.SmartSubjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.BindingResult;
@@ -29,6 +31,8 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static com.template.common.utils.AesTestOne.decrypt;
 
@@ -49,6 +53,8 @@ public class SmartGradeController implements SmartGradeControllerAPI {
     private ControlConfig controlConfig;
     @Autowired
     private SmartGradeService smartGradeService;
+    @Autowired
+    private SmartSubjectService smartSubjectService;
 
     @Override
     @DESRespondSecret(validated = true)
@@ -72,7 +78,7 @@ public class SmartGradeController implements SmartGradeControllerAPI {
 
         //判断重复性
         SmartGrade existData = smartGradeService.existSmartGradeData(usgr.getGradeNo(), usgr.getGradeName());
-        if (existData != null && existData.getId().equals(usgr.getId())) {
+        if (existData != null && !existData.getId().equals(usgr.getId())) {
             return CommonResult.fail("该年级数据已在系统中存在，请勿重复添加");
         }
 
@@ -123,8 +129,24 @@ public class SmartGradeController implements SmartGradeControllerAPI {
     public CommonResult queryPageSmartGrades(int currentPage, int pageCount, String name) {
         PageUtils<SmartGrade> result = smartGradeService.queryPageSmartGrade(currentPage, pageCount, name);
 
+        List<SmartSubject> subjects = smartSubjectService.list(null);
+
         for (SmartGrade sg : result.getList()) {
             sg.setSubjectIds(sg.getSubjectId() == null ? new ArrayList<>() : Arrays.asList(sg.getSubjectId().split(",")));
+            if(subjects != null && subjects.size() > 0){
+                if(sg.getSubjectIds() == null){
+                    sg.setSubjectStrs(new ArrayList<>());
+                }else{
+                    List<String> subjectStrs = new ArrayList<>();
+                    for (String subjectId:sg.getSubjectIds()) {
+                        Optional<SmartSubject> ownerSubject = subjects.stream().filter(e -> e.getId().toString().equals(subjectId)).findFirst();
+                        if(ownerSubject != null && ownerSubject.isPresent()){
+                            subjectStrs.add(ownerSubject.get().getName());
+                        }
+                    }
+                    sg.setSubjectStrs(subjectStrs);
+                }
+            }
         }
 
         return CommonResult.ok(result);

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

@@ -2634,6 +2634,104 @@ public class SmartUserController implements SmartUserControllerAPI {
     }
 
     @Override
+    public CommonResult deleteSmartUserByIdBak(useridsRequest ur, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        List<SmartUser> users = smartUserService.getSmartUserByIds(ur.getUserIds());
+        if (users.size() != ur.getUserIds().size()) {
+            return CommonResult.fail("存在无效用户数据，删除失败！");
+        }
+
+        //先删除咱自己数据库里的用户数据
+        int result = smartUserService.deleteSmartUserByIds(ur.getUserIds());
+        if(result <= 0){
+            return CommonResult.fail("删除失败");
+        }
+
+        List<deleteUserVo> deleteUsers = new ArrayList<>();
+        SeewoClient seewoClient = new DefaultSeewoClient(new Account(seewoConfig.getAppId(), seewoConfig.getAppSecret()));
+        for (SmartUser user : users) {
+            if (user.getIdentityId().intValue() == eIdentityStatu.Parent.getValue()) {
+                List<String> studentIds = Arrays.asList(user.getAffiliate().split(","));
+                List<SmartUser> studentDatas = smartUserService.getSmartUserIds(studentIds);
+
+                //region 删除原有的家长关系
+                CommonResult deleteResult = deleteOldParentShip(seewoClient, studentDatas, user.getPhone());
+                if (!deleteResult.isSuccess()) {
+                    return CommonResult.fail(deleteResult.getMessage());
+                }
+                //endregion
+            } else if (user.getIdentityId().intValue() == eIdentityStatu.Student.getValue()) {
+                //查找家长
+                List<SmartUser> parents = smartUserService.getAffiliateList(user.getId());
+
+                //获取班级Uid
+                SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
+                if (classData == null) {
+                    return CommonResult.fail("班级数据无效，更新失败");
+                }
+                //region 百胜删除学生
+                CommonResult deleteBsStudent = bsDeleteStudent(user);
+                if (!deleteBsStudent.isSuccess()) {
+                    return CommonResult.fail(deleteBsStudent.getMessage());
+                }
+                //endregion
+
+                //region 希沃删除学生
+                CommonResult deleteStudent = SeewoDeleteStudent(seewoClient, classData.getClassUid(), user.getCardNo());
+                if (!deleteStudent.isSuccess()) {
+                    return CommonResult.fail(deleteStudent.getMessage());
+                }
+                //endregion
+
+                if(parents != null){
+                    //region 删除原有的家长关系
+                    CommonResult deleteResult = deleteOldStudentParentShip(seewoClient, user.getCardNo(), parents.stream().map(SmartUser::getPhone).collect(Collectors.toList()));
+                    if (!deleteResult.isSuccess()) {
+                        return CommonResult.fail(deleteResult.getMessage());
+                    }
+                    //endregion
+                }
+
+            } else if(user.getIdentityId().intValue() == eIdentityStatu.Teacher.getValue()){
+                //获取班级Uid
+                SmartClass classData = smartClassService.getSmartClassById(user.getSchoolClass());
+                if (classData == null) {
+                    return CommonResult.fail("班级数据无效，更新失败");
+                }
+
+                //region 希沃删除教师
+                CommonResult deleteTeacher = SeewoDeleteTeacher(seewoClient, user.getPhone());
+                if (!deleteTeacher.isSuccess()) {
+                    return CommonResult.fail(deleteTeacher.getMessage());
+                }
+                //endregion
+
+                //region 希沃删除班主任
+                CommonResult deleteTeacherMaster = SeewoDeleteTeacherMaster(seewoClient, classData.getClassUid(), user.getPhone());
+                if (deleteTeacherMaster.isSuccess()) {
+                    return CommonResult.fail(deleteTeacherMaster.getMessage());
+                }
+                //endregion
+
+                //region 百胜删除教师
+                CommonResult bsDeleteTeacher = bsDeleteTeacher(user.getBsStaffCode());
+                if (!bsDeleteTeacher.isSuccess()) {
+                    return CommonResult.fail(bsDeleteTeacher.getMessage());
+                }
+                //endregion
+            }
+
+        }
+
+        int deleteUser = smartUserService.deleteUserBatch(deleteUsers);
+        return deleteUser > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
+    }
+
+    @Override
     @DESRespondSecret(validated = true)
     public CommonResult queryAffiliateUserById(int id) {
         List<AffiliateUserVo> result = smartUserService.queryAffiliateUserById(id);

src/main/java/com/template/mapper/SmartUserMapper.java

@@ -38,4 +38,6 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
     List<SmartUser> getAffiliateList(@Param("id")Integer id);
 
     SmartUserVo querySmartUserById(@Param("userId") Integer userId);
+
+    int deleteUserBatch(@Param("list") List<deleteUserVo> list);
 }

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

@@ -59,12 +59,17 @@ public class SmartGrade implements Serializable {
     private String subjectId;
 
     /**
-     * 应用管理
-     * 多个应用用逗号隔开
+     * 科目管理ID
      */
     @TableField(exist = false)
     private List<String> subjectIds;
 
+    /**
+     * 科目管理名称
+     */
+    @TableField(exist = false)
+    private List<String> subjectStrs;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

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

@@ -132,6 +132,9 @@ public class SmartUser implements Serializable {
     @ApiModelProperty(value = "家属关系")
     private String ship;
 
+    @ApiModelProperty(value = "删除失败原因")
+    private String deleteReason;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -152,7 +155,7 @@ public class SmartUser implements Serializable {
 
     @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
     @TableField(fill = FieldFill.INSERT)
-        @TableLogic
+    @TableLogic
     private Integer deleted;
 
 

src/main/java/com/template/model/vo/deleteUserVo.java

@@ -0,0 +1,22 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2024/3/11 星期一 10:30
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class deleteUserVo {
+    /**
+     * 数据ID
+     */
+    private int id;
+
+    /**
+     * 原因
+     */
+    private String reason;
+}

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

@@ -2,7 +2,6 @@ package com.template.services;
 
 import com.template.model.dto.WarningUserDto;
 import com.template.model.pojo.SmartUser;
-import com.template.model.pojo.SmartUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.*;
@@ -87,4 +86,6 @@ public interface SmartUserService extends IService<SmartUser> {
     List<SmartUser> querySmartUserByCardNos(List<String> cardNos);
 
     SmartUserVo querySmartUserById(Integer id);
+
+    int deleteUserBatch(List<deleteUserVo> list);
 }

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

@@ -251,4 +251,10 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
 
         return result;
     }
+
+    @Override
+    public int deleteUserBatch(List<deleteUserVo> list) {
+        int result = smartUserMapper.deleteUserBatch(list);
+        return result;
+    }
 }

src/main/resources/mapper/template/SmartUserMapper.xml

@@ -191,4 +191,15 @@
         </if>
     </select>
 
+
+    <update id="deleteUserBatch"  parameterType="com.template.model.vo.deleteUserVo">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update smart_user
+            <set>
+                delete_reason=${item.reason}
+            </set>
+            where id = ${item.id}
+        </foreach>
+    </update>
+
 </mapper>

src/main/resources/mapper/template/SystemUserMapper.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.SystemUserMapper">
+
+
 </mapper>

target/classes/mapper/template/SmartUserMapper.xml

@@ -191,4 +191,15 @@
         </if>
     </select>
 
+
+    <update id="deleteUserBatch"  parameterType="com.template.model.vo.deleteUserVo">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update smart_user
+            <set>
+                delete_reason=${item.reason}
+            </set>
+            where id = ${item.id}
+        </foreach>
+    </update>
+
 </mapper>

target/classes/mapper/template/SystemUserMapper.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.SystemUserMapper">
+
+
 </mapper>

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

@@ -685,6 +685,7 @@ com\template\model\pojo\SmartNotification.class
 com\template\model\seewo\AttendanceRuleListEventByClazzParam$Query$QueryBuilder.class
 com\template\model\seewo\AttendanceRuleListEventByClazzParam$RequestBody$RequestBodyBuilder.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam$Query.class
+com\template\model\vo\deleteUserVo.class
 com\template\model\seewo\AttendanceRuleListEventByClazzResult$EventsItem.class
 com\template\api\SmartBuildControllerAPI.class
 com\template\model\enumModel\eAttendanceStatu.class

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

@@ -299,6 +299,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartCarAccessService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartDutiesMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\TeacherServiceBatchSetClassMastersResult.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\deleteUserVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\TeacherServiceBatchRemoveTeachersParam.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\MybatisPlusApplication.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\TeacherApiQueryByConditionRequest.java