夏文涛 2 éve
szülő
commit
53dd399649

+ 205 - 138
.idea/workspace.xml

@@ -5,7 +5,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartQrcodeControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartQrcodeControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.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/SmartQrcodeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.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/SmartVisitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.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/SmartVisitorServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/SmartUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/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" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -21,78 +33,55 @@
   <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/controller/SmartUserController.java">
+        <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="928">
-              <caret line="458" column="19" lean-forward="true" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
-              <folding>
-                <element signature="method#logoffAccount#0;class#SmartUserController#0" />
-                <element signature="method#changeDepartment#0;class#SmartUserController#0" />
-                <element signature="method#importZipUsers#0;class#SmartUserController#0" />
-                <element signature="method#readXls#0;class#SmartUserController#0" />
-                <element signature="e#49661#49685#0" />
-                <element signature="e#49947#49964#0" />
-                <element signature="e#52515#55072#1" />
-                <element signature="e#55086#55103#0" />
-              </folding>
+            <state relative-caret-position="1587">
+              <caret line="90" column="44" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="44" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java">
+      <file pinned="false" current-in-tab="true">
+        <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="322">
-              <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+            <state relative-caret-position="134">
+              <caret line="550" lean-forward="true" selection-start-line="550" selection-end-line="550" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java">
+        <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="189">
-              <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+            <state relative-caret-position="253">
+              <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SystemUserServiceImpl.java">
+        <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="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>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="355">
-              <caret line="239" column="72" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="72" />
-              <folding>
-                <element signature="e#6201#6202#0" expanded="true" />
-                <element signature="e#6260#6261#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="884">
+              <caret line="97" column="67" selection-start-line="97" selection-start-column="11" selection-end-line="97" selection-end-column="67" />
             </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/services/SmartVisitorService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="426">
-              <caret line="86" column="66" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
+            <state relative-caret-position="709">
+              <caret line="38" column="40" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartQrcodeControllerAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="562">
-              <caret line="88" column="43" selection-start-line="88" selection-start-column="26" selection-end-line="88" selection-end-column="43" />
+            <state relative-caret-position="253">
+              <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
             </state>
           </provider>
         </entry>
@@ -121,6 +110,12 @@
       <find>code</find>
       <find>templateId</find>
       <find>studentParents</find>
