夏文涛 2 سال پیش
والد
کامیت
f1a0360957

+ 195 - 49
.idea/workspace.xml

@@ -2,10 +2,14 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.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/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" 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/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$/target/classes/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" afterDir="false" />
       <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 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" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -22,38 +26,74 @@
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf>
     <leaf>
+      <file pinned="false" current-in-tab="true">
+        <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="-820">
+              <caret line="1679" column="5" selection-start-line="1679" selection-start-column="5" selection-end-line="1679" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </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/HikvisionController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="15" column="49" selection-start-line="15" selection-start-column="49" selection-end-line="15" selection-end-column="49" />
+            <state relative-caret-position="179">
+              <caret line="248" column="75" selection-start-line="248" selection-start-column="67" selection-end-line="248" selection-end-column="75" />
             </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/common/utils/TimeExchange2.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="23">
-              <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+            <state relative-caret-position="223">
+              <caret line="124" selection-start-line="124" selection-end-line="124" />
             </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/services/SmartUserService.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="163">
-              <caret line="97" column="27" lean-forward="true" selection-start-line="97" selection-start-column="27" selection-end-line="97" selection-end-column="27" />
+            <state relative-caret-position="295">
+              <caret line="47" column="87" selection-start-line="47" selection-start-column="87" selection-end-line="47" selection-end-column="103" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="196">
+              <caret line="39" column="125" selection-start-line="39" selection-start-column="111" selection-end-line="39" selection-end-column="125" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="361">
+              <caret line="71" column="57" selection-start-line="71" selection-start-column="57" selection-end-line="71" selection-end-column="57" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="361">
+              <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="59">
-              <caret line="1974" column="69" selection-start-line="1974" selection-start-column="69" selection-end-line="1974" selection-end-column="69" />
+            <state relative-caret-position="460">
+              <caret line="32" column="120" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="120" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -71,7 +111,11 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
+      <find>querySmartSecordPage</find>
       <find>updateSmartUserById</find>
       <find>updateSmartUserById</find>
+      <find>insertSmartUser</find>
+      <find>SeewoInsertTeacher</find>
+      <find>SeewoUpdateTeacher</find>
     </findStrings>
     </findStrings>
   </component>
   </component>
   <component name="Git.Settings">
   <component name="Git.Settings">
@@ -81,6 +125,13 @@
     <option name="CHANGED_PATHS">
     <option name="CHANGED_PATHS">
       <list>
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/HikvisionController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.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/mapper/SmartUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
       </list>
     </option>
     </option>
@@ -113,8 +164,8 @@
     <option name="skipTests" value="true" />
     <option name="skipTests" value="true" />
   </component>
   </component>
   <component name="ProjectFrameBounds">
   <component name="ProjectFrameBounds">
-    <option name="x" value="953" />
-    <option name="width" value="974" />
+    <option name="x" value="-7" />
+    <option name="width" value="958" />
     <option name="height" value="1039" />
     <option name="height" value="1039" />
   </component>
   </component>
   <component name="ProjectView">
   <component name="ProjectView">
@@ -164,6 +215,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <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="api" 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="common" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
@@ -182,7 +242,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <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="services" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -191,8 +251,23 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <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="vo" type="462c0819:PsiDirectoryNode" />
+              <item name="services" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" 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="resources" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
           </expand>
           </expand>
           <select />
           <select />
@@ -246,15 +321,15 @@
       <option name="number" value="Default" />
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <updated>1707008840183</updated>
-      <workItem from="1707008843054" duration="2346000" />
+      <workItem from="1707008843054" duration="11637000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2346000" />
+    <option name="totallyTimeSpent" value="11637000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
     <editor active="true" />
     <editor active="true" />
     <layout>
     <layout>
       <window_info id="JRebel" side_tool="true" />
       <window_info id="JRebel" side_tool="true" />
@@ -264,13 +339,13 @@
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Favorites" side_tool="true" />
       <window_info id="Designer" />
       <window_info id="Designer" />
       <window_info id="Web" side_tool="true" />
       <window_info id="Web" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1977612" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30066815" />
       <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 anchor="bottom" id="Spring" />
       <window_info anchor="bottom" id="Spring" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Terminal" />
       <window_info anchor="bottom" id="Terminal" />
       <window_info anchor="bottom" id="Docker" />
       <window_info anchor="bottom" id="Docker" />
-      <window_info anchor="bottom" id="Messages" />
+      <window_info anchor="bottom" id="Messages" weight="0.32932165" />
       <window_info anchor="bottom" id="Java Enterprise" />
       <window_info anchor="bottom" id="Java Enterprise" />
       <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="Version Control" />
       <window_info anchor="bottom" id="Version Control" />
@@ -278,12 +353,12 @@
       <window_info anchor="bottom" id="JRebel Console" side_tool="true" />
       <window_info anchor="bottom" id="JRebel Console" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3325967" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.38730854" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33701658" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.36980307" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <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="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Maven" weight="0.6772429" />
+      <window_info anchor="right" id="Maven" weight="0.8129176" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Palette" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Capture Analysis" />
       <window_info anchor="right" id="Database" />
       <window_info anchor="right" id="Database" />
