时间组

.idea/workspace.xml

@@ -5,16 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.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/model/vo/UserVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.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$/target/" />
@@ -45,85 +39,98 @@
   <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/api/SmartIdentityControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="654">
-              <caret line="43" column="39" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="39" />
+            <state relative-caret-position="175">
+              <caret line="331" column="17" lean-forward="true" selection-start-line="331" selection-start-column="17" selection-end-line="331" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.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="608">
-              <caret line="45" column="43" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="43" />
+            <state relative-caret-position="-352">
+              <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" 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/controller/SmartApplyController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="447">
-              <caret line="139" column="19" selection-start-line="139" selection-start-column="19" selection-end-line="139" selection-end-column="19" />
+            <state relative-caret-position="378">
+              <caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
+              <folding>
+                <element signature="e#1965#1966#0" expanded="true" />
+                <element signature="e#2024#2025#0" expanded="true" />
+                <element signature="e#2022#2023#0" expanded="true" />
+                <element signature="e#2072#2073#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/vo/ApplysVo.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
+            <state relative-caret-position="207">
+              <caret line="9" column="22" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="22" />
             </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/model/vo/WechatUserVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="266">
-              <caret line="162" column="19" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
+            <state relative-caret-position="560">
+              <caret line="79" column="7" selection-start-line="79" selection-start-column="7" selection-end-line="79" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.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="631">
-              <caret line="78" column="45" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="45" />
+            <state relative-caret-position="450">
+              <caret line="1465" column="71" selection-start-line="1465" selection-start-column="52" selection-end-line="1465" selection-end-column="71" />
+              <folding>
+                <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+                <element signature="method#readXlsx#0;class#SmartUserController#0" />
+                <element signature="method#readXls#0;class#SmartUserController#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.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="621">
-              <caret line="33" column="41" selection-start-line="33" selection-start-column="41" selection-end-line="33" selection-end-column="41" />
+            <state relative-caret-position="361">
+              <caret line="61" column="66" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="66" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </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="295">
-              <caret line="204" column="133" selection-start-line="204" selection-start-column="103" selection-end-line="204" selection-end-column="133" />
+            <state relative-caret-position="131">
+              <caret line="20" column="44" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
-              <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="105">
+              <caret line="42" column="47" lean-forward="true" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
             </state>
           </provider>
         </entry>
@@ -139,11 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Menu</find>
-      <find>getSmartDutiesByCategoryId</find>
-      <find>requ</find>
-      <find>smartClassService</find>
-      <find>students</find>
       <find>attendance</find>
       <find>getEndOfDay</find>
       <find>openapi.szymzh.com/Api</find>
@@ -169,6 +171,11 @@
       <find>.collect</find>
       <find>applys</find>
       <find>queryIdentityApplyById</find>
+      <find>vertify&quot;</find>
+      <find>vertify</find>
+      <find>queryPageSmartUser</find>
+      <find>result</find>
+      <find>querySmartUserPages</find>
     </findStrings>
     <replaceStrings>
       <replace>班级</replace>
@@ -192,9 +199,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertDutiesRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDutiesServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartMenuServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartDutiesControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/seewo/TeacherServiceBatchSetClassMastersParam.java" />
@@ -238,11 +242,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java" />
       </list>
     </option>
   </component>
@@ -273,7 +280,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -381,16 +388,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="pojo" 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" />
               <item name="vo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -445,6 +442,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="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RebelAgentSelection">
@@ -594,15 +592,15 @@
       <workItem from="1705547111998" duration="20000" />
       <workItem from="1705388695984" duration="51258000" />
       <workItem from="1705885614332" duration="695000" />
-      <workItem from="1705886328968" duration="6477000" />
+      <workItem from="1705886328968" duration="10565000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="421435000" />
+    <option name="totallyTimeSpent" value="425523000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="JRebel" order="0" side_tool="true" />
@@ -613,10 +611,10 @@
       <window_info id="Designer" order="5" />
       <window_info id="Web" order="6" side_tool="true" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.49562362" />
+      <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.15831557" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3127072" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.309628" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.5160221" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -631,7 +629,7 @@
       <window_info anchor="bottom" id="Version Control" order="14" />
       <window_info anchor="bottom" id="JRebel Executor" order="15" />
       <window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
-      <window_info anchor="right" id="Maven" order="0" weight="0.5820569" />
+      <window_info anchor="right" id="Maven" order="0" weight="0.6827133" />
       <window_info anchor="right" id="Palette" order="1" />
       <window_info anchor="right" id="Capture Analysis" order="2" />
       <window_info anchor="right" id="Database" order="3" weight="0.32962137" />
