夏文涛 2 лет назад
Родитель
Сommit
dd8c258c4f

+ 213 - 205
.idea/workspace.xml

@@ -2,11 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6c5cf517-721b-44b7-afae-e7b1b913b988" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartUserVo.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/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.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" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="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/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>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -24,89 +28,80 @@
       <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="547">
-              <caret line="2558" column="8" selection-start-line="2558" selection-start-column="8" selection-end-line="2558" selection-end-column="8" />
-              <folding>
-                <element signature="e#94443#94460#0" />
-                <element signature="e#96633#96648#0" />
-                <element signature="e#98960#98975#0" />
-                <element signature="e#110744#117713#0" />
-                <element signature="e#117719#118368#0" />
-              </folding>
+            <state relative-caret-position="518">
+              <caret line="2787" column="24" selection-start-line="2787" selection-start-column="20" selection-end-line="2787" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.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="315">
-              <caret line="77" column="36" selection-start-line="77" selection-start-column="17" selection-end-line="77" selection-end-column="36" />
+            <state relative-caret-position="724">
+              <caret line="88" column="34" selection-start-line="88" selection-start-column="16" selection-end-line="88" 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/common/utils/TimeExchange.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="28">
-              <caret line="741" selection-start-line="741" selection-end-line="741" />
-              <folding>
-                <element signature="e#23978#23979#0" expanded="true" />
-                <element signature="e#24010#24011#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="654">
+              <caret line="249" column="68" selection-start-line="249" selection-start-column="68" selection-end-line="249" selection-end-column="68" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.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="253">
-              <caret line="11" column="30" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="30" />
+            <state relative-caret-position="578">
+              <caret line="190" column="13" selection-start-line="190" selection-start-column="13" selection-end-line="190" 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/model/vo/BsControlVo.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="253">
-              <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+            <state relative-caret-position="690">
+              <caret line="39" column="34" selection-start-line="39" selection-start-column="16" selection-end-line="39" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartUserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1173" />
+            <state relative-caret-position="654">
+              <caret line="50" column="26" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="50" selection-end-column="26" />
+            </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <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="241">
-              <caret line="50" selection-start-line="50" selection-end-line="50" />
+            <state relative-caret-position="-4">
+              <caret line="102" column="4" lean-forward="true" selection-start-line="102" selection-start-column="4" selection-end-line="102" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
+        <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="575">
-              <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+            <state relative-caret-position="-2406">
+              <caret line="169" column="24" selection-start-line="169" selection-start-column="24" selection-end-line="169" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="27" column="37" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="37" />
+            <state relative-caret-position="79">
+              <caret line="11" column="24" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="24" />
             </state>
           </provider>
         </entry>
@@ -122,14 +117,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>eAttendanceStatu</find>
-      <find>new Array</find>
-      <find>扫码</find>
-      <find>queryAttendanceList</find>
-      <find>@Component</find>
-      <find>@Aspect</find>
-      <find>@Around</find>
-      <find>appSecret</find>
       <find>DES</find>
       <find>@RestController</find>
       <find>repairAdminService</find>
@@ -146,12 +133,20 @@
       <find>deleteSmartUserById</find>
       <find>百胜删除</find>
       <find>delete</find>
-      <find>del</find>
       <find>deleteSma</find>
       <find>cardNo</find>
       <find>百胜</find>
       <find>SeewoDeleteStudent</find>
       <find>deleteOldParentShip</find>
+      <find>import</find>
+      <find>del</find>
+      <find>StringBuilder</find>
+      <find>readXlsx</find>
+      <find>queryInfoData</find>
+      <find>queryStudents</find>
+      <find>queryUserData</find>
+      <find>smartUserMap</find>
+      <find>smartGradeService</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -164,12 +159,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/EncryptUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/aop/DESResponseSecretAspect.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LogInfoController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAuthorGroupController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ExcelController.java" />
@@ -213,7 +202,13 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsDeleteStudentVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartUserVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
       </list>
     </option>
@@ -255,6 +250,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -331,6 +328,25 @@
               <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="utils" 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="controller" 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="core" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -340,7 +356,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -350,7 +366,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -360,7 +375,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="enumModel" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -410,8 +425,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -421,7 +434,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$/../../民宿/mhotel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../报修系统/repair_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" />
@@ -502,18 +515,23 @@
       <option name="presentableId" value="Default" />
       <updated>1707008840183</updated>
       <workItem from="1707008843054" duration="16121000" />