@@ -304,27 +379,21 @@
       <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/SmartUserController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1139</line>
-          <properties />
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
           <line>1557</line>
           <line>1557</line>
           <properties />
           <properties />
           <option name="timeStamp" value="2" />
           <option name="timeStamp" value="2" />
         </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/SmartUserController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1951</line>
+          <line>1959</line>
           <properties />
           <properties />
           <option name="timeStamp" value="3" />
           <option name="timeStamp" value="3" />
         </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/SmartUserController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>1973</line>
+          <line>1403</line>
           <properties />
           <properties />
-          <option name="timeStamp" value="4" />
+          <option name="timeStamp" value="8" />
         </line-breakpoint>
         </line-breakpoint>
       </breakpoints>
       </breakpoints>
     </breakpoint-manager>
     </breakpoint-manager>
@@ -340,14 +409,14 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="23">
         <state relative-caret-position="23">
-          <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+          <caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
     <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="163">
         <state relative-caret-position="163">
-          <caret line="97" column="27" lean-forward="true" selection-start-line="97" selection-start-column="27" selection-end-line="97" selection-end-column="27" />
+          <caret line="97" column="27" selection-start-line="97" selection-start-column="27" selection-end-line="97" selection-end-column="27" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -358,13 +427,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="213" selection-start-line="213" selection-end-line="213" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsControlVo.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="177">
         <state relative-caret-position="177">
@@ -386,10 +448,94 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/GradeVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <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/api/SmartUserControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartScoreControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="39" column="125" selection-start-line="39" selection-start-column="111" selection-end-line="39" selection-end-column="125" />
+        </state>
+      </provider>
+    </entry>
+    <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="295">
+          <caret line="47" column="87" selection-start-line="47" selection-start-column="87" selection-end-line="47" selection-end-column="103" />
+        </state>
+      </provider>
+    </entry>
+    <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="460">
+          <caret line="32" column="120" selection-start-line="32" selection-start-column="120" selection-end-line="32" selection-end-column="120" />
+        </state>
+      </provider>
+    </entry>
+    <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="361">
+          <caret line="71" column="57" selection-start-line="71" selection-start-column="57" selection-end-line="71" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="361">
+          <caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="223">
+          <caret line="124" selection-start-line="124" selection-end-line="124" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="213" selection-start-line="213" selection-end-line="213" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSaveOrUpdateTeacherParam.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="179">
+          <caret line="248" column="75" selection-start-line="248" selection-start-column="67" selection-end-line="248" selection-end-column="75" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/open/platform/platform/1.0/platform-1.0.jar!/com/seewo/open/sdk/SeewoClient.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="65" column="45" lean-forward="true" selection-start-line="65" selection-start-column="45" selection-end-line="65" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="1974" column="69" selection-start-line="1974" selection-start-column="69" selection-end-line="1974" selection-end-column="69" />
+        <state relative-caret-position="-820">
+          <caret line="1679" column="5" selection-start-line="1679" selection-start-column="5" selection-end-line="1679" selection-end-column="5" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 1
src/main/java/com/template/api/SmartScoreControllerAPI.java

@@ -37,7 +37,7 @@ public interface SmartScoreControllerAPI {
 
 
     @GetMapping(value = "/querySmartSecordPage")
     @GetMapping(value = "/querySmartSecordPage")
     @ApiOperation(value = "获取学生分页数据", notes = "获取学生分页数据", httpMethod = "GET")
     @ApiOperation(value = "获取学生分页数据", notes = "获取学生分页数据", httpMethod = "GET")
-    CommonResult querySmartSecordPage(@RequestParam int currentPage, @RequestParam int pageCount, String name);
+    CommonResult querySmartSecordPage(@RequestParam int currentPage, @RequestParam int pageCount, String name, Integer userId);
 
 
     @GetMapping(value = "/querySmartScorePage")
     @GetMapping(value = "/querySmartScorePage")
     @ApiOperation(value = "获取成绩分页数据", notes = "获取成绩分页数据", httpMethod = "GET")
     @ApiOperation(value = "获取成绩分页数据", notes = "获取成绩分页数据", httpMethod = "GET")

+ 2 - 2
src/main/java/com/template/controller/SmartScoreController.java

@@ -124,8 +124,8 @@ public class SmartScoreController implements SmartScoreControllerAPI {
     }
     }
 
 
     @Override
     @Override
-    public CommonResult querySmartSecordPage(int currentPage, int pageCount, String name) {
-        PageUtils<GradeVo> result = smartUserService.querySmartSecordPage(currentPage, pageCount, name);
+    public CommonResult querySmartSecordPage(int currentPage, int pageCount, String name, Integer userId) {
+        PageUtils<GradeVo> result = smartUserService.querySmartSecordPage(currentPage, pageCount, name, userId);
         return CommonResult.ok(result);
         return CommonResult.ok(result);
     }
     }
 
 

+ 8 - 0
src/main/java/com/template/controller/SmartUserController.java