@@ -771,55 +769,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartGradeMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartAuthorGroupMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="43" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartAuthorGroupMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="20" column="43" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.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/services/SmartAuthorGroupService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/stream/Stream.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="853" column="9" selection-start-line="853" selection-start-column="9" selection-end-line="853" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eDuties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="9" column="19" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SystemUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="506">
@@ -834,13 +783,6 @@
         </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="479">
-          <caret line="126" column="52" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAuthorGroupServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -855,13 +797,6 @@
         </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="401">
-          <caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartVisitorService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="460">
@@ -1037,25 +972,6 @@
         </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="189">
-          <caret line="826" column="17" selection-start-line="826" selection-start-column="17" selection-end-line="826" selection-end-column="17" />
-          <folding>
-            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
-            <element signature="method#readXlsx#0;class#SmartUserController#0" />
-            <element signature="method#readXls#0;class#SmartUserController#0" />
-          </folding>
-        </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="276">
-          <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -1098,47 +1014,131 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="654">
+          <caret line="43" column="39" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
+        <state relative-caret-position="631">
           <caret line="45" column="43" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="43" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="139" column="19" selection-start-line="139" selection-start-column="19" selection-end-line="139" selection-end-column="19" />
+        <state relative-caret-position="562">
+          <caret line="143" column="29" selection-start-line="138" selection-start-column="12" selection-end-line="143" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.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="345">
-          <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
+        <state relative-caret-position="217">
+          <caret line="169" lean-forward="true" selection-start-line="169" selection-end-line="169" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="654">
-          <caret line="43" column="39" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="39" />
+        <state relative-caret-position="391">
+          <caret line="79" column="30" selection-start-line="79" selection-start-column="30" selection-end-line="79" selection-end-column="30" />
         </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/common/utils/JWTUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="162" column="19" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
+        <state relative-caret-position="105">
+          <caret line="42" column="47" lean-forward="true" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+        <state relative-caret-position="175">
+          <caret line="331" column="17" lean-forward="true" selection-start-line="331" selection-start-column="17" selection-end-line="331" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="560">
+          <caret line="79" column="7" selection-start-line="79" selection-start-column="7" selection-end-line="79" selection-end-column="7" />
+        </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="-352">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </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="450">
+          <caret line="1465" column="71" selection-start-line="1465" selection-start-column="52" selection-end-line="1465" selection-end-column="71" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="method#importZipUsers#0;class#SmartUserController#0" />
+            <element signature="method#readXlsx#0;class#SmartUserController#0" />
+            <element signature="method#readXls#0;class#SmartUserController#0" />
+          </folding>
+        </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="61" column="66" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SystemUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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="131">
+          <caret line="20" column="44" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="9" column="22" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="154" column="31" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
+          <folding>
+            <element signature="e#1965#1966#0" expanded="true" />
+            <element signature="e#2024#2025#0" expanded="true" />
+            <element signature="e#2022#2023#0" expanded="true" />
+            <element signature="e#2072#2073#0" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -10,6 +10,7 @@ import com.template.model.request.insertIdentityRequest;
 import com.template.model.request.updateIdentityRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.ApplysVo;
 import com.template.model.vo.IdentityApplyVo;
 import com.template.model.vo.SemesterVo;
 import com.template.services.SmartApplyService;
