bug fix

.idea/workspace.xml

@@ -5,19 +5,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstpage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstpage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,51 +30,41 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+      <file leaf-file-name="TaFirstUsherRecordController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="197" column="20" selection-start-line="197" selection-start-column="20" selection-end-line="197" selection-end-column="20" />
-              <folding>
-                <element signature="e#5763#5764#0" expanded="true" />
-                <element signature="e#5781#5782#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaMainUsherRecordMapper.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="535">
-              <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+            <state relative-caret-position="119">
+              <caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="133" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java">
+      <file leaf-file-name="TaMainUsherRecordController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="219" column="82" selection-start-line="219" selection-start-column="70" selection-end-line="219" selection-end-column="82" />
+            <state relative-caret-position="319">
+              <caret line="70" column="62" lean-forward="true" selection-start-line="70" selection-start-column="62" selection-end-line="70" selection-end-column="62" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CommConstant.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java">
+      <file leaf-file-name="ITaCustomerService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+            <state relative-caret-position="273">
+              <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaMainUsherRecordServiceImpl.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+      <file leaf-file-name="TaCustomerServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="178" column="4" selection-start-line="178" selection-start-column="4" selection-end-line="178" selection-end-column="4" />
+            <state relative-caret-position="-8">
+              <caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -139,28 +130,19 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstpageService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/TaVisitorAppointmentMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMiniFormids.java" />
@@ -171,7 +153,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMiniFormidsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/TaMessageRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMessageRecordMapper.java" />
@@ -185,11 +166,21 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/Action.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -237,10 +228,9 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1296" />
-    <option name="height" value="735" />
+    <option name="x" value="-10" />
+    <option name="width" value="2585" />
+    <option name="height" value="1465" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="1" id="Add" />
@@ -303,6 +293,25 @@
               <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="service" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="service" type="b2602c69:ProjectViewProjectNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
@@ -469,12 +478,12 @@
       <workItem from="1560923587540" duration="24987000" />
       <workItem from="1561084889145" duration="26895000" />
       <workItem from="1561339069413" duration="2416000" />
-      <workItem from="1561343517448" duration="18751000" />
+      <workItem from="1561343517448" duration="32321000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="355346000" />
+    <option name="totallyTimeSpent" value="368916000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
@@ -490,9 +499,9 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" weight="0.49714938" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" visible="true" weight="0.32611173" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.29874572" />
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.29874572" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
@@ -500,8 +509,8 @@
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49903476" weight="0.45381984" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.45381984" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20309168" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.5461802" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20309168" />
       <window_info anchor="right" id="Bean Validation" order="3" weight="0.32928804" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49903476" weight="0.3295325" />
@@ -522,90 +531,10 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="19" />
+      <option name="time" value="21" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="362">
-          <caret line="71" column="70" lean-forward="true" selection-start-line="67" selection-start-column="13" selection-end-line="71" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="30" column="20" lean-forward="true" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="18" column="97" selection-start-line="18" selection-start-column="91" selection-end-line="18" selection-end-column="97" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaVisitorAppointmentMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaWechatUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
-          <caret line="28" column="28" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="45" column="32" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaNotice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="21" column="24" selection-start-line="18" selection-start-column="3" selection-end-line="21" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMiniFormids.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -668,13 +597,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="72" column="9" lean-forward="true" selection-start-line="72" selection-start-column="9" selection-end-line="72" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -763,13 +685,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="27" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -808,47 +723,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="263" column="20" selection-start-line="263" selection-start-column="20" selection-end-line="263" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="516">
-          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="127" column="61" selection-start-line="127" selection-start-column="61" selection-end-line="127" selection-end-column="61" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="19" column="15" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="84" lean-forward="true" selection-start-line="84" selection-end-line="84" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -904,28 +778,153 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="535">
+          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2625">
+          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliOSSUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="26" column="9" lean-forward="true" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <caret line="197" column="20" selection-start-line="197" selection-start-column="20" selection-end-line="197" selection-end-column="20" />
+        <state relative-caret-position="349">
+          <caret line="224" column="41" selection-start-line="224" selection-start-column="41" selection-end-line="224" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="605">
+          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="32" column="31" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="584">
+          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="229">
+          <caret line="244" column="20" selection-start-line="244" selection-start-column="20" selection-end-line="244" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="479">
+          <caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-652">
+          <caret line="43" column="35" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="588">
+          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="461">
+          <caret line="88" column="60" selection-start-line="88" selection-start-column="60" selection-end-line="88" selection-end-column="60" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="33" column="11" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="133" column="4" selection-start-line="133" selection-start-column="4" selection-end-line="133" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="70" column="62" lean-forward="true" selection-start-line="70" selection-start-column="62" selection-end-line="70" selection-end-column="62" />
           <folding>
