溪鸭夏 2 years ago
parent
commit
0c9c44c284

+ 291 - 227
.idea/workspace.xml

@@ -2,8 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="981dbcd1-a700-4015-8567-2ccff8e76f0a" name="Default Changelist" comment="">
-      <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$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAccessState.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/SmartVisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDeviceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartDeviceService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartVisitorService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartVisitorService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDeviceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDeviceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.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$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -21,8 +30,8 @@
       <file pinned="false" current-in-tab="false">
         <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="2277">
-              <caret line="99" column="46" selection-start-line="99" selection-start-column="27" selection-end-line="99" selection-end-column="46" />
+            <state relative-caret-position="407">
+              <caret line="97" column="32" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="32" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -31,65 +40,50 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="-157">
-              <caret line="4439" column="66" selection-start-line="4439" selection-start-column="49" selection-end-line="4439" selection-end-column="66" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="529">
-              <caret line="28" column="7" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="7" />
+            <state relative-caret-position="130">
+              <caret line="365" column="108" selection-start-line="365" selection-start-column="108" selection-end-line="365" selection-end-column="108" />
             </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/pojo/SmartScore.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="538">
-              <caret line="98" column="37" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="37" />
+            <state relative-caret-position="175">
+              <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.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="143">
-              <caret line="289" column="72" selection-start-line="289" selection-start-column="72" selection-end-line="289" selection-end-column="72" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#6229#6230#0" expanded="true" />
-                <element signature="e#6288#6289#0" expanded="true" />
-                <element signature="e#7259#7260#0" expanded="true" />
-                <element signature="e#7315#7316#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="333">
+              <caret line="157" lean-forward="true" selection-start-line="157" selection-end-line="157" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartFamilyIndexService.java">
+        <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="414">
-              <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
+            <state relative-caret-position="313">
+              <caret line="57" column="73" selection-start-line="57" selection-start-column="73" selection-end-line="57" selection-end-column="73" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartFamilyIndexServiceImpl.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="1219">
-              <caret line="63" column="32" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="32" />
+            <state relative-caret-position="112">
+              <caret line="2850" column="16" selection-start-line="2850" selection-start-column="16" selection-end-line="2850" selection-end-column="16" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#131543#134262#0" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -98,17 +92,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>百胜删除</find>
-      <find>delete</find>
-      <find>bindStudent</find>
-      <find>queryAffiliateUserById</find>
-      <find>importZipUsers</find>
-      <find>save</find>
-      <find>StringUtils.has</find>
-      <find>条</find>
-      <find>不能为空</find>
-      <find>希沃</find>
-      <find>ParentServiceBatchSaveOrUpdateParentsParam</find>
       <find>studentDatas</find>
       <find>seewoDatas</find>
       <find>Batch</find>
@@ -122,12 +105,23 @@
       <find>classData</find>
       <find>update</find>
       <find>updateSmartUserById</find>
-      <find>insertSmartUser</find>
       <find>deleteSmartUserById</find>
       <find>ParentServiceRemoveStudentParentConditionParam</find>
       <find>deleteOldStudentParentShip</find>
       <find>queryClassUser</find>
       <find>queryUsersByClass</find>
+      <find>扫码解析</find>
+      <find>设备</find>
+      <find>smartDeviceService</find>
+      <find>default:</find>
+      <find>找家长</find>
+      <find>getDate</find>
+      <find>&quot;yyyy-MM-dd</find>
+      <find>qiv</find>
+      <find>insert</find>
+      <find>insertSmartUser</find>
+      <find>添加</find>
+      <find>bsInsertVisitor</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -142,9 +136,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartTemplateRuleMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartTimeGroupMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartSubjectTemplateMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsTimeGroupVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsTimeGroupNoListVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/BsTimeGroupNoVo.java" />
@@ -152,7 +143,6 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartUserMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/ClassYear.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartTimeGroupServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartTimeGroupService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java" />
@@ -174,12 +164,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eQrcodeType.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartFamilyIndexController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartFamilyIndexMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartFamilyIndex.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClassUserDetailVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java" />
@@ -190,6 +178,15 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAccessStatu.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAccessState.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartDeviceService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDeviceServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartVisitorService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
       </list>
     </option>
   </component>