@@ -160,7 +161,7 @@ public class SmartIdentityController implements SmartIdentityControllerAPI {
     @Override
     public CommonResult queryIdentityApplyById(int id) {
 
-        IdentityApplyVo result = new IdentityApplyVo();
+        List<ApplysVo> result = new ArrayList<>();
 
         SmartIdentity identity = smartIdentityService.getSmartById(id);
         if (identity == null) {
@@ -176,20 +177,19 @@ public class SmartIdentityController implements SmartIdentityControllerAPI {
             return CommonResult.fail("应用管理数据为空");
         }
 
-        result.setId(id);
-        result.setIdentityName(identity.getName());
-
-        List<String> applyNames = new ArrayList<>();
         List<String> applyIds = Arrays.asList(identity.getApplyId().split(","));
         for (String applyId : applyIds) {
             Optional<SmartApply> applyData = applys.stream().filter(e -> e.getId().equals(Integer.valueOf(applyId))).findFirst();
             if(applyData != null && applyData.isPresent()){
-                applyNames.add(applyData.get().getName());
+                ApplysVo data = new ApplysVo();
+                data.setId(applyData.get().getId());
+                data.setPath(applyData.get().getRoute());
+                data.setTitle(applyData.get().getName());
+                data.setUrl(applyData.get().getLogo());
+                result.add(data);
             }
         }
 
-        result.setApplyName(applyNames);
-
         return CommonResult.ok(result);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import com.template.model.enumModel.eTimeGroup;
 import lombok.Data;
 
 import java.util.List;
@@ -148,4 +149,21 @@ public class UserVo {
      */
     private String duties;
 
+    /**
+     * 时间组
+     */
+    private Integer timeGroupId;
+
+    /**
+     * 时间组名称
+     */
+    private String timeGroupName;
+
+    public String getTimeGroupName() {
+        return eTimeGroup.stringOfName(timeGroupId);
+    }
+
+    public void setTimeGroupName(String timeGroupName) {
+        this.timeGroupName = timeGroupName;
+    }
 }

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

@@ -0,0 +1,171 @@
+package com.template.model.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SmartUser对象", description="")
+public class WechatUserVo implements Serializable {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 编号（学号）
+     */
+    private String cardNo;
+
+    /**
+     * 时间组
+     */
+    private Integer timeGroupId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份ID
+     */
+    private Integer identityId;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 性别
+     * 女：0
+     * 男：1
+     */
+    private Integer sexId;
+
+    /**
+     * 部门ID
+     */
+    private Integer departmentId;
+
+    /**
+     * 部门
+     */
+    private String departmentStr;
+
+    /**
+     * 人脸照片
+     */
+    private String headImage;
+
+    /**
+     * 年级
+     */
+    private String grade;
+
+    @ApiModelProperty(value = "学院")
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String speciality;
+
+    @ApiModelProperty(value = "班级")
+    private Integer schoolClass;
+
+    @ApiModelProperty(value = "校区")
+    private String campus;
+
+    @ApiModelProperty(value = "宿舍号")
+    private String dormitoryNumber;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "关联人 被关联用户的ID 多个用户用逗号隔开")
+    private String affiliate;
+
+    @ApiModelProperty(value = "职称")
+    private String title;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String address;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "生源地")
+    private String ofStudent;
+
+    @ApiModelProperty(value = "毕业学校")
+    private String graduate;
+
+    @ApiModelProperty(value = "职务")
+    private Integer duties;
+
+    @ApiModelProperty(value = "是否推送公众号信息  不推送：0 推送：1")
+    private Integer isPush;
+
+    @ApiModelProperty(value = "是否注销  未注销：0  注销：1")
+    private Integer isCancel;
+
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+
+    @ApiModelProperty(value = "小程序openId")
+    private String xOpenId;
+
+    @ApiModelProperty(value = "公众号openId")
+    private String gzhOpenId;
+
+    @ApiModelProperty(value = "希沃学生UID")
+    private String xwStudentUid;
+
+    @ApiModelProperty(value = "百胜学生编号")
+    private String bsStudentNo;
+
+    @ApiModelProperty(value = "希沃教师工号")
+    private String xwTeacherCode;
+
+    @ApiModelProperty(value = "百胜教师编号")
+    private String bsStaffCode;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

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

@@ -41,10 +41,11 @@
         <result property="ofStudent" column="of_student"/>
         <result property="graduate" column="graduate"/>
         <result property="duties" column="duties"/>
+        <result property="timeGroupId" column="time_group_id"/>
     </resultMap>
     <select id="querySmartUserPages" resultType="com.template.model.vo.UserVo" resultMap="smartUserPageMap">
         select id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
-        phone,affiliate,title,address,nation,of_student,graduate,duties
+        phone,affiliate,title,address,nation,of_student,graduate,duties,time_group_id
         from smart_user
         where deleted = 0 and is_cancel = 0
         <if test="departmentIds != null and departmentIds.size() > 0">

target/classes/mapper/template/SmartUserMapper.xml

@@ -41,10 +41,11 @@
         <result property="ofStudent" column="of_student"/>
         <result property="graduate" column="graduate"/>
         <result property="duties" column="duties"/>
+        <result property="timeGroupId" column="time_group_id"/>
     </resultMap>
     <select id="querySmartUserPages" resultType="com.template.model.vo.UserVo" resultMap="smartUserPageMap">
         select id,card_no,name,identity_id,id_card,sex_id,department_id,head_image,grade,college,speciality,school_class,campus,dormitory_number,
-        phone,affiliate,title,address,nation,of_student,graduate,duties
+        phone,affiliate,title,address,nation,of_student,graduate,duties,time_group_id
         from smart_user
         where deleted = 0 and is_cancel = 0
         <if test="departmentIds != null and departmentIds.size() > 0">