-      <workItem from="1708481187426" duration="78859000" />
+      <workItem from="1708481187426" duration="95784000" />
+      <workItem from="1709273149604" duration="2034000" />
+      <workItem from="1709278492162" duration="158000" />
+      <workItem from="1709278657210" duration="316000" />
+      <workItem from="1709278991764" duration="1308000" />
+      <workItem from="1709280327221" duration="15956000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="94980000" />
+    <option name="totallyTimeSpent" value="131677000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11673774" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.4420131" />
       <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" />
@@ -524,15 +542,15 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.33701658" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.8165746" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989059" weight="0.33260393" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4989059" weight="0.22651933" />
       <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" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" />
       <window_info anchor="bottom" id="Docker" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010941" side_tool="true" weight="0.3359116" />
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32928178" />
       <window_info anchor="bottom" id="Java Enterprise" order="12" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
@@ -542,7 +560,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.7461707" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.56892776" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -619,116 +637,33 @@
           <option name="timeStamp" value="57" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
-          <line>753</line>
-          <properties />
-          <option name="timeStamp" value="60" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
-          <line>748</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2004</line>
           <properties />
-          <option name="timeStamp" value="61" />
+          <option name="timeStamp" value="64" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java</url>
-          <line>741</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
+          <line>2027</line>
           <properties />
-          <option name="timeStamp" value="62" />
+          <option name="timeStamp" value="65" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2004</line>
+          <line>210</line>
           <properties />
-          <option name="timeStamp" value="64" />
+          <option name="timeStamp" value="66" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java</url>
-          <line>2027</line>
+          <line>217</line>
           <properties />
-          <option name="timeStamp" value="65" />
+          <option name="timeStamp" value="67" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-336">
-          <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScreenshotController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="31" column="10" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartSchoolController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="876">
-          <caret line="71" column="24" selection-start-line="71" selection-start-column="24" selection-end-line="71" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartNotificationController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMeterDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMeterController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="26" column="10" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartMenuController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="27" column="10" selection-start-line="27" selection-start-column="10" selection-end-line="27" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <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="101">
-          <caret line="37" column="3" selection-start-line="37" selection-start-column="3" selection-end-line="37" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <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="124">
-          <caret line="40" column="15" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartFreezeRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="78">
-          <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartFaceDiscernController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -799,13 +734,6 @@
         </state>
       </provider>
     </entry>
-    <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="78">
-          <caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartCarAccessController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="121">
@@ -931,13 +859,6 @@
         </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="170">
-          <caret line="422" column="34" lean-forward="true" selection-start-line="422" selection-start-column="34" selection-end-line="422" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eSexStatu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="575">
@@ -945,13 +866,6 @@
         </state>
       </provider>
     </entry>
-    <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="241">
-          <caret line="50" selection-start-line="50" selection-end-line="50" />
-        </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="-1173" />
@@ -971,59 +885,153 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/useridsRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="28">
-          <caret line="741" selection-start-line="741" selection-end-line="741" />
+        <state relative-caret-position="230">
+          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/StudentServiceBatchSaveClassStudentsParam.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1399">
+          <caret line="143" column="20" selection-start-line="143" selection-start-column="20" selection-end-line="143" selection-end-column="20" />
           <folding>
-            <element signature="e#23978#23979#0" expanded="true" />
-            <element signature="e#24010#24011#0" expanded="true" />
+            <element signature="e#3537#3538#0" expanded="true" />
+            <element signature="e#3589#3590#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.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="315">
-          <caret line="77" column="36" selection-start-line="77" selection-start-column="17" selection-end-line="77" selection-end-column="36" />
+        <state relative-caret-position="1366">
+          <caret line="272" column="20" lean-forward="true" selection-start-line="272" selection-start-column="20" selection-end-line="272" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/useridsRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange2.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        <state relative-caret-position="230">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/lang/StringBuilder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="27" column="37" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="37" />
+        <state relative-caret-position="295">
+          <caret line="134" column="25" selection-start-line="134" selection-start-column="25" selection-end-line="134" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eIdentityStatu.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        <state relative-caret-position="190">
+          <caret line="432" column="8" selection-start-line="432" selection-start-column="8" selection-end-line="432" selection-end-column="8" />
         </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/model/vo/ParentOfStudentsVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