+      <find>token&quot;</find>
+      <find>examineRecord</find>
+      <find>sub</find>
+      <find>sendSms(</find>
+      <find>returString</find>
+      <find>身份码</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -129,21 +124,27 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartAttendanceService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartAttendanceController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartAttendanceControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/request/otherAppointmentRequest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartDutiesController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartVisitor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartQrcodeControllerAPI.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartVisitorService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/QrcodeImageVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartQrcodeController.java" />
       </list>
     </option>
   </component>
@@ -177,11 +178,10 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1048" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="-7" />
+    <option name="width" value="958" />
+    <option name="height" value="1039" />
   </component>
   <component name="ProjectId" id="2bUCcpLSt0RtgnSW1oHNqhKVmxW" />
   <component name="ProjectView">
@@ -190,7 +190,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -231,7 +230,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -240,8 +239,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -250,7 +248,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -260,6 +258,7 @@
               <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" />
@@ -269,7 +268,7 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
-              <item name="enumModel" type="462c0819:PsiDirectoryNode" />
+              <item name="pojo" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mybatis_plus" type="b2602c69:ProjectViewProjectNode" />
@@ -301,6 +300,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -331,7 +331,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.SendSms">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
     <configuration name="SendSms" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.template.common.utils.SendSms" />
       <module name="mybatis_plus" />
@@ -376,18 +376,19 @@
       <workItem from="1706250887209" duration="5674000" />
       <workItem from="1706260354151" duration="17000" />
       <workItem from="1706260659198" duration="1213000" />
-      <workItem from="1706508631918" duration="21441000" />
+      <workItem from="1706508631918" duration="22715000" />
+      <workItem from="1706663208521" duration="10087000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35855000" />
+    <option name="totallyTimeSpent" value="47216000" />
   </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" weight="0.37199125" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.5055679" />
       <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" />
@@ -398,7 +399,7 @@
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3249453" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33038673" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.3916849" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -416,7 +417,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.7757112" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.73608017" />
       <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" />
@@ -494,20 +495,6 @@
         </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="137">
-          <caret line="203" column="37" selection-start-line="203" selection-start-column="25" selection-end-line="203" selection-end-column="37" />
-        </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="295">
-          <caret line="67" column="8" lean-forward="true" selection-start-line="67" selection-start-column="8" selection-end-line="68" selection-end-column="22" />
-        </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="391">
@@ -536,11 +523,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1439" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/ScheduleController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-50">
@@ -555,20 +537,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
-        </state>
-      </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="295">
-          <caret line="46" column="19" selection-start-line="46" selection-start-column="19" selection-end-line="46" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -583,13 +551,6 @@
         </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="4577">
-          <caret line="240" column="44" selection-start-line="240" selection-start-column="44" selection-end-line="240" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="7015">
@@ -642,13 +603,6 @@
         </state>
       </provider>
     </entry>
-    <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="399">
-          <caret line="422" column="20" selection-start-line="422" selection-start-column="20" selection-end-line="422" selection-end-column="20" />
-        </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="131">
@@ -670,10 +624,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTimeGroup.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="562">
-          <caret line="88" column="43" selection-start-line="88" selection-start-column="26" selection-end-line="88" selection-end-column="43" />
+        <state relative-caret-position="295">
+          <caret line="82" column="19" selection-start-line="82" selection-start-column="19" selection-end-line="82" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/tencentcloudapi/tencentcloud-sdk-java/3.1.742/tencentcloud-sdk-java-3.1.742.jar!/com/tencentcloudapi/sms/v20210111/SmsClient.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="305" column="27" selection-start-line="305" selection-start-column="27" selection-end-line="305" selection-end-column="27" />
         </state>
       </provider>
     </entry>
@@ -684,69 +645,175 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eApproveStatu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="82" column="19" selection-start-line="82" selection-start-column="19" selection-end-line="82" selection-end-column="19" />
+        <state relative-caret-position="276">
+          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/tencentcloudapi/tencentcloud-sdk-java/3.1.742/tencentcloud-sdk-java-3.1.742.jar!/com/tencentcloudapi/sms/v20210111/SmsClient.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eVisitorType.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="305" column="27" selection-start-line="305" selection-start-column="27" selection-end-line="305" selection-end-column="27" />
+        <state relative-caret-position="230">
+          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.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="189">
-          <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+        <state relative-caret-position="476">
+          <caret line="48" column="42" lean-forward="true" selection-start-line="48" selection-start-column="42" selection-end-line="48" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.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="322">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        <state relative-caret-position="700">
+          <caret line="94" column="23" selection-start-line="94" selection-start-column="18" selection-end-line="94" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/GetVertifyCode.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
         </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="928">
-          <caret line="458" column="19" lean-forward="true" selection-start-line="458" selection-start-column="19" selection-end-line="458" selection-end-column="19" />
+        <state relative-caret-position="192">
+          <caret line="347" column="70" selection-start-line="347" selection-start-column="70" selection-end-line="347" selection-end-column="70" />
           <folding>
             <element signature="method#logoffAccount#0;class#SmartUserController#0" />
             <element signature="method#changeDepartment#0;class#SmartUserController#0" />
             <element signature="method#importZipUsers#0;class#SmartUserController#0" />
             <element signature="method#readXls#0;class#SmartUserController#0" />
-            <element signature="e#49661#49685#0" />
-            <element signature="e#49947#49964#0" />
-            <element signature="e#52515#55072#1" />
-            <element signature="e#55086#55103#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="539">
+          <caret line="239" column="72" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="72" />
+          <folding>
+            <element signature="e#6201#6202#0" expanded="true" />
+            <element signature="e#6260#6261#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eExamineStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="10" column="9" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmsCodeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1453" />
+      </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="426">
+        <state relative-caret-position="677">
           <caret line="86" column="66" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/util/Date.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="239" column="72" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="72" />
+        <state relative-caret-position="295">
+          <caret line="883" column="16" selection-start-line="883" selection-start-column="16" selection-end-line="883" selection-end-column="16" />
           <folding>
-            <element signature="e#6201#6202#0" expanded="true" />
-            <element signature="e#6260#6261#0" expanded="true" />
+            <element signature="e#37718#37719#0" expanded="true" />
+            <element signature="e#37754#37755#0" expanded="true" />
           </folding>
         </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="516">
+          <caret line="303" column="32" selection-start-line="303" selection-start-column="25" selection-end-line="303" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="52" column="32" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <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="356">
+          <caret line="471" column="13" lean-forward="true" selection-start-line="469" selection-start-column="12" selection-end-line="471" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartQrcodeControllerAPI.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+        </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="709">
+          <caret line="38" column="40" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="40" />
+        </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="295">
+          <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" 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="884">
+          <caret line="97" column="67" selection-start-line="97" selection-start-column="11" selection-end-line="97" selection-end-column="67" />
+        </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="253">
+          <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </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="1587">
+          <caret line="90" column="44" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="44" />
+        </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="134">
+          <caret line="550" lean-forward="true" selection-start-line="550" selection-end-line="550" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 4 - 0
src/main/java/com/template/api/SmartQrcodeControllerAPI.java

@@ -21,4 +21,8 @@ public interface SmartQrcodeControllerAPI {
     @GetMapping(value = "/generateQrcode")
     @ApiOperation(value = "生成二维码", notes = "生成二维码", httpMethod = "GET")
     CommonResult generateQrcode(@RequestParam int userId);
+
+    @GetMapping(value = "/visitorQrcode")
+    @ApiOperation(value = "生成访客码", notes = "生成访客码", httpMethod = "GET")
+    CommonResult visitorQrcode(@RequestParam String visitorId);
 }

+ 45 - 14
src/main/java/com/template/common/utils/SendSms.java

@@ -28,30 +28,30 @@ public class SendSms {
 
     //腾讯云上的签名
 //    private static String secretID="AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl";
-    private static String secretID="AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg";
+    private static String secretID = "AKIDCPVZdcWIxgHpy5FYxVyPiqkZGrhdXUBg";
 
     //腾讯云上的密钥
 //    private static String secretKey="JPGrELFySiv0pOrKOPEwSnulOq9IPPDr";
-    private static String secretKey="NkyCN3cz97qKaeXLvHOGxOcdS8f184pL";
+    private static String secretKey = "NkyCN3cz97qKaeXLvHOGxOcdS8f184pL";
 
     //短信应用id
 //    private static String sdkAppid="1400813506";
-    private static String sdkAppid="1400885930";
+    private static String sdkAppid = "1400885930";
 
     //短信签名内容
 //    private static String signName="华仁享学教育";
-    private static String signName="江西省创海科技有限公司";
+    private static String signName = "江西省创海科技有限公司";
 
     //模板Id
 //    private static String templateId="1770016";
-    private static String templateId="2060673";
+    private static String templateId = "2060673";
 
     //验证码有效时长
-    private static String smsMin="1";
+    private static String smsMin = "1";
 
 
-    public static String sendSms(String phoneNumber,String code) {
-        String returString= "";
+    public static String sendSms(String phoneNumber, String code) {
+        String returString = "";
         try {
             /* 必要步骤:
              * 实例化一个认证对象,入参需要传入腾讯云账户密钥对secretId,secretKey。
@@ -60,7 +60,7 @@ public class SendSms {
              * 以免泄露密钥对危及你的财产安全。
              * SecretId、SecretKey 查询: https://console.cloud.tencent.com/cam/capi */
 //            Credential cred = new Credential(smsConfig.getSecretID(), smsConfig.getSecretKey());
-            Credential cred = new Credential(secretID,secretKey);
+            Credential cred = new Credential(secretID, secretKey);
 
             // 实例化一个http选项,可选,没有特殊需求可以跳过
             HttpProfile httpProfile = new HttpProfile();
@@ -121,7 +121,7 @@ public class SendSms {
             /* 模板参数: 模板参数的个数需要与 TemplateId 对应模板的变量个数保持一致,若无模板参数,则设置为空 */
 //           第一个为验证码,第二个为有效时间
 //            String[] templateParamSet = {code,smsConfig.getSmsMin()};
-            String[] templateParamSet = {code,"1"};
+            String[] templateParamSet = {code, "1"};
             req.setTemplateParamSet(templateParamSet);
 
             /* 下发手机号码,采用 E.164 标准,+[国家或地区码][手机号]
@@ -162,7 +162,7 @@ public class SendSms {
             SendStatus sendStatus = res.getSendStatusSet()[0];
             System.out.println(sendStatus.getMessage());
 //            System.out.println("sendStatus = " + sendStatus);
-            returString=sendStatus.getMessage();
+            returString = sendStatus.getMessage();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();
         }
@@ -170,11 +170,42 @@ public class SendSms {
     }
 
 
-    public static  void main(String[] args) throws TencentCloudSDKException{
+    public static String sendVisitorSms(String phoneNumber, String year, String month, String day, String startTime, String endTime, String code) {
+        String returString = "";
+        try {
+            Credential cred = new Credential(secretID, secretKey);
+
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setReqMethod("POST");
+            httpProfile.setConnTimeout(60);
+            httpProfile.setEndpoint("sms.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setSignMethod("HmacSHA256");
+            clientProfile.setHttpProfile(httpProfile);
+            SmsClient client = new SmsClient(cred, "ap-guangzhou", clientProfile);
+            SendSmsRequest req = new SendSmsRequest();
+            req.setSmsSdkAppId(sdkAppid);
+            req.setSignName(signName);
+            req.setTemplateId("2065241");
+            String[] templateParamSet = {year, month, day, startTime, endTime, code};
+            req.setTemplateParamSet(templateParamSet);
+            String[] phoneNumbers = {phoneNumber};
+            req.setPhoneNumberSet(phoneNumbers);
+            SendSmsResponse res = client.SendSms(req);
+            SendStatus sendStatus = res.getSendStatusSet()[0];
+            System.out.println(sendStatus.getMessage());
+            returString = sendStatus.getMessage();
+        } catch (TencentCloudSDKException e) {
+            e.printStackTrace();
+        }
+        return returString;
+    }
+
+    public static void main(String[] args) throws TencentCloudSDKException {
         //这里定义一个存储电话号码的数组
 
-        String tels="+8618279193722"; // 手机号前面记得带上国家区域编码
-        String test = sendSms("+8618279193722","123456");
+        String tels = "+8618279193722"; // 手机号前面记得带上国家区域编码
+        String test = sendSms("+8618279193722", "123456");
 
     }
 

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

@@ -285,6 +285,27 @@ public class TimeExchange {
         return sp.format(new Date());
     }
 
+
+    public static String getYear(Date dateNow) {
+        SimpleDateFormat sp = new SimpleDateFormat("yyyy");
+        return sp.format(dateNow);
+    }
+
+    public static String getMonth(Date dateNow) {
+        SimpleDateFormat sp = new SimpleDateFormat("MM");
+        return sp.format(new Date());
+    }
+
+    public static String getDay(Date dateNow) {
+        SimpleDateFormat sp = new SimpleDateFormat("dd");
+        return sp.format(new Date());
+    }
+
+    public static String getTime(Date dateNow) {
+        SimpleDateFormat sp = new SimpleDateFormat("HH:mm:ss");
+        return sp.format(new Date());
+    }
+
     /**
      * 计算两个日期的时间差
      *

+ 40 - 0
src/main/java/com/template/controller/SmartQrcodeController.java

@@ -7,10 +7,12 @@ import com.alibaba.fastjson.JSON;
 import com.template.api.SmartQrcodeControllerAPI;
 import com.template.common.utils.TimeExchange;
 import com.template.model.pojo.SmartUser;
+import com.template.model.pojo.SmartVisitor;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.BaseImageVo;
 import com.template.model.vo.QrcodeImageVo;
 import com.template.services.SmartUserService;
+import com.template.services.SmartVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -20,6 +22,7 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Date;
 
 /**
  * <p>
@@ -34,6 +37,8 @@ public class SmartQrcodeController implements SmartQrcodeControllerAPI {
 
     @Autowired
     private SmartUserService smartUserService;
+    @Autowired
+    private SmartVisitorService smartVisitorService;
 
     @Override
     public CommonResult generateQrcode(int userId) {
@@ -44,6 +49,7 @@ public class SmartQrcodeController implements SmartQrcodeControllerAPI {
 
         QrcodeImageVo qiv = new QrcodeImageVo();
         qiv.setId(user.getId());
+        qiv.setType(1);
         qiv.setPhone(user.getPhone());
         qiv.setTimestamp(TimeExchange.getTime());
 
@@ -54,5 +60,39 @@ public class SmartQrcodeController implements SmartQrcodeControllerAPI {
 
         return CommonResult.ok(result);
     }
+
+    @Override
+    public CommonResult visitorQrcode(String visitorId) {
+        if(visitorId == null){
+            return CommonResult.fail("访客code不能为空");
+        }
+
+        SmartVisitor visitor = smartVisitorService.querySmartVisitorByCode(visitorId);
+        if(visitor == null){
+            return CommonResult.fail("访客数据无效,无法生成二维码");
+        }
+
+        if(visitor.getVisitorTime().after(new Date())){
+            return CommonResult.fail("未到来访时间,无法生成二维码");
+        }
+
+        if(visitor.getVisitorDeadline().before(new Date())){
+            return CommonResult.fail("访客时间已失效,无法生成二维码");
+        }
+
+        QrcodeImageVo qiv = new QrcodeImageVo();
+        qiv.setId(visitor.getUserId());
+        qiv.setType(2);
+        qiv.setPhone(visitor.getUserPhone());
+        qiv.setTimestamp(TimeExchange.getTime());
+
+        String qrStr = JSON.toJSONString(qiv);
+
+        BaseImageVo result = new BaseImageVo();
+        result.setQrcode(qrStr);
+
+        return CommonResult.ok(result);
+    }
+
 }
 

+ 14 - 6
src/main/java/com/template/controller/SmartVisitorController.java

@@ -9,10 +9,7 @@ import com.seewo.open.sdk.DefaultSeewoClient;
 import com.seewo.open.sdk.SeewoClient;
 import com.seewo.open.sdk.auth.Account;
 import com.template.api.SmartVisitorControllerAPI;
-import com.template.common.utils.CommonUtil;
-import com.template.common.utils.RequestUtils;
-import com.template.common.utils.TimeExchange;
-import com.template.common.utils.paramUtils;
+import com.template.common.utils.*;
 import com.template.config.ParkConfig;
 import com.template.config.SeewoConfig;
 import com.template.model.enumModel.*;
@@ -135,7 +132,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         }
 
         //审核通过就不能删除
-        if(data.getStatu().intValue() == eApproveStatu.Pushed.getValue()){
+        if (data.getStatu().intValue() == eApproveStatu.Pushed.getValue()) {
             return CommonResult.fail("无法删除已审核通过的访客数据");
         }
 
@@ -279,7 +276,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         }
 
         //审核处理后的数据不能再处理判断
-        if(visitor.getStatu().intValue() != eApproveStatu.Audit.getValue()){
+        if (visitor.getStatu().intValue() != eApproveStatu.Audit.getValue()) {
             return CommonResult.fail("该记录已被操作过,请勿重复操作");
         }
 
@@ -337,6 +334,9 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         ObjectMapper objectMapper = new ObjectMapper();
                         BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
                         visitor.setBsOrderNo(reservation.getData().getReOrderNo());
+                    } else {
+                        String code = GetVertifyCode.getRandomNumCode(6);
+                        visitor.setVisitorCode(code);
                     }
                 }
 
@@ -349,6 +349,14 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 throw new Exception("审核失败");
             }
 
+            //发送短信给其他访客用户
+            if(!ObjectUtils.isEmpty(visitor.getVisitorCode()) && type == eExamineStatu.Agree.getValue()){
+                String message = SendSms.sendVisitorSms("+86"+visitor.getRespondentPhone(), TimeExchange.getYear(visitor.getVisitorTime()) ,TimeExchange.getMonth(visitor.getVisitorTime()) ,TimeExchange.getDay(visitor.getVisitorTime()) ,TimeExchange.getTime(visitor.getVisitorTime()), TimeExchange.getTime(visitor.getVisitorDeadline()), visitor.getVisitorCode());
+                if (!message.contains("success")) {
+                    throw new Exception("审核失败");
+                }
+            }
+
         } catch (Exception e) {
             throw new Exception("审核失败");
         }

+ 3 - 0
src/main/java/com/template/model/pojo/SmartVisitor.java

@@ -98,6 +98,9 @@ public class SmartVisitor implements Serializable {
     @ApiModelProperty(value = "百胜预约订单号")
     private String bsOrderNo;
 
+    @ApiModelProperty(value = "访客验证码")
+    private String visitorCode;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

+ 7 - 0
src/main/java/com/template/model/vo/QrcodeImageVo.java

@@ -16,6 +16,13 @@ public class QrcodeImageVo {
     private Integer id;
 
     /**
+     * 码类型
+     * 身份码:1
+     * 访客码:2
+     */
+    private Integer type;
+
+    /**
      * 手机号
      */
     private String phone;

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

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

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

@@ -92,4 +92,13 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
         IPage<SmartVisitor> datas = smartVisitorMapper.queryVisitorPageDatas(page, type, studentIds, isAdmin);
         return new PageUtils(datas);
     }
+
+
+    @Override
+    public SmartVisitor querySmartVisitorByCode(String visitorCode) {
+        QueryWrapper<SmartVisitor> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.hasText(visitorCode), "visitor_code", visitorCode);
+        SmartVisitor result = smartVisitorMapper.selectOne(queryWrapper);
+        return result;
+    }
 }

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

@@ -159,4 +159,12 @@
         </if>
     </select>
 
+    <select id="getAffiliateList" resultType="com.template.model.pojo.SmartUser">
+        SELECT * FROM `smart_user`
+        where deleted = 0 and is_cancel=0
+        <if test="id != null and id != ''">
+            and FIND_IN_SET(#{id},affiliate)
+        </if>
+    </select>
+
 </mapper>

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

@@ -186,6 +186,7 @@ com\template\model\pojo\SmartDataSourceLog.class
 com\template\common\utils\ExcelUtils.class
 com\template\model\seewo\HomeSchoolServiceSendNoteToKidParam$Query.class
 com\template\model\vo\DepartmentVo.class
+com\template\controller\SmartNotificationController.class
 com\template\model\request\insertScoreRequest.class
 com\template\services\SmartAuthorGroupService.class
 com\template\model\request\updateDepartmentRequest.class
@@ -393,12 +394,14 @@ com\template\model\evaluate\student\SubjectManageList.class
 com\template\model\pojo\SystemUser.class
 com\template\mapper\SystemUserMapper.class
 com\template\model\seewo\AttendanceRuleListEventByClazzResult$ResponseBody.class
+com\template\services\SmartNotificationService.class
 com\template\services\RepairAdminService.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam$Object$ObjectBuilder.class
 com\template\model\seewo\TeacherServiceBatchSetClassMastersParam$Query.class
 com\template\model\seewo\StudentServiceUpdateStudentInfoParam$RequestBody$RequestBodyBuilder.class
 com\template\model\vo\AffiliateUserVo.class
 com\template\services\impl\SmartApplyServiceImpl.class
+com\template\services\impl\SmartNotificationServiceImpl.class
 com\template\common\utils\WxUtil.class
 com\template\services\SmartGradeService.class
 com\template\api\HikvisionAPI.class
@@ -492,6 +495,7 @@ com\template\model\pojo\SmartDataTask.class
 com\template\model\seewo\TeacherServiceBatchSetClassMastersResult.class
 com\template\model\request\bindStudentRequest.class
 com\template\model\vo\TurnOnDeviceVo.class
+com\template\mapper\SmartNotificationMapper.class
 com\template\model\seewo\StudentServiceUpdateStudentInfoParam$CardsItem$CardsItemBuilder.class
 com\template\common\utils\JWTUtil.class
 com\template\model\enumModel\eLogOff.class
@@ -527,6 +531,7 @@ com\template\services\SmartEvaluateSdetailService.class
 com\template\model\seewo\ClassServiceBatchSaveClassRequest.class
 com\template\model\seewo\TeacherServiceBatchSaveOrUpdateTeacherParam$SaveOrUpdateTeacherQuery$SaveOrUpdateTeacherQueryBuilder.class
 com\template\model\vo\ClassSettingDateVo.class
+com\template\api\SmartNotificationControllerAPI.class
 com\template\model\evaluate\student\SmartEvaluateStudent.class
 com\template\config\CosConfig.class
 com\template\model\pojo\SmartApply.class
@@ -599,6 +604,7 @@ com\template\mapper\SystemMenuMapper.class
 com\template\model\enumModel\eFileType.class
 com\template\model\request\useridsRequest.class
 com\template\model\request\updateRepairAdminRequest.class
+com\template\model\pojo\SmartNotification.class
 com\template\model\seewo\AttendanceRuleListEventByClazzParam$Query$QueryBuilder.class
 com\template\model\seewo\AttendanceRuleListEventByClazzParam$RequestBody$RequestBodyBuilder.class
 com\template\model\seewo\OrganizationNodeServiceInitSchoolClassesParam$Query.class

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

@@ -1,4 +1,5 @@
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\AffiliateParentVo.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartNotificationController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\PersonalLeaveListSchoolPeriodRecordsResult.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\qrCodeVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartEvaluateSdetailService.java
@@ -50,6 +51,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartFaceDiscernService.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDuties.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartBuild.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartNotificationMapper.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\evaluate\teacher\SmartEvaluateTdetailList.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\insertDepartmentRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\UploadControllerAPI.java
@@ -85,6 +87,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\JWTUtil.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\updateMenuRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\common\utils\ExcelClassField.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartNotification.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\RepairAdminController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\seewo\HomeSchoolServiceSendNoteToKidResult.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\insertScoreRequest.java
@@ -264,6 +267,7 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartMenuControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\SmartWarningController.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartDataTaskSetDebugSql.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartNotificationServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\impl\SmartAuthorGroupServiceImpl.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\ScoreVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\mapper\SmartDutiesMapper.java
@@ -420,6 +424,8 @@ D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\templa
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\request\updateDepartmentRequest.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\SystemMenuVo.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartGradeControllerAPI.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\services\SmartNotificationService.java
+D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\api\SmartNotificationControllerAPI.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\pojo\SmartIdentity.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\model\vo\LoginVO.java
 D:\Bingo\Desktop\工作内容\万载三中\backend_code\src\main\java\com\template\controller\LoginController.java

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