-            <element signature="e#5763#5764#0" expanded="true" />
-            <element signature="e#5781#5782#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="535">
-          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
+        <state relative-caret-position="273">
+          <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="178" column="4" selection-start-line="178" selection-start-column="4" selection-end-line="178" selection-end-column="4" />
+        <state relative-caret-position="-8">
+          <caret line="60" column="22" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com.huiju.welcome/controller/CameraController.java

@@ -74,6 +74,9 @@ public class CameraController {
 	@Autowired
 	private ITaCustomerService iTaCustomerService;
 
+	@Autowired
+	private ITaCarRecordService iTaCarRecordService;
+
 	@Autowired
 	private XFYun xfYun;
 	
@@ -194,7 +197,33 @@ public class CameraController {
 	}
 
 	@PostMapping(value = "/camera/{deviceId}/car")
-	public ResponseBean car(@PathParam("deviceId") String deviceId, @RequestBody String paramStr) {
+	public ResponseBean car(
+			@PathParam("deviceId") String deviceId,
+			@RequestParam("sceneImage") MultipartFile carImage,
+			@RequestParam("driverImage") MultipartFile driverImage,
+			@RequestParam("copilotImage") MultipartFile copilotImage,
+			@RequestParam("plateNumber") String plateNumber,
+			@RequestParam("color") String color,
+			@RequestParam("carModel") String carModel
+			) {
+
+		TaCarRecord taCarRecord = new TaCarRecord();
+		taCarRecord.setPlateNumber(plateNumber);
+		taCarRecord.setColor(color);
+		taCarRecord.setCarModel(carModel);
+
+		if (null != carImage && !carImage.isEmpty()) {
+			taCarRecord.setCarImage(getMultipartFile(carImage));
+		}
+		if (null != driverImage && !driverImage.isEmpty()) {
+			taCarRecord.setDriverImage(getMultipartFile(driverImage));
+		}
+		if (null != copilotImage && !copilotImage.isEmpty()) {
+			taCarRecord.setCopilotImage(getMultipartFile(copilotImage));
+		}
+
+		iTaCarRecordService.newRecordByDevice(taCarRecord);
+
 		return null;
 	}
 

src/main/java/com.huiju.welcome/controller/TaCarRecordController.java

@@ -83,7 +83,10 @@ public class TaCarRecordController extends BaseController {
     public ResponseBean update(@RequestBody TaCarRecord taCarRecord, @PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaCarRecordService.updateById(taCarRecord)){
+
+            boolean success = iTaCarRecordService.updateRecordByMiniapp(taCarRecord);
+
+            if (success){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java

@@ -43,7 +43,9 @@ public class TaFirstUsherRecordController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             taFirstUsherRecord.setStatus(StatusUtils.Normal);
-            if (iTaFirstUsherRecordService.save(taFirstUsherRecord)){
+
+            boolean success = iTaFirstUsherRecordService.newRecordByMiniapp(taFirstUsherRecord);
+            if (success){
                 responseBean.addSuccess(taFirstUsherRecord);
             }else {
                 responseBean.addError("fail");
@@ -85,7 +87,9 @@ public class TaFirstUsherRecordController extends BaseController {
     public ResponseBean update(@RequestBody TaFirstUsherRecord taFirstUsherRecord, @PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaFirstUsherRecordService.updateById(taFirstUsherRecord)){
+
+            boolean success = iTaFirstUsherRecordService.updateByMiniapp(taFirstUsherRecord);
+            if (success){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java

@@ -6,6 +6,8 @@ import com.huiju.welcome.model.TaCustomer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -19,4 +21,6 @@ public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
     TaCustomer getCustomerOf(@Param("personId") Integer personId, @Param("realId") Integer realId);
     IPage<TaCustomer> customerPage(IPage<TaCustomer> pg, String customerName, String phone, String platNumber);
+
+    List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber);
 }

src/main/java/com.huiju.welcome/model/TaCarRecord.java

@@ -43,6 +43,8 @@ public class TaCarRecord implements Serializable {
 
     private String driverImage;
 
+    private String copilotImage;
+
     private LocalDateTime createDate;
 
     /**

src/main/java/com.huiju.welcome/service/ITaCarRecordService.java

@@ -28,4 +28,8 @@ public interface ITaCarRecordService extends IService<TaCarRecord> {
      * @return
      */
     IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone);
+
+    boolean newRecordByDevice(TaCarRecord taCarRecord);
+
+    boolean updateRecordByMiniapp(TaCarRecord taCarRecord);
 }

src/main/java/com.huiju.welcome/service/ITaCustomerService.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaCarRecord;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
@@ -26,4 +27,10 @@ public interface ITaCustomerService extends IService<TaCustomer> {
     void judgeNewCust(TaPerson taPerson) throws Exception;
 
     void deleteCustOfPerson(Integer personId, Integer realId);
+
+    List<TaCustomer> getSomeCustMayBe(String plateNumber);
+
+    TaCustomer newCustByCarDevice(TaCarRecord taCarRecord);
+
+    void notifyConsultant(TaCustomer taCustomer) throws Exception;
 }

src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java

@@ -2,6 +2,7 @@ package com.huiju.welcome.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaCarRecord;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 
 import java.util.List;
@@ -23,4 +24,12 @@ public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord>
     IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage<TaFirstUsherRecord> pg,String plateNumber, String visiteDate);
 
     boolean updateNormal(List<TaFirstUsherRecord> records);
+
+    TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord);
+
+    void notifyMiniapp(TaFirstUsherRecord taFirstUsherRecord);
+
+    boolean newRecordByMiniapp(TaFirstUsherRecord taFirstUsherRecord);
+
+    boolean updateByMiniapp(TaFirstUsherRecord taFirstUsherRecord);
 }

src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java

@@ -4,13 +4,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaCarRecordMapper;
 import com.huiju.welcome.model.TaCarRecord;
+import com.huiju.welcome.model.TaCustomer;
+import com.huiju.welcome.model.TaFirstUsherRecord;
 import com.huiju.welcome.service.ITaCarRecordService;
+import com.huiju.welcome.service.ITaCustomerService;
+import com.huiju.welcome.service.ITaFirstUsherRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -22,12 +29,63 @@ import java.util.Date;
  */
 @Service
 public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCarRecord> implements ITaCarRecordService {
+    Logger log = LoggerFactory.getLogger(TaCarRecordServiceImpl.class);
 
     @Autowired
     private TaCarRecordMapper taCarRecordMapper;
 
+    @Autowired
+    private ITaFirstUsherRecordService iTaFirstUsherRecordService;
+
+    @Autowired
+    private ITaCustomerService iTaCustomerService;
+
     @Override
     public IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone) {
         return taCarRecordMapper.getPageList(page, plateNumber, recordDate, customerName, phone);
     }
+
+    /**
+     * 车辆抓拍之后
+     * @param taCarRecord
+     * @return
+     */
+    @Override
+    public boolean newRecordByDevice(TaCarRecord taCarRecord) {
+        // 先入库
+        taCarRecordMapper.insert(taCarRecord);
+
+        // 到客户中查询是否有相关人员
+        TaCustomer taCustomer;
+        List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(taCarRecord.getPlateNumber());
+
+        // 如果没有对应人员
+        if (null == taCustomerList || taCustomerList.size() == 0) {
+            taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
+        } else {
+            // 对应客户, 先随机取一条
+            taCustomer = taCustomerList.get(0);
+        }
+
+        // 生成保安迎宾记录, 并通知小程序
+        TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.newRecordByDevice(taCarRecord);
+        iTaFirstUsherRecordService.notifyMiniapp(taFirstUsherRecord);
+
+        // 如果客户有固定置业, 推送消息给置业
+        if (null != taCustomer.getConsultantId()) {
+            try {
+                iTaCustomerService.notifyConsultant(taCustomer);
+            } catch (Exception e) {
+                log.error("发送消息给置业失败: {}", e.getMessage());
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateRecordByMiniapp(TaCarRecord taCarRecord) {
+        // 先暂时只做更新动作
+        return taCarRecordMapper.updateById(taCarRecord) > 0;
+    }
 }

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -6,19 +6,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaCustomerMapMapper;
 import com.huiju.welcome.mapper.TaCustomerMapper;
 import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaCustomerMap;
-import com.huiju.welcome.model.TaMainUsherRecord;
-import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.mapper.TaWechatUserMapper;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
+import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +34,8 @@ import java.util.Map;
  */
 @Service
 public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCustomer> implements ITaCustomerService {
+    Logger log = LoggerFactory.getLogger(TaCustomerServiceImpl.class);
+
     @Autowired
     TaCustomerMapper taCustomerMapper;
 
@@ -47,6 +51,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     ITaMainUsherRecordService iTaMainUsherRecordService;
 
+    @Autowired
+    TaWechatUserMapper taWechatUserMapper;
+
     @Autowired
     MiniApp miniApp;
 
@@ -135,6 +142,52 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomerMapper.update(new TaCustomer(), updateWrapper);
     }
 
+    @Override
+    public List<TaCustomer> getSomeCustMayBe(String plateNumber) {
+        return taCustomerMapper.getSomeCustMayBe(plateNumber);
+    }
+
+    @Override
+    public TaCustomer newCustByCarDevice(TaCarRecord taCarRecord) {
+        TaCustomer taCustomer = new TaCustomer();
+
+        taCustomer.setCreateDate(LocalDateTime.now());
+        taCustomer.setStatus(StatusUtils.Normal);
+        taCustomer.setCustomerName(taCarRecord.getCustomerName());
+        taCustomer.setAvatar(taCarRecord.getDriverImage());
+        taCustomer.setCarModel(taCarRecord.getCarModel());
+        taCustomer.setPlateNumber(taCarRecord.getPlateNumber());
+
+        TaPerson taPerson = iTaPersonService.newPersonByFront(taCustomer);
+        taCustomer.setCustomerId(taPerson.getRealId());
+
+        TaCustomerMap customerMap = new TaCustomerMap();
+        customerMap.setCustomerId(taCustomer.getCustomerId());
+        customerMap.setPersonId(taPerson.getPersonId());
+
+        taCustomerMapMapper.insert(customerMap);
+        taCustomerMapper.insert(taCustomer);
+
+        return taCustomer;
+    }
+
+    @Override
+    public void notifyConsultant(TaCustomer taCustomer) throws Exception {
+        String tpl = miniApp.getTpls().getVisitor();
+        String page = "";
+        String openid = taWechatUserMapper.getOpenidOf(taCustomer.getConsultantId(), CommConstant.WECHAT_CLIENT_MINIAPP);
+        if (null == openid) {
+            throw new Exception("发送消息给置业失败, 当前置业[" + taCustomer.getConsultantId() + "]未绑定小程序账号");
+        }
+        List<Object> data = new ArrayList<Object>(){{
+            add(taCustomer.getCustomerName());
+            add(taCustomer.getPhone());
+            add("您有客户来访, 请及时接待!");
+        }};
+
+        miniApp.sendTPLMessage(tpl, openid, page, data);
+    }
+
     private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {
         TaCustomer taCustomer = new TaCustomer();
         taCustomer.setCustomerId(taPerson.getRealId());

src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java

@@ -3,13 +3,21 @@ package com.huiju.welcome.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.Action;
+import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
+import com.huiju.welcome.model.TaCarRecord;
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaFirstUsherRecordService;
+import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,6 +34,9 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
     @Autowired
     TaFirstUsherRecordMapper taFirstUsherRecordMapper;
 
+    @Autowired
+    ITaCustomerService iTaCustomerService;
+
     @Override
     public boolean updateNormal(List<TaFirstUsherRecord> records) {
         if (records == null || records.size() == 0) return true;
@@ -42,7 +53,63 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         int row = taFirstUsherRecordMapper.update(new TaFirstUsherRecord(), wrapper);
         return row >= 0;
     }
-    
+
+    @Override
+    public TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord) {
+        TaFirstUsherRecord taFirstUsherRecord = new TaFirstUsherRecord();
+        taFirstUsherRecord.setStatus(StatusUtils.Ready);
+        taFirstUsherRecord.setCarImage(taCarRecord.getCarImage());
+        taFirstUsherRecord.setCarModel(taCarRecord.getCarModel());
+        taFirstUsherRecord.setColor(taCarRecord.getColor());
+        taFirstUsherRecord.setCarRecord(taCarRecord.getSerialNo());
+        taFirstUsherRecord.setPlateNumber(taCarRecord.getPlateNumber());
+        taFirstUsherRecord.setVisiteDate(LocalDateTime.now());
+
+        taFirstUsherRecordMapper.insert(taFirstUsherRecord);
+
+        return taFirstUsherRecord;
+    }
+
+    @Override
+    public void notifyMiniapp(TaFirstUsherRecord taFirstUsherRecord) {
+        Action act = Action.create(Action.TYPE_NEW_FIRST_USHER, taFirstUsherRecord);
+        try {
+            WebSocketServer.sendInfo(act.toJSON(), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {}
+    }
+
+    @Override
+    public boolean newRecordByMiniapp(TaFirstUsherRecord taFirstUsherRecord) {
+        notifyConsultant(taFirstUsherRecord);
+        int row = taFirstUsherRecordMapper.insert(taFirstUsherRecord);
+
+        return row > 0;
+    }
+
+    @Override
+    public boolean updateByMiniapp(TaFirstUsherRecord taFirstUsherRecord) {
+        notifyConsultant(taFirstUsherRecord);
+        int row = taFirstUsherRecordMapper.updateById(taFirstUsherRecord);
+        return row > 0;
+    }
+
+    private void notifyConsultant(TaFirstUsherRecord taFirstUsherRecord) {
+        String plateNumber = taFirstUsherRecord.getPlateNumber();
+
+        // 依据车牌判断是否老客户来访
+        if (!StringUtils.isEmpty(plateNumber)) {
+            List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(plateNumber);
+
+            // 一个车牌对应多个客户, 先随机找一条数据
+            if (null != taCustomerList && taCustomerList.size() > 0) {
+                TaCustomer taCustomer = taCustomerList.get(0);
+                try {
+                    iTaCustomerService.notifyConsultant(taCustomer);
+                } catch (Exception e) {}
+            }
+        }
+    }
+
     @Override
     public IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg,String plateNumber, String visiteDate) {
         IPage<TaFirstUsherRecord> pageTaFirstUsherRecord= taFirstUsherRecordMapper.taFirstUsherRecordlist(pg,plateNumber,visiteDate);

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -14,7 +14,6 @@ import com.huiju.welcome.mapper.TaWechatUserMapper;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaCustomerMapper;
-import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.service.ITaMainUsherRecordService;

src/main/resources/mapper/TaCustomerMapper.xml

@@ -35,4 +35,15 @@
         </where>
         order by create_date desc
     </select>
+
+    <select id="getSomeCustMayBe" resultType="com.huiju.welcome.model.TaCustomer">
+        SELECT
+            *
+        FROM
+            ta_customer t
+        WHERE
+            t.plate_number = #{plateNumber}
+        AND IFNULL(t.customer_name, '') != ''
+        AND t.`status` = 1
+    </select>
 </mapper>