+        </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="547">
-          <caret line="2558" column="8" selection-start-line="2558" selection-start-column="8" selection-end-line="2558" selection-end-column="8" />
+        <state relative-caret-position="281">
+          <caret line="130" column="39" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/HikvisionAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5944">
+          <caret line="740" column="5" lean-forward="true" selection-start-line="740" selection-start-column="5" selection-end-line="740" selection-end-column="5" />
           <folding>
-            <element signature="e#94443#94460#0" />
-            <element signature="e#96633#96648#0" />
-            <element signature="e#98960#98975#0" />
-            <element signature="e#110744#117713#0" />
-            <element signature="e#117719#118368#0" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ScorePageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="11" column="24" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <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="-4">
+          <caret line="102" column="4" lean-forward="true" selection-start-line="102" selection-start-column="4" selection-end-line="102" selection-end-column="4" />
+        </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="-2406">
+          <caret line="169" column="24" selection-start-line="169" selection-start-column="24" selection-end-line="169" selection-end-column="24" />
+        </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="690">
+          <caret line="39" column="34" selection-start-line="39" selection-start-column="16" selection-end-line="39" selection-end-column="34" />
+        </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="654">
+          <caret line="249" column="68" selection-start-line="249" selection-start-column="68" selection-end-line="249" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/SmartUserVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="654">
+          <caret line="50" column="26" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="50" selection-end-column="26" />
+        </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="578">
+          <caret line="190" column="13" selection-start-line="190" selection-start-column="13" selection-end-line="190" selection-end-column="13" />
+        </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="724">
+          <caret line="88" column="34" selection-start-line="88" selection-start-column="16" selection-end-line="88" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <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="518">
+          <caret line="2787" column="24" selection-start-line="2787" selection-start-column="20" selection-end-line="2787" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 9 - 1
src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -100,7 +100,7 @@ public interface SmartUserControllerAPI {
     CommonResult downloadUserExcel();
 
     /**
-     * 导出人员模板
+     * 根据用户ID查询学生
      * @return
      */
     @GetMapping(value = "/queryStudents")
@@ -124,4 +124,12 @@ public interface SmartUserControllerAPI {
     @ApiOperation(value = "绑定学生", notes = "绑定学生", httpMethod = "POST")
     CommonResult bindStudent(@Validated @RequestBody bindStudentRequest isur, BindingResult bindingResult);
 
+
+    /**
+     * 根据数据ID获取用户信息
+     */
+    @GetMapping(value = "/queryUserData")
+    @ApiOperation(value = "根据数据ID获取用户信息", notes = "根据数据ID获取用户信息", httpMethod = "GET")
+    CommonResult queryUserData(@RequestParam int id);
+
 }

+ 11 - 20
src/main/java/com/template/common/utils/TimeExchange.java

@@ -7,10 +7,9 @@ import com.template.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
-import java.math.BigDecimal;
+import java.sql.Array;
 import java.sql.Timestamp;
 import java.text.DateFormat;
-import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
@@ -735,24 +734,16 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) {
-        findTheDifference();
-    }
-
-    public static char findTheDifference() {
-        String s = "abcd";
-        String t = "abcde";
-
-        if(s.length() > t.length()){
-            for (int i = 0;i<t.length();i++){
-                s = s.replaceFirst(String.valueOf(t.charAt(i)),"");
-            }
-            return s.charAt(0);
-        }else{
-            for (int i = 0;i<=s.length();i++){
-                t = t.replaceFirst(String.valueOf(s.charAt(i)),"");
-            }
-            return t.charAt(0);
-        }
+        String[] s = new String[]{"5","2","C","D","+"};
+
+        int sds = calPoints(s);
+        String sdsd = "";
+    }
+
+
+    public static int calPoints(String[] operations) {
+
+        return 0;
     }
 
 }

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

@@ -2782,5 +2782,12 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         return updateResult > 0 ? CommonResult.ok("绑定成功") : CommonResult.fail("绑定失败");
     }
+
+    @Override
+    public CommonResult queryUserData(int id) {
+        SmartUserVo user = smartUserService.querySmartUserById(id);
+
+        return CommonResult.ok(user);
+    }
 }
 

+ 3 - 4
src/main/java/com/template/mapper/SmartUserMapper.java

@@ -5,10 +5,7 @@ import com.template.model.dto.WarningUserDto;
 import com.template.model.pojo.SmartUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.template.model.vo.AffiliateParentVo;
-import com.template.model.vo.AffiliateUserVo;
-import com.template.model.vo.GradeVo;
-import com.template.model.vo.UserVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -39,4 +36,6 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
     List<AffiliateParentVo> queryAffiliateParents(@Param("userId") Integer userId);
 
     List<SmartUser> getAffiliateList(@Param("id")Integer id);