@@ -221,7 +218,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="width" value="958" />
     <option name="height" value="1039" />
@@ -231,7 +228,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -300,6 +296,16 @@
               <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" />
+              <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="pojo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -350,6 +356,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -369,16 +376,16 @@
     <selection>jr</selection>
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.template.model.enumModel" />
       <recent name="com.template.model.request" />
       <recent name="com.template.model.vo" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\resources\mapper\template" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -434,18 +441,20 @@
       <workItem from="1713507889834" duration="7494000" />
       <workItem from="1713599046631" duration="2336000" />
       <workItem from="1713744476558" duration="51564000" />
-      <workItem from="1713921895618" duration="1007000" />
+      <workItem from="1713921895618" duration="1057000" />
+      <workItem from="1713938767610" duration="4336000" />
+      <workItem from="1713943559192" duration="2008000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="155066000" />
+    <option name="totallyTimeSpent" value="161460000" />
   </component>
   <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" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26652452" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.24733475" />
       <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" />
@@ -456,8 +465,8 @@
       <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" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.45076588" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.09409191" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.45966852" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.091712706" />
       <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" />
@@ -474,7 +483,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.24945295" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.7571116" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.96659243" />
       <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" />
@@ -483,6 +492,45 @@
       <window_info anchor="right" id="JRebel Setup Guide" order="9" side_tool="true" />
       <window_info anchor="right" id="Bean Validation" order="10" />
     </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" weight="0.18070363" />
+      <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" />
+      <window_info id="Image Layers" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="UI Designer" order="6" />
+      <window_info id="Favorites" order="7" side_tool="true" />
+      <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" weight="0.32932165" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.45524862" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.09299781" />
+      <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" weight="0.32932165" />
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.32932165" />
+      <window_info anchor="bottom" id="Docker" order="9" weight="0.32932165" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32822758" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.32932165" />
+      <window_info anchor="bottom" id="Database Changes" order="13" />
+      <window_info anchor="bottom" id="Version Control" order="14" weight="0.32932165" />
+      <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="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.24945295" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.84792125" />
+      <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" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="JRebel Setup Guide" order="9" side_tool="true" />
+      <window_info anchor="right" id="Bean Validation" order="10" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -598,6 +646,24 @@
           <properties />
           <option name="timeStamp" value="174" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java</url>
+          <line>296</line>
+          <properties />
+          <option name="timeStamp" value="176" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java</url>
+          <line>455</line>
+          <properties />
+          <option name="timeStamp" value="177" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java</url>
+          <line>154</line>
+          <properties />
+          <option name="timeStamp" value="178" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -606,128 +672,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="38" column="7" selection-start-line="38" selection-start-column="7" selection-end-line="38" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartQrcodeService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/qrCodeVo.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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="509">
-          <caret line="97" column="47" selection-start-line="97" selection-start-column="24" selection-end-line="97" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eQrcodeType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="11" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="11" />
-        </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="66">
-          <caret line="4" column="29" lean-forward="true" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
-        </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="401">
-          <caret line="56" column="16" selection-start-line="56" selection-start-column="16" selection-end-line="56" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="24" column="4" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartVisitorControllerAPI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="46" column="35" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="35" column="51" selection-start-line="35" selection-start-column="48" selection-end-line="35" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="591" column="58" selection-start-line="591" selection-start-column="37" selection-end-line="591" selection-end-column="58" />
-          <folding>
-            <element signature="e#24055#24069#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartVisitorMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="96" column="31" lean-forward="true" selection-start-line="96" selection-start-column="31" selection-end-line="96" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/seewo/ParentServiceBatchSaveOrUpdateParentsParam.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1115">
-          <caret line="265" column="38" selection-start-line="265" selection-start-column="38" selection-end-line="265" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/bindStudentRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </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="299">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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="154">
-          <caret line="9" column="16" lean-forward="true" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/AutoCode.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1058">
@@ -777,20 +721,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="47" column="49" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
-        </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="816">
-          <caret line="709" column="20" selection-start-line="709" selection-start-column="20" selection-end-line="711" selection-end-column="21" />
-        </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="253">
@@ -915,16 +845,6 @@
         </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="2277">