@@ -1671,6 +1671,10 @@ public class SmartUserController implements SmartUserControllerAPI {
             return CommonResult.fail(result.getResponseBody().getMessage());
             return CommonResult.fail(result.getResponseBody().getMessage());
         }
         }
 
 
+        if(!(result.getResponseBody().getData() != null && result.getResponseBody().getData().size() > 0)){
+            return CommonResult.fail("当前教师信息在希沃其他校区已存在");
+        }
+
         return CommonResult.ok("200", "操作成功", result.getResponseBody().getData().get(0).getTeacherCode());
         return CommonResult.ok("200", "操作成功", result.getResponseBody().getData().get(0).getTeacherCode());
         //endregion
         //endregion
     }
     }
@@ -1718,6 +1722,10 @@ public class SmartUserController implements SmartUserControllerAPI {
             return CommonResult.fail(result.getResponseBody().getMessage());
             return CommonResult.fail(result.getResponseBody().getMessage());
         }
         }
 
 
+        if(!(result.getResponseBody().getData() != null && result.getResponseBody().getData().size() > 0)){
+            return CommonResult.fail("当前教师信息在希沃其他校区已存在");
+        }
+
         return CommonResult.ok("200", "操作成功", result.getResponseBody().getData().get(0).getTeacherCode());
         return CommonResult.ok("200", "操作成功", result.getResponseBody().getData().get(0).getTeacherCode());
         //endregion
         //endregion
     }
     }

+ 1 - 1
src/main/java/com/template/mapper/SmartUserMapper.java

@@ -30,7 +30,7 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
 
 
     List<SmartUser> querySmartUsers(@Param("departmentIds") List<Integer> departmentIds, @Param("name") String name);
     List<SmartUser> querySmartUsers(@Param("departmentIds") List<Integer> departmentIds, @Param("name") String name);
 
 
-    IPage<GradeVo> querySmartSecordPage(IPage<GradeVo> page, @Param("name") String name);
+    IPage<GradeVo> querySmartSecordPage(IPage<GradeVo> page, @Param("name") String name, @Param("userId") Integer userId);
 
 
     IPage<WarningUserDto> warningUserList(Page<UserVo> page, @Param("name") String name);
     IPage<WarningUserDto> warningUserList(Page<UserVo> page, @Param("name") String name);
 
 

+ 1 - 1
src/main/java/com/template/services/SmartUserService.java

@@ -45,7 +45,7 @@ public interface SmartUserService extends IService<SmartUser> {
 
 
     PageUtils<UserVo> querySmartUserPages(int currentPage, int pageCount, List<Integer> departmentIds, String name);
     PageUtils<UserVo> querySmartUserPages(int currentPage, int pageCount, List<Integer> departmentIds, String name);
 
 
-    PageUtils<GradeVo> querySmartSecordPage(int currentPage, int pageCount, String name);
+    PageUtils<GradeVo> querySmartSecordPage(int currentPage, int pageCount, String name, Integer userId);
 
 
     List<SmartUser> querySmartUsers(List<Integer> departmentIds, String name);
     List<SmartUser> querySmartUsers(List<Integer> departmentIds, String name);
 
 

+ 2 - 2
src/main/java/com/template/services/impl/SmartUserServiceImpl.java

@@ -65,11 +65,11 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
     }
     }
 
 
     @Override
     @Override
-    public PageUtils<GradeVo> querySmartSecordPage(int currentPage, int pageCount, String name) {
+    public PageUtils<GradeVo> querySmartSecordPage(int currentPage, int pageCount, String name, Integer userId) {
         Page<GradeVo> page = new Page<>();
         Page<GradeVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setCurrent(currentPage);
         page.setSize(pageCount);
         page.setSize(pageCount);
-        IPage<GradeVo> result = smartUserMapper.querySmartSecordPage(page, name);
+        IPage<GradeVo> result = smartUserMapper.querySmartSecordPage(page, name, userId);
         return new PageUtils(result);
         return new PageUtils(result);
     }
     }
 
 

+ 3 - 0
src/main/resources/mapper/template/SmartUserMapper.xml

@@ -115,6 +115,9 @@
         <if test="name != null and name != ''">
         <if test="name != null and name != ''">
             and name like '%' #{name} '%'
             and name like '%' #{name} '%'
         </if>
         </if>
+        <if test="userId != null and userId != '' and userId != 0">
+            and id != #{userId}
+        </if>
     </select>
     </select>
 
 
     <select id="warningUserList" resultType="com.template.model.dto.WarningUserDto">
     <select id="warningUserList" resultType="com.template.model.dto.WarningUserDto">

+ 3 - 0
target/classes/mapper/template/SmartUserMapper.xml

@@ -115,6 +115,9 @@
         <if test="name != null and name != ''">
         <if test="name != null and name != ''">
             and name like '%' #{name} '%'
             and name like '%' #{name} '%'
         </if>
         </if>
+        <if test="userId != null and userId != '' and userId != 0">
+            and id != #{userId}
+        </if>
     </select>
     </select>
 
 
     <select id="warningUserList" resultType="com.template.model.dto.WarningUserDto">
     <select id="warningUserList" resultType="com.template.model.dto.WarningUserDto">

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