+
+    SmartUserVo querySmartUserById(@Param("userId") Integer userId);
 }

+ 53 - 0
src/main/java/com/template/model/vo/SmartUserVo.java

@@ -0,0 +1,53 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/4 星期一 15:57
+ * @Description: com.template.model.vo
+ * @Version: 1.0
+ */
+@Data
+public class SmartUserVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 年级
+     */
+    private String grade;
+
+    /**
+     * 年级ID
+     */
+    private String gradeId;
+
+    /**
+     * 班级
+     */
+    private String schoolClass;
+
+    /**
+     * 班级ID
+     */
+    private String schoolClassId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 学号
+     */
+    private String cardNo;
+
+}

+ 2 - 0
src/main/java/com/template/services/SmartUserService.java

@@ -85,4 +85,6 @@ public interface SmartUserService extends IService<SmartUser> {
     List<SmartUser> getAffiliateList(Integer id);
 
     List<SmartUser> querySmartUserByCardNos(List<String> cardNos);
+
+    SmartUserVo querySmartUserById(Integer id);
 }

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

@@ -244,4 +244,11 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         List<SmartUser> result = smartUserMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public SmartUserVo querySmartUserById(Integer id) {
+        SmartUserVo result = smartUserMapper.querySmartUserById(id);
+
+        return null;
+    }
 }

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

@@ -170,4 +170,25 @@
         </if>
     </select>
 
+
+    <resultMap type="com.template.model.vo.SmartUserVo" id="smartUserMap">
+        <result property="id" column="id"/>
+        <result property="grade" column="grade"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="schoolClass" column="school_class"/>
+        <result property="schoolClassId" column="school_class_id"/>
+        <result property="name" column="name"/>
+        <result property="cardNo" column="card_no"/>
+    </resultMap>
+    <select id="querySmartUserById" resultType="com.template.model.vo.SmartUserVo" resultMap="smartUserMap">
+        select su.id,sg.name as geade,sg.id as grade_id,sc.name as school_class,sc.id as school_class_id,su.name,su.card_no
+        from smart_user su
+        left join smart_grade sg on sg.id = su.grade and sg.deleted = 0
+        left join smart_class sc on sc.id = su.school_class and sc.deleted = 0
+        where su.deleted = 0
+        <if test="userId != null and userId != '' and userId != 0">
+            and su.id = #{userId}
+        </if>
+    </select>
+
 </mapper>

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

@@ -170,4 +170,25 @@
         </if>
     </select>
 
+
+    <resultMap type="com.template.model.vo.SmartUserVo" id="smartUserMap">
+        <result property="id" column="id"/>
+        <result property="grade" column="grade"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="schoolClass" column="school_class"/>
+        <result property="schoolClassId" column="school_class_id"/>
+        <result property="name" column="name"/>
+        <result property="cardNo" column="card_no"/>
+    </resultMap>
+    <select id="querySmartUserById" resultType="com.template.model.vo.SmartUserVo" resultMap="smartUserMap">
+        select su.id,sg.name as geade,sg.id as grade_id,sc.name as school_class,sc.id as school_class_id,su.name,su.card_no
+        from smart_user su
+        left join smart_grade sg on sg.id = su.grade and sg.deleted = 0
+        left join smart_class sc on sc.id = su.school_class and sc.deleted = 0
+        where su.deleted = 0
+        <if test="userId != null and userId != '' and userId != 0">
+            and su.id = #{userId}
+        </if>
+    </select>
+
 </mapper>

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

@@ -327,6 +327,7 @@ com\template\model\seewo\TeacherServiceBatchRemoveTeachersRequest.class
 com\template\model\vo\SemesterVo.class
 com\template\api\SmartApplyControllerAPI.class
 com\template\model\seewo\StudentServiceRemoveClassStudentsParam$StudentServiceRemoveClassStudentsParamBuilder.class
+com\template\model\vo\SmartUserVo.class
 com\template\model\enumModel\eStatu.class
 com\template\services\SmartVisitorService.class
 com\template\mapper\SmartDataClassMapper.class

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

@@ -422,6 +422,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartSubjectManageService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\StudentServiceRemoveClassStudentsParam.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartEvaluateTdetailServiceImpl.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\SmartUserVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartIdentityServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\TimeExchange2.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartMenu.java

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