-          <caret line="99" column="46" selection-start-line="99" selection-start-column="27" selection-end-line="99" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertSmartUserRequest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="529">
@@ -946,37 +866,181 @@
         </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/services/impl/SmartUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-157">
-          <caret line="4439" column="66" selection-start-line="4439" selection-start-column="49" selection-end-line="4439" selection-end-column="66" />
+        <state relative-caret-position="724">
+          <caret line="294" selection-start-line="294" selection-end-line="294" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#6229#6230#0" expanded="true" />
+            <element signature="e#6288#6289#0" expanded="true" />
+            <element signature="e#7259#7260#0" expanded="true" />
+            <element signature="e#7315#7316#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eAccessState.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="9" column="24" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/qrCodeVo.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartDeviceService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="30" column="45" selection-start-line="30" selection-start-column="45" selection-end-line="30" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartDeviceServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="654">
+          <caret line="73" column="39" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/turnOnTheDeviceRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="26" column="27" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="49" column="20" selection-start-line="49" selection-start-column="20" selection-end-line="49" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eFreezeRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="529">
+          <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        </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="538">
-          <caret line="98" column="37" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="37" />
+        <state relative-caret-position="379">
+          <caret line="84" column="36" selection-start-line="84" selection-start-column="20" selection-end-line="84" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartQrcode.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="471">
+          <caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
+        </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="736">
+          <caret line="56" column="16" selection-start-line="56" selection-start-column="16" selection-end-line="56" selection-end-column="16" />
+        </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="759">
+          <caret line="40" column="17" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2300">
+          <caret line="117" column="5" selection-start-line="117" selection-start-column="5" selection-end-line="117" selection-end-column="5" />
+        </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="230">
+          <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eQrcodeType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="11" column="23" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="23" />
+        </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="143">
-          <caret line="289" column="72" selection-start-line="289" selection-start-column="72" selection-end-line="289" selection-end-column="72" />
+        <state relative-caret-position="112">
+          <caret line="2850" column="16" selection-start-line="2850" selection-start-column="16" selection-end-line="2850" selection-end-column="16" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#6229#6230#0" expanded="true" />
-            <element signature="e#6288#6289#0" expanded="true" />
-            <element signature="e#7259#7260#0" expanded="true" />
-            <element signature="e#7315#7316#0" expanded="true" />
+            <element signature="e#131543#134262#0" />
           </folding>
         </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="407">
+          <caret line="97" column="32" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" 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="313">
+          <caret line="57" column="73" selection-start-line="57" selection-start-column="73" selection-end-line="57" selection-end-column="73" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="365" column="108" selection-start-line="365" selection-start-column="108" selection-end-line="365" selection-end-column="108" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartScore.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
+        </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="333">
+          <caret line="157" lean-forward="true" selection-start-line="157" selection-end-line="157" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -55,7 +55,7 @@ public class TimeExchange {
      */
     public static String DateToString(Date time) {
         String dateStr = "";
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:sss");
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             dateStr = dateFormat.format(time);
             System.out.println(dateStr);

+ 101 - 25
src/main/java/com/template/controller/SmartVisitorController.java

@@ -403,7 +403,6 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     }
 
 
-
     @Override
     public CommonResult testVisitorDevice(int id, String deviceNo) throws Exception {
         SmartUser user = smartUserService.getSmartById(id);
@@ -429,15 +428,15 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
      * 1、学生请假:
      * 我们这边调用请假接口之后,把请假数据写到了百胜系统的"学生请假登记"页面中,那到时候学生是通过任意设备都能进出吗?
      * 即:万载三中有 A、B、C、D四台门禁设备,学生张三 2024-03-01 10:00:00 到 2024-03-01 12:00:00 请假,张三 2024-03-01 10:10:00的时候能否通过A、B、C、D四台门禁设备?
-     *
+     * <p>
      * 注:如果要修改请假数据则要先修改系统中的学生编码,再去新增一条请假数据
      * 即:修改了这个学生编码之后再下发请假数据的话,原有的该学号的请假数据就会在设备中被清除
-     *
+     * <p>
      * 2、访客设备:
      * 我们这边调用门禁访客设备接口,是把数据下发到系统还是到门禁设备?
      * 如果是写到门禁的话,后续添加访客数据是否会清除之前的所有已写入的访客数据?
-     *
-     *
+     * <p>
+     * <p>
      * 答:
      * 1、请假数据会自动会同步到设备
      * 2、访客数据是下发到门禁设备的,访客数据有效期到了之后会自动被清除掉;如果删除系统中的用户数据会自动把门禁中的用户数据也删掉,如果是已有的则进行更新操作;
@@ -600,11 +599,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
      * 1.1、如果是老师 任意通行
      * 1.2、如果是家长 找有没有访客数据
      * 1.3、如果是学生 不让通行
-     *
+     * <p>
      * 2、访客码
      * 2.1、找下是否存在访客预约记录
-     *
+     * <p>
      * 扫码记录增加是否已进 和 是否已出字段
+     *
      * @param data
      * @return
      * @throws JsonProcessingException
@@ -679,21 +679,17 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         QrcodeImageVo qiv = objectMapper.readValue(codeVo.getQrCode(), QrcodeImageVo.class);
         System.out.println("进入扫码解析10");
 
-        if(qiv.getType().intValue() == eQrcodeType.Identity.getValue()){//身份码
-            /**
-             * 1、身份码逻辑
-             * 1.1、如果是老师 任意通行
-             * 1.2、如果是家长 找有没有访客数据
-             * 1.3、如果是学生 不让通行
-             */
-            SmartUser user = smartUserService.getSmartById(qiv.getId());
-            if (user == null) {
-                result.setResultcode(2);
-                result.setMessage("用户身份无效,刷码失败");
-                result.setActionName("qrCodePush");
-                return result;
-            }
+        SmartDevice deviceData = smartDeviceService.queryDeviceByNum(data.getDeviceno());
+        if (deviceData == null) {
+            System.out.println("进入扫码解析11");
+            result.setResultcode(2);
+            result.setMessage("设备不存在");
+            result.setActionName("qrCodePush");
+            return result;
+        }
 
+        if (qiv.getType().intValue() == eQrcodeType.Identity.getValue()) {//身份码
+            //身份码中的ID是身份码ID
             System.out.println("进入身份码扫码解析1");
             //目前二维码一分钟内有效
             //过期:(时间戳 + 有效期分钟数)<= 当前时间
@@ -709,11 +705,59 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 return result;
             }
             System.out.println("进入身份码扫码解析2");
+
+            SmartUser user = smartUserService.getSmartById(qiv.getId());
+            if (user == null) {
+                result.setResultcode(2);
+                result.setMessage("用户身份无效,刷码失败");
+                result.setActionName("qrCodePush");
+                return result;
+            }
+
             //成功后将刷码记录存储到数据表中
             SmartQrcode sq = new SmartQrcode();
-            sq.setUserId(0);
-            sq.setSourceCode(data.getData());
-            sq.setIsSuccess(1);
+            /**
+             * 1、身份码逻辑
+             * 1.1、如果是老师 任意通行
+             * 1.2、如果是家长 找有没有访客数据
+             * 1.3、如果是学生 不让通行
+             */
+            switch (user.getIdentityId().intValue()) {
+                case 1://家长
+                    //查找是否存在访客记录
+                    SmartVisitor visitor = smartVisitorService.queryParentVisitor(user.getId());
+                    if(visitor == null){
+                        System.out.println("无访客数据,家长无法通行");
+                        result.setResultcode(2);
+                        result.setMessage("无访客数据,家长无法通行");
+                        result.setActionName("qrCodePush");
+                        return result;
+                    }
+
+                    sq.setUserId(qiv.getId());
+                    sq.setQrcodeType(qiv.getType());
+                    sq.setSourceCode(data.getData());
+                    sq.setDataId(visitor.getId());
+                    sq.setIsSuccess(1);
+                    sq.setAccessState(deviceData.getEntrance());
+                    break;
+                case 2://学生
+                    System.out.println("学生无法使用身份码通行");
+                    result.setResultcode(2);
+                    result.setMessage("学生无法使用身份码通行");
+                    result.setActionName("qrCodePush");
+                    return result;
+                case 3://老师
+                    sq.setUserId(qiv.getId());
+                    sq.setQrcodeType(qiv.getType());
+                    sq.setSourceCode(data.getData());
+                    sq.setDataId(0);
+                    sq.setIsSuccess(1);
+                    sq.setAccessState(deviceData.getEntrance());
+                    break;
+                default:
+                    break;
+            }
 
             System.out.println("进入身份码扫码解析3");
             int insertResult = smartQrcodeService.insertSmartQrcode(sq);
@@ -729,8 +773,40 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             result.setActionName("qrCodePush");
 
             System.out.println("进入身份码扫码解析,结果:" + JSON.toJSON(result));
-        }else if(qiv.getType().intValue() == eQrcodeType.Visitor.getValue()){//访客码
+        } else if (qiv.getType().intValue() == eQrcodeType.Visitor.getValue()) {//访客码
+            //访客码中的ID是访客数据的ID
+            //查找是否存在访客记录
+            SmartVisitor visitor = smartVisitorService.getSmartById(qiv.getId());
+            if(visitor == null){
+                System.out.println("无访客数据,访客无法通行");
+                result.setResultcode(2);
+                result.setMessage("无访客数据,访客无法通行");
+                result.setActionName("qrCodePush");
+                return result;
+            }
+            //成功后将刷码记录存储到数据表中
+            SmartQrcode sq = new SmartQrcode();
+            sq.setUserId(visitor.getUserId());
+            sq.setQrcodeType(qiv.getType());
+            sq.setSourceCode(data.getData());
+            sq.setDataId(visitor.getId());
+            sq.setIsSuccess(1);
+            sq.setAccessState(deviceData.getEntrance());
+
+            System.out.println("进入访客码扫码解析3");
+            int insertResult = smartQrcodeService.insertSmartQrcode(sq);
+            if (insertResult <= 0) {
+                result.setResultcode(2);
+                result.setMessage("新增刷码记录失败");
+                result.setActionName("qrCodePush");
+                return result;
+            }
+            System.out.println("进入访客码扫码解析4");
+            result.setResultcode(1);
+            result.setMessage("成功");
+            result.setActionName("qrCodePush");
 
+            System.out.println("进入访客码扫码解析,结果:" + JSON.toJSON(result));
         }
 
         return result;

+ 55 - 0
src/main/java/com/template/model/enumModel/eAccessState.java

@@ -0,0 +1,55 @@
+package com.template.model.enumModel;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 账号状态
+ */
+public enum eAccessState {
+    ComeIn(1),//进
+    ComeOut(2);//出
+
+    private int value;
+
+    eAccessState(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eAccessState valueOf(int value) {
+        switch (value) {
+            case 1:
+                return eAccessState.ComeIn;
+            case 2:
+                return eAccessState.ComeOut;
+            default:
+                return null;
+        }
+    }
+
+    public static Integer integerOf(String value) {
+        switch (value) {
+            case "进":
+                return 1;
+            case "出":
+                return 2;
+            default:
+                return null;
+        }
+    }
+
+    public static String stringOf(Integer value) {
+        switch (value) {
+            case 1:
+                return "进";
+            case 2:
+                return "出";
+            default:
+                return null;
+        }
+    }
+}

+ 7 - 1
src/main/java/com/template/model/pojo/SmartQrcode.java

@@ -45,9 +45,15 @@ public class SmartQrcode implements Serializable {
     @ApiModelProperty(value = "刷码成功或失败 成功:1  失败:2")
     private Integer isSuccess;
 
-    @ApiModelProperty(value = "进出状态   进:1     出:2")
+    @ApiModelProperty(value = "进出状态  出:0 进:1")
     private Integer accessState;
 
+    @ApiModelProperty(value = "码类型  身份码:1  访客码:2")
+    private Integer qrcodeType;
+
+    @ApiModelProperty(value = "访客数据ID")
+    private Integer dataId;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

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

@@ -27,4 +27,6 @@ public interface SmartDeviceService extends IService<SmartDevice> {
     SmartDevice getSmartById(int id);
 
     List<SmartDevice> queryOnLineDevice();
+
+    SmartDevice queryDeviceByNum(String num);
 }

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

@@ -37,4 +37,6 @@ public interface SmartVisitorService extends IService<SmartVisitor> {
     PageUtils<SmartVisitor> queryVisitorPageDatas(int currentPage, int pageCount, Integer type, List<Integer> studentIds, String isAdmin);
 
     SmartVisitor querySmartVisitorByCode(String visitorCode);
+
+    SmartVisitor queryParentVisitor(Integer userId);
 }

+ 8 - 0
src/main/java/com/template/services/impl/SmartDeviceServiceImpl.java

@@ -69,4 +69,12 @@ public class SmartDeviceServiceImpl extends ServiceImpl<SmartDeviceMapper, Smart
         List<SmartDevice> devices = smartDeviceMapper.selectList(queryWrapper);
         return devices;
     }
+
+    @Override
+    public SmartDevice queryDeviceByNum(String num) {
+        QueryWrapper<SmartDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq( StringUtils.hasText(num),"num", num);
+        SmartDevice result = smartDeviceMapper.selectOne(queryWrapper);
+        return result;
+    }
 }

+ 15 - 0
src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java

@@ -3,6 +3,7 @@ package com.template.services.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.template.common.utils.TimeExchange;
 import com.template.mapper.SmartVisitorMapper;
 import com.template.model.pojo.SmartVisitor;
 import com.template.model.pojo.SmartVisitor;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -101,4 +103,17 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
         SmartVisitor result = smartVisitorMapper.selectOne(queryWrapper);
         return result;
     }
+
+    @Override
+    public SmartVisitor queryParentVisitor(Integer userId) {
+        QueryWrapper<SmartVisitor> queryWrapper = new QueryWrapper<>();
+        String nowTime = TimeExchange.getTime();
+        queryWrapper.ge("visitor_time", nowTime);//>=
+        queryWrapper.le("visitor_deadline", userId);//<=
+        queryWrapper.eq("statu",3);//必须是已推送的
+        queryWrapper.orderByAsc("visitor_time");
+        List<SmartVisitor> resultDatas = smartVisitorMapper.selectList(queryWrapper);
+
+        return resultDatas != null && resultDatas.size() > 0 ? resultDatas.get(0) : null;
+    }
 }

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

@@ -555,6 +555,7 @@ com\template\model\seewo\AttendanceRuleListSchoolAttendRuleResult$ResponseBody.c
 com\template\model\seewo\StudentServiceRemoveClassStudentsRequest.class
 com\template\model\vo\qrCodeVo.class
 com\template\model\seewo\StudentServiceBatchSaveClassStudentsParam$StudentSaveQuery$StudentSaveQueryBuilder.class
+com\template\model\enumModel\eAccessState.class
 com\template\model\vo\QrcodeImageVo.class
 com\template\model\seewo\AttendanceServiceListAttendClassRecordsParam$RequestBody.class
 com\template\model\request\insertSmartClassRequest.class

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

@@ -430,6 +430,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\SystemMenuTreeVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\HomeSchoolServiceSendNoteToKidParam.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\ClassUserDetailVo.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\enumModel\eAccessState.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\config\ScheduleConfig.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\Message2.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\ExcelUtils2.java

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