feats

.idea/workspace.xml

@@ -1,17 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" line="159" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java" line="186" mnemonic="1" />
   </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/common/WebSocketServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" 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/TaCustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.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/TaPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.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/TaFirstUsherRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.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/mapper/TaWechatUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.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/ITaFollowupRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.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/CameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.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/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/service/impl/TaVisitorAppointmentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,98 +40,33 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="TaCarRecordController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java">
+      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="true">
+        <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="180">
-              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+            <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="imports" expanded="true" />
+                <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.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="372">
-              <caret line="27" column="56" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaMainUsherRecord.java" pinned="false" current-in-tab="true">
-        <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="180">
-              <caret line="21" selection-start-line="21" selection-end-line="21" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaNotice.java" pinned="false" current-in-tab="false">
-        <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="229">
-              <caret line="21" column="24" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="21" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaFirstUsherRecordServiceImpl.java" pinned="false" current-in-tab="false">
-        <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="273">
-              <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaMainUsherRecordServiceImpl.java" pinned="false" current-in-tab="false">
-        <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="265">
-              <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaVisitorAppointmentServiceImpl.java" pinned="false" current-in-tab="false">
-        <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="229">
-              <caret line="30" column="58" selection-start-line="30" selection-start-column="58" selection-end-line="30" selection-end-column="58" />
+            <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>
           </provider>
         </entry>
       </file>
-      <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">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="122" column="11" selection-start-line="122" selection-start-column="11" selection-end-line="122" selection-end-column="11" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="231">
+              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
             </state>
           </provider>
         </entry>
@@ -138,20 +90,24 @@
       <find>subDir</find>
       <find>huiju.files</find>
       <find>huijuFiles</find>
-      <find>getMultipartFile</find>
       <find>voice</find>
       <find>mybatis-plus</find>
       <find>AccessInterceptor</find>
       <find>/taMainUsherRecord</find>
       <find>web</find>
       <find>/wx/login</find>
-      <find>sendInfo</find>
       <find>/taCarRecord</find>
       <find>/taCustomerMap</find>
       <find>/taCustomer</find>
       <find>isSales</find>
       <find>apointment</find>
       <find>taFirstpageService.detail</find>
+      <find>sendInfo</find>
+      <find>newRecordByFront</find>
+      <find>judgeNewCust</find>
+      <find>notifyConsultant</find>
+      <find>saveVisitingLog</find>
+      <find>getMultipartFile</find>
     </findStrings>
     <replaceStrings>
       <replace>com.huiju.welcome</replace>
@@ -173,57 +129,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaFollowupRecordMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaFollowupRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomerMap.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerMapService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerMapServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/base/ResponseBean.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerMapController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/MiniAppController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/JWTUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/StatusUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitorAppointment.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingLogController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitingLogService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" />
         <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/service/ITaFollowupRecordService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.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/controller/CameraController.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/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/controller/TaMainUsherRecordController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.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/service/impl/TaVisitorAppointmentServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <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" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMiniFormidsMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaMiniFormidsMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMiniFormidsService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMiniFormidsImpl.java" />
+        <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" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMessageRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMessageRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMessageRecordImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" />
+        <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/service/impl/TaMainUsherRecordServiceImpl.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" />
       </list>
     </option>
   </component>
@@ -284,8 +240,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -335,8 +291,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-              <item name="base" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="service" type="b2602c69:ProjectViewProjectNode" />
@@ -345,7 +300,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="service" type="b2602c69:ProjectViewProjectNode" />
@@ -354,11 +309,19 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -393,7 +356,7 @@
       <recent name="com.huiju.welcome.service" />
       <recent name="com.huiju.welcome.mapper" />
       <recent name="com.huiju.welcome.model" />
-      <recent name="com.huiju.welcome.config" />
+      <recent name="com.huiju.welcome.controller" />
     </key>
     <key name="CreateClassDialog.RecentsKey">
       <recent name="com.huiju.welcome.service.impl" />
@@ -494,18 +457,22 @@
       <workItem from="1560349322476" duration="6394000" />
       <workItem from="1560411485381" duration="45888000" />
       <workItem from="1560923587540" duration="24987000" />
+      <workItem from="1561084889145" duration="26895000" />
+      <workItem from="1561339069413" duration="2416000" />
+      <workItem from="1561343517448" duration="18391000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="307284000" />
+    <option name="totallyTimeSpent" value="354986000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50096524" side_tool="true" weight="0.39953408" />
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.078891255" />
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.051705755" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -513,9 +480,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.19612315" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" visible="true" weight="0.19612315" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.3295325" />
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.19156215" />
       <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" />
@@ -523,10 +490,11 @@
       <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.4355758" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23720682" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.19840364" />
+      <window_info 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" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -534,7 +502,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49903476" weight="0.32964474" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -545,398 +512,412 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="17" />
+      <option name="time" value="19" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java">
+    <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="591">
-          <caret line="148" selection-start-line="148" selection-end-line="148" />
+        <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/model/TaVisitorAppointment.java">
+    <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="661">
-          <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+        <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/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="346">
-          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="416">
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerMapController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+        <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/resources/mapper/TaMainUsherRecordMapper.xml">
+    <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="273">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        <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/controller/SysUserController.java">
+    <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="4116">
-          <caret line="217" selection-start-line="217" selection-end-line="217" />
+        <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/java/com.huiju.welcome/model/SysUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9">
-          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
+        <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/model/TaCustomerMap.java">
+    <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="331">
-          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+        <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/TaCustomWordsMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaVisitorAppointmentMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="43" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="43" />
+        <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/TaPerson.java">
+    <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="462">
-          <caret line="29" column="26" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="26" />
+        <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/resources/mapper/TaPersonMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <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/service/ITaVisitingLogService.java">
+    <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="399">
-          <caret line="27" column="16" selection-start-line="27" selection-start-column="4" selection-end-line="27" selection-end-column="16" />
+        <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/TaVisitingLog.java">
+    <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="206">
-          <caret line="33" column="36" selection-start-line="33" selection-start-column="26" selection-end-line="33" selection-end-column="36" />
+        <state relative-caret-position="210">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMiniFormidsMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1037">
-          <caret line="93" lean-forward="true" selection-start-line="93" selection-end-line="93" />
+        <state relative-caret-position="42">
+          <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingLogController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMiniFormidsService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="115" column="43" lean-forward="true" selection-start-line="115" selection-start-column="25" selection-end-line="115" selection-end-column="43" />
+        <state relative-caret-position="147">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
           <folding>
-            <element signature="e#4950#4951#0" expanded="true" />
-            <element signature="e#4999#5000#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="359">
-          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
+        <state relative-caret-position="1442">
+          <caret line="117" column="19" lean-forward="true" selection-start-line="117" selection-start-column="19" selection-end-line="117" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="263" column="20" selection-start-line="263" selection-start-column="20" selection-end-line="263" selection-end-column="20" />
+        <state relative-caret-position="252">
+          <caret line="48" column="11" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="243" lean-forward="true" selection-start-line="243" selection-end-line="243" />
+        <state relative-caret-position="185">
+          <caret line="147" column="45" lean-forward="true" selection-start-line="147" selection-start-column="38" selection-end-line="147" selection-end-column="52" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMiniFormidsImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="546">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java">
+    <entry file="jar://D:/REPO/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/http/HttpStatus.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="50" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
+        <state relative-caret-position="417">
+          <caret line="162" column="5" lean-forward="true" selection-start-line="162" selection-start-column="5" selection-end-line="162" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java">
+    <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="-567">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <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/model/TaFollowupRecord.java">
+    <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="435">
-          <caret line="33" column="1" lean-forward="true" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" />
+        <state relative-caret-position="21">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMiniFormidsMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
+        <state relative-caret-position="315">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMessageRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1050">
-          <caret line="50" column="21" lean-forward="true" selection-start-line="44" selection-start-column="21" selection-end-line="50" selection-end-column="21" />
+        <state relative-caret-position="315">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+          <folding>
+            <element signature="e#499#503#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/AliOSSProperties.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMessageRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-109">
-          <caret line="7" selection-start-line="7" selection-end-line="7" selection-end-column="40" />
+        <state relative-caret-position="599">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliOSSUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="11" column="47" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="47" />
+        <state relative-caret-position="126">
+          <caret line="62" column="59" selection-start-line="62" selection-start-column="59" selection-end-line="62" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMessageRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="31" />
+        <state relative-caret-position="168">
+          <caret line="8" column="11" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMessageRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="223" column="59" lean-forward="true" selection-start-line="223" selection-start-column="59" selection-end-line="223" selection-end-column="59" />
+        <state relative-caret-position="399">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMessageRecordImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="357">
+          <caret line="17" column="47" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMiniFormidsController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <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 relative-caret-position="315">
+          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaWechatUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="672">
-          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
+        <state relative-caret-position="252">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaWechatUserMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/service/impl/TaCustomerServiceImpl.java">
+    <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="342">
-          <caret line="99" column="43" selection-start-line="99" selection-start-column="35" selection-end-line="99" selection-end-column="43" />
+        <state relative-caret-position="399">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#3694#3695#0" expanded="true" />
-            <element signature="e#3757#3758#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/AudioController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="588">
+          <caret line="81" column="73" selection-start-line="81" selection-start-column="73" selection-end-line="81" selection-end-column="73" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1937">
-          <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
+        <state relative-caret-position="462">
+          <caret line="27" column="62" selection-start-line="27" selection-start-column="62" selection-end-line="27" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java">
+    <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="483">
-          <caret line="242" column="56" lean-forward="true" selection-start-line="242" selection-start-column="56" selection-end-line="242" selection-end-column="56" />
+        <state relative-caret-position="1241">
+          <caret line="83" lean-forward="true" selection-start-line="83" selection-end-line="83" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstpageService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaFollowupRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
+        <state relative-caret-position="273">
+          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="44" column="43" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
+        <state relative-caret-position="483">
+          <caret line="31" column="56" selection-start-line="31" selection-start-column="48" selection-end-line="31" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java">
+    <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="441">
-          <caret line="55" selection-start-line="55" selection-end-line="55" />
+        <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/controller/TaFirstUsherRecordController.java">
+    <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="315">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/service/ITaCarRecordService.java">
+    <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="378">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
+        <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/controller/TaCarRecordController.java">
+    <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="180">
-          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/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="265">
-          <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
+        <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/model/TaFirstUsherRecord.java">
+    <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="987">
-          <caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
+        <state relative-caret-position="105">
+          <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/AudioController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="30" column="58" selection-start-line="30" selection-start-column="58" selection-end-line="30" selection-end-column="58" />
+        <state relative-caret-position="441">
+          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/Action.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="27" column="56" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
+        <state relative-caret-position="524">
+          <caret line="36" column="5" lean-forward="true" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        <state relative-caret-position="293">
+          <caret line="62" column="12" lean-forward="true" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="378">
+          <caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="122" column="11" selection-start-line="122" selection-start-column="11" selection-end-line="122" selection-end-column="11" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaNotice.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="21" column="24" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="21" selection-end-column="24" />
+        <state relative-caret-position="231">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java">
+    <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="180">
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
+        <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="imports" expanded="true" />
+            <element signature="e#5763#5764#0" expanded="true" />
+            <element signature="e#5781#5782#0" expanded="true" />
           </folding>
         </state>
       </provider>

src/main/java/com.huiju.welcome/common/Action.java

@@ -0,0 +1,51 @@
+package com.huiju.welcome.common;
+
+/**
+ * 此类同硬件服务端的定义是一致的
+ */
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.welcome.utils.StringUtils;
+import lombok.Data;
+
+@Data
+public class Action {
+    public final static String TYPE_DEFAULT = "default";
+    public final static String TYPE_ACK = "ack";
+    public final static String TYPE_DISPATCH_FACE = "dispatch-face";
+    public final static String TYPE_TO_FRONT = "to-front";
+    public final static String TYPE_NEW_MAIN_USHER = "new-main-usher";
+    public final static String TYPE_NEW_FIRST_USHER = "new-first-usher";
+
+    public final static String ACK_SUCCESS = "success";
+
+    String id;
+    String type;
+    Object payload;
+
+    public static Action create(String type, Object payload, String ...ids) {
+        Action act = new Action();
+        act.setType(type);
+        act.setPayload(payload);
+
+        if (null != ids && ids.length > 1) {
+            act.setId(ids[0]);
+        } else {
+            act.setId(StringUtils.random(32));
+        }
+        return act;
+    }
+
+    public static Action ack(Action origin) {
+        return Action.create(Action.TYPE_ACK, ACK_SUCCESS, origin.getId());
+    }
+
+    public Action response(Object result) {
+        this.setPayload(result);
+        return this;
+    }
+
+    public String toJSON() {
+        return JSONObject.toJSONString(this);
+    }
+}

src/main/java/com.huiju.welcome/common/WebSocketServer.java

@@ -1,5 +1,6 @@
 package com.huiju.welcome.common;
 
+import com.huiju.welcome.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -14,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * @author FXF
  * @date 2019-03-14
  */
-@ServerEndpoint("/websocket/{sid}")
+@ServerEndpoint("/ws/{type}/{sid}")
 @Component
 public class WebSocketServer {
 	private static Logger log = LoggerFactory.getLogger(WebSocketServer.class);
@@ -32,27 +33,28 @@ public class WebSocketServer {
 	 * 与某个客户端的连接会话，需要通过它来给客户端发送数据
 	 */
 	private Session session;
-	
+
 	/**
 	 * 接收sid
 	 */
 	private String sid="";
+	String type = "";
+
 	/**
 	 * 连接建立成功调用的方法*/
 	@OnOpen
-	public void onOpen(Session session,@PathParam("sid") String sid) {
+	public void onOpen(Session session,@PathParam("sid") String sid, @PathParam("type") String type) {
+		if (null == sid || "".equals(sid)) return;
+
+		this.sid = sid;
+		this.type = type;
 		this.session = session;
 		//加入set中
 		webSocketSet.add(this);
 		//在线数加1
 		addOnlineCount();
+
 		log.info("有新窗口开始监听:"+sid+",当前在线人数为" + getOnlineCount());
-		this.sid=sid;
-//		try {
-//			sendMessage("连接成功");
-//		} catch (IOException e) {
-//			log.error("websocket IO异常");
-//		}
 	}
 	
 	/**
@@ -60,9 +62,7 @@ public class WebSocketServer {
 	 */
 	@OnClose
 	public void onClose() {
-		//从set中删除
 		webSocketSet.remove(this);
-		//在线数减1
 		subOnlineCount();
 		log.info("有一连接关闭！当前在线人数为" + getOnlineCount());
 	}
@@ -74,14 +74,18 @@ public class WebSocketServer {
 	@OnMessage
 	public void onMessage(String message, Session session) {
 		log.info("收到来自窗口"+sid+"的信息:"+message);
-//		//群发消息
-//		for (WebSocketServer item : webSocketSet) {
-//			try {
-//				item.sendMessage(message);
-//			} catch (IOException e) {
-//				e.printStackTrace();
-//			}
-//		}
+
+		if (null == message || "".equals(message)) {
+			return;
+		}
+
+		if ("ping".equals(message)) {
+			try {
+				sendMessage("pong");
+			} catch (IOException e) {}
+		}
+
+		// 目前需求, 没有需要通过 ws 来处理的业务
 	}
 	
 	/**
@@ -91,13 +95,15 @@ public class WebSocketServer {
 	 */
 	@OnError
 	public void onError(Session session, Throwable error) {
-		log.error("发生错误");
+		log.error("发生错误: " + error.getMessage());
 		error.printStackTrace();
 	}
+
 	/**
 	 * 实现服务器主动推送
 	 */
 	public void sendMessage(String message) throws IOException {
+		log.info("发送消息 [{}-{}]: {}", type, sid, message);
 		this.session.getBasicRemote().sendText(message);
 	}
 	
@@ -105,21 +111,28 @@ public class WebSocketServer {
 	/**
 	 * 群发自定义消息
 	 * */
-	public static void sendInfo(String message,@PathParam("sid") String sid) throws IOException {
-		log.info("推送消息到窗口"+sid+"，推送内容:"+message);
+	public static void sendInfo(String message, String type, String sid) throws Exception {
+		if (StringUtils.isEmpty(type) || StringUtils.isEmpty(message)) {
+			throw new Exception("发送数据非法, 部分字段为空");
+		}
+
 		for (WebSocketServer item : webSocketSet) {
 			try {
-				//这里可以设定只推送给这个sid的，为null则全部推送
-				if(sid==null) {
+				if (StringUtils.isEmpty(sid) && "miniapp".equals(type)) {
+					// 小程序消息, 如果 sid 为空, 则广播
 					item.sendMessage(message);
-				}else if(item.sid.equals(sid)){
-					log.info("推送消息到窗口"+sid+"，推送内容:"+message);
+				} else  if(item.sid.equals(sid) && item.type.equals(type)){
 					item.sendMessage(message);
+					return;
 				}
 			} catch (IOException e) {
+				log.error("发送数据失败: [{}-{}], 发送内容: {}", type, sid, message);
+				log.error("错误内容: {}", e.getMessage());
 				continue;
 			}
 		}
+
+		log.error("发送数据失败: [{}-{}] 不在线, 发送内容: {}", type, sid, message);
 	}
 	
 	public static synchronized int getOnlineCount() {

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

@@ -3,10 +3,12 @@ package com.huiju.welcome.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huiju.welcome.common.Action;
 import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.AliOSSUtils;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.XFYun;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +22,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
+import javax.websocket.server.PathParam;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -67,6 +71,9 @@ public class CameraController {
 	@Autowired
 	private ITaPersonTypeService taPersonTypeService;
 
+	@Autowired
+	private ITaCustomerService iTaCustomerService;
+
 	@Autowired
 	private XFYun xfYun;
 	
@@ -156,11 +163,8 @@ public class CameraController {
 			}
 		}
 
-		// 抓拍照落地
-		long nowTime = System.currentTimeMillis();
-		String avatar = "/camera/" + nowTime + "_" + deviceId + ".jpg";
-		getMultipartFile(snapshot, avatar);
-		taSnapshotPerson.setAvatar(avatar);
+		// 抓拍照
+		taSnapshotPerson.setAvatar(getMultipartFile(snapshot));
 
 		if (newGuy) {
 			// 新人入库, 同时写入抓拍人ID
@@ -176,12 +180,24 @@ public class CameraController {
 		// 预写到访日志
 		saveVisitingLog(taPerson, taSnapshotPerson);
 
+		// 判断是否客户来访
+		try {
+			iTaCustomerService.judgeNewCust(taPerson);
+		} catch (Exception e) {
+			log.error(e.getMessage());
+		}
+
 		// 推送消息
 		sendPersionInfo(taPerson);
 
 		return responseBean;
 	}
 
+	@PostMapping(value = "/camera/{deviceId}/car")
+	public ResponseBean car(@PathParam("deviceId") String deviceId, @RequestBody String paramStr) {
+		return null;
+	}
+
 	//推送给前端
 	private void sendPersionInfo(TaPerson taPerson) {
 		TaVisitingWords taVisitingWords = null;
@@ -220,44 +236,33 @@ public class CameraController {
 		words = words.replace("{{name}}", personName).replace("{{sex}}", sex == 2 ? "女士" : "先生");
 		taVisitingWords.setWords(words);
 
-		Map<String,Object> map = new HashMap<>();
-		map.put("person",taPerson);
-		map.put("taVisitingWords",taVisitingWords);
-		map.put("audio", xfYun.voice( personName + "," + words, sex  == 2 ? 1 : 2));
+		Map<String,Object> data = new HashMap<>();
+		data.put("person",taPerson);
+		data.put("taVisitingWords",taVisitingWords);
+		data.put("audio", xfYun.voice( personName + "," + words, sex  == 2 ? 1 : 2));
+
+
+		Map<String, Object> payload = new HashMap<>();
+		payload.put("to", deviceId);
+		payload.put("data", data);
+		Action act = Action.create(Action.TYPE_TO_FRONT, payload);
+
 		try {
-			WebSocketServer.sendInfo(JSONObject.toJSONString(map),deviceId);
-		} catch (IOException e) {
+			WebSocketServer.sendInfo(act.toJSON(), "device", deviceId);
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
 	// 获取上传单文件
-	private boolean getMultipartFile(MultipartFile f, String newFname) {
-		if (null == f || f.isEmpty()) {
-			log.error("========================没有获取到抓拍图片");
-			return false;
-		} else {
-			log.info("=======================成功获取到抓拍数据流");
-		}
-
-		File localDir = new File(huijuFiles + "camera");
-		if (!localDir.exists()) localDir.mkdirs();
-
+	private String getMultipartFile(MultipartFile f) {
 		try {
-			byte[] fBytes = f.getBytes();
-			ByteBuffer buf = ByteBuffer.wrap(fBytes);
-			FileChannel fc = new FileOutputStream(huijuFiles + newFname).getChannel();
-			fc.write(buf);
-			fc.close();
-		} catch (Exception e) {
+			return AliOSSUtils.putObject(f);
+		} catch (IOException e) {
 			e.printStackTrace();
-			log.error("读取抓拍图片失败: " + e.getMessage());
-			return false;
+			log.error("上传人脸至阿里云失败: " + e.getMessage());
+			return null;
 		}
-
-		log.info("成功落地抓拍图: " + huijuFiles + newFname);
-
-		return true;
 	}
 
 	private TaPerson saveNewPerson(TaSnapshotPerson taSnapshotPerson) {

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

@@ -14,6 +14,7 @@ import com.huiju.welcome.model.TaWechatUser;
 import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
+import com.huiju.welcome.utils.StatusUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -104,11 +105,12 @@ public class TaCustomerController extends BaseController {
             }
             iTaCustomerMapService.saveBatch(customerMapList);
 
-
+            taCustomer.setStatus(StatusUtils.Normal);
+            taCustomer.setCreateDate(LocalDateTime.now());
             if (iTaCustomerService.save(taCustomer)){
 
                 // 新增会员来访信息
-                iTaMainUsherRecordService.newRecordByFront(taCustomer);
+                iTaMainUsherRecordService.newRecordByConsultant(taCustomer);
 
                 List<TaPerson> group = iTaCustomerService.getGroup(taCustomer.getCustomerId());
                 taCustomer.setGroup(group);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.common.Action;
 import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
@@ -100,14 +101,20 @@ public class TaDeviceController extends BaseController {
         preDef.setSize(9999999l); // 代表无限大
 
         IPage<TaPerson> pg = taPersonService.page(preDef, wrapper);
-        Map<String, Object> msg = new HashMap<>();
+        Map<String, Object> data = new HashMap<>();
         if (null != wsId && !"".equals(wsId) && from.intValue() == 0) {
-            msg.put("step", "ready");
-            msg.put("total", pg.getTotal());
+            data.put("step", "ready");
+            data.put("total", pg.getTotal());
+
+            Map<String, Object> payload = new HashMap<>();
+            payload.put("to", wsId);
+            payload.put("data", data);
+            Action act = Action.create(Action.TYPE_TO_FRONT, payload);
+
             try {
                 // 通知前端开始处理
-                WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
-            } catch (IOException e) {
+                WebSocketServer.sendInfo(act.toJSON(), "device", deviceId);
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
@@ -117,14 +124,20 @@ public class TaDeviceController extends BaseController {
         if (total > 0) {
             for(TaPerson person: personList) {
                 if (null != wsId && !"".equals(wsId)) {
-                    msg.clear();
-                    msg.put("step", "process");
-                    msg.put("current", lastNum);
-                    msg.put("id", person.getPersonId());
+                    data.clear();
+                    data.put("step", "process");
+                    data.put("current", lastNum);
+                    data.put("id", person.getPersonId());
+
+                    Map<String, Object> payload = new HashMap<>();
+                    payload.put("to", wsId);
+                    payload.put("data", data);
+                    Action act = Action.create(Action.TYPE_TO_FRONT, payload);
+
                     try {
                         // 通知前端当前处理到这个人
-                        WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
-                    } catch (IOException e) {
+                        WebSocketServer.sendInfo(act.toJSON(), "device", deviceId);
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
@@ -149,12 +162,18 @@ public class TaDeviceController extends BaseController {
         }
 
         if (null != wsId && !"".equals(wsId)) {
-            msg.clear();
-            msg.put("step", "finish");
+            data.clear();
+            data.put("step", "finish");
             try {
                 // 通知前端所有人已处理完
-                WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
-            } catch (IOException e) {
+
+                Map<String, Object> payload = new HashMap<>();
+                payload.put("to", wsId);
+                payload.put("data", data);
+                Action act = Action.create(Action.TYPE_TO_FRONT, payload);
+
+                WebSocketServer.sendInfo(act.toJSON(), "device", deviceId);
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }

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

@@ -4,6 +4,7 @@ package com.huiju.welcome.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.common.Action;
 import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -64,8 +66,13 @@ public class TaFirstpageController extends BaseController {
         }
 
         try {
-            WebSocketServer.sendInfo(data, taFirstpage.getDeviceId());
-        } catch (IOException e) {
+            Map<String, Object> payload = new HashMap<>();
+            payload.put("to", taFirstpage.getDeviceId());
+            payload.put("data", msg);
+            Action act = Action.create(Action.TYPE_TO_FRONT, payload);
+
+            WebSocketServer.sendInfo(act.toJSON(), "device", taFirstpage.getDeviceId());
+        } catch (Exception e) {
             e.printStackTrace();
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "发送失败");
             return responseBean;

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

@@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFollowupRecord;
 import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaFollowupRecordService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.StatusUtils;
+import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +46,9 @@ public class TaMainUsherRecordController extends BaseController {
     @Autowired
     private ITaCustomerService iTaCustomerService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 保存对象
      * @param taMainUsherRecord 实体对象
@@ -53,10 +60,20 @@ public class TaMainUsherRecordController extends BaseController {
         try {
             taMainUsherRecord.setStatus(StatusUtils.Normal);
 
+            if (null == taMainUsherRecord.getConsultantId() || taMainUsherRecord.getConsultantId().intValue() == 0) {
+                return ResponseBean.error("请设置置业顾问", HttpStatus.SC_BAD_REQUEST);
+            } else {
+                SysUser user = iSysUserService.getById(taMainUsherRecord.getConsultantId());
+                taMainUsherRecord.setRealtyConsultant(user.getUsername());
+            }
+
             // 先添加到置业的客户中
-            iTaCustomerService.newVisitRecord(taMainUsherRecord);
+            TaCustomer taCustomer = iTaCustomerService.newVisitRecord(taMainUsherRecord);
 
             if (iTaMainUsherRecordService.save(taMainUsherRecord)){
+
+                iTaMainUsherRecordService.notifyConsultant(taMainUsherRecord, taCustomer);
+
                 responseBean.addSuccess(taMainUsherRecord);
             }else {
                 responseBean.addError("fail");
@@ -100,10 +117,20 @@ public class TaMainUsherRecordController extends BaseController {
         try {
             taMainUsherRecord.setStatus(StatusUtils.Normal);
 
+            if (null == taMainUsherRecord.getConsultantId() || taMainUsherRecord.getConsultantId().intValue() == 0) {
+                return ResponseBean.error("请设置置业顾问", HttpStatus.SC_BAD_REQUEST);
+            } else {
+                SysUser user = iSysUserService.getById(taMainUsherRecord.getConsultantId());
+                taMainUsherRecord.setRealtyConsultant(user.getUsername());
+            }
+
             // 先添加到置业的客户中
-            iTaCustomerService.newVisitRecord(taMainUsherRecord);
+            TaCustomer taCustomer = iTaCustomerService.newVisitRecord(taMainUsherRecord);
 
             if (iTaMainUsherRecordService.updateById(taMainUsherRecord)){
+
+                iTaMainUsherRecordService.notifyConsultant(taMainUsherRecord, taCustomer);
+
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

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

@@ -0,0 +1,34 @@
+package com.huiju.welcome.controller;
+
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaWechatUser;
+import com.huiju.welcome.service.ITaMiniFormidsService;
+import com.huiju.welcome.service.ITaWechatUserService;
+import com.huiju.welcome.utils.JWTUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/")
+public class TaMiniFormidsController extends BaseController {
+
+    @Autowired
+    ITaMiniFormidsService taMiniFormidsService;
+
+    @Autowired
+    ITaWechatUserService iTaWechatUserService;
+
+    @PostMapping("/miniapp/formid")
+    public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request) {
+        String userId = JWTUtils.getSubject(request);
+        TaWechatUser taWechatUser = iTaWechatUserService.getById(Integer.valueOf(userId));
+
+        return taMiniFormidsService.saveFormidBy(taWechatUser.getOpenid(), paramStr);
+    }
+}

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

@@ -47,6 +47,9 @@ public class TaPersonController extends BaseController {
     @Autowired
     private ICameraService cameraService;
 
+    @Autowired
+    ITaCustomerService iTaCustomerService;
+
     @ApiOperation(value = "新增人员", notes = "新增人员")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "TaPerson", name = "taPerson", value = "人员详情")
@@ -85,6 +88,11 @@ public class TaPersonController extends BaseController {
             return responseBean;
         }
 
+        // 如果是将VIP更新为工作人员, 需要在客户列表中取消
+        if (taPerson.getTypeId() == 2) {
+            iTaCustomerService.deleteCustOfPerson(taPerson.getPersonId(), taPerson.getRealId());
+        }
+
         return responseBean;
     }
 

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

@@ -12,6 +12,7 @@ import com.huiju.welcome.model.TaWechatUser;
 import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaWechatUserService;
+import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
@@ -78,7 +79,7 @@ public class TaWechatUserController extends BaseController {
             // 否则新增用户数据
             taWechatUser = new TaWechatUser();
             taWechatUser.setAppid(appid);
-            taWechatUser.setClientType("miniapp");
+            taWechatUser.setClientType(CommConstant.WECHAT_CLIENT_MINIAPP);
             taWechatUser.setOpenid(openid);
             taWechatUser.setUnionId(unionId);
             taWechatUser.setStatus(StatusUtils.Normal);

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaCustomer;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
+    TaCustomer getCustomerOf(@Param("personId") Integer personId, @Param("realId") Integer realId);
 }

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

@@ -6,6 +6,8 @@ import com.huiju.welcome.model.TaMainUsherRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,4 +28,6 @@ public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
      * @return
      */
     IPage<TaMainUsherRecord> aMainUsherRecordList(IPage<TaMainUsherRecord> pg);
+
+    List<TaMainUsherRecord> getLastList(@Param("personId") Integer personId, @Param("dt") LocalDateTime dt);
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaMessageRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaMessageRecordMapper extends BaseMapper<TaMessageRecord> {
+    List<TaMessageRecord> getLastSameMessages(@Param("receiver") String receiver, @Param("link") String link, @Param("content") String content, @Param("dt") LocalDateTime dt);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaMiniFormids;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Mapper
+public interface TaMiniFormidsMapper extends BaseMapper<TaMiniFormids> {
+
+    TaMiniFormids getFormidCanUse(@Param("openid") String openid);
+
+}

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

@@ -3,6 +3,7 @@ package com.huiju.welcome.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.welcome.model.TaWechatUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaWechatUserMapper extends BaseMapper<TaWechatUser> {
-
+    String getOpenidOf(@Param("personId") Integer personId, @Param("clientType") String clientType);
 }

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

@@ -0,0 +1,45 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMessageRecord {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * receiver;
+     */
+    private String receiver;
+
+    /**
+     * link
+     */
+    private String link;
+
+    /**
+     * content
+     */
+    private String content;
+
+    /**
+     * tplId
+     */
+    private String tplId;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime createDate;
+}

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

@@ -0,0 +1,37 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMiniFormids {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * openid;
+     */
+    private String openid;
+
+
+    /**
+     * 表单id
+     */
+    private String formid;
+
+
+    /**
+     * 点赞时间
+     */
+    private LocalDateTime createDate;
+}

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

@@ -17,9 +17,13 @@ import java.util.Map;
  */
 public interface ITaCustomerService extends IService<TaCustomer> {
 
-    void newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception;
+    TaCustomer newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception;
 
     List<TaPerson> getGroup(Integer customerId);
 
     Map<String, Object> getLastVisitInfo(Integer customerId);
+
+    void judgeNewCust(TaPerson taPerson) throws Exception;
+
+    void deleteCustOfPerson(Integer personId, Integer realId);
 }

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

@@ -1,6 +1,5 @@
 package com.huiju.welcome.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaFollowupRecord;
 

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

@@ -18,12 +18,16 @@ import java.util.List;
 public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     boolean updateNormal(List<TaMainUsherRecord> recs);
-
-    boolean newRecordByFront(TaCustomer taCustomer);
     /**
      * 分页查询大厅记录
      * @param pg
      * @return
      */
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg);
+
+    void notifyConsultant(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception;
+
+    boolean newRecordByDevice(TaCustomer taCustomer);
+
+    boolean newRecordByConsultant(TaCustomer taCustomer);
 }

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

@@ -0,0 +1,10 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaMessageRecord;
+
+import java.util.List;
+
+public interface ITaMessageRecordService extends IService<TaMessageRecord> {
+    boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data);
+}

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

@@ -0,0 +1,11 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaMiniFormids;
+
+public interface ITaMiniFormidsService extends IService<TaMiniFormids> {
+    ResponseBean saveFormidBy(String openid, String formid);
+
+    String getFormidBy(String openid, boolean... delete);
+}

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

@@ -1,6 +1,8 @@
 package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.welcome.common.Action;
+import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.service.ICameraService;
@@ -13,7 +15,9 @@ import org.springframework.stereotype.Service;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CameraServiceImpl implements ICameraService {
@@ -34,23 +38,13 @@ public class CameraServiceImpl implements ICameraService {
         //分发人脸到各个相机
         for(TaDevice device: taDeviceList) {
             try {
-                String api = device.getApi() + "/person/" + taPerson.getPersonId();
-                byte[] data = ("image=" + Encrypt.urlEncode(taPerson.getAvatar())).getBytes("UTF-8");
-
-                HttpURLConnection conn = (HttpURLConnection) new URL(api).openConnection();
-                conn.setRequestMethod("POST");
-                conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-                conn.setRequestProperty("Content-Length", String.valueOf(data.length));
-                conn.setDoInput(true);
-                conn.setDoOutput(true);
-                conn.setUseCaches(false);
-                conn.getOutputStream().write(data);
-
-                if (conn.getResponseCode() == 200) {
-                    System.out.println("========下发人脸完成=======");
-                } else {
-                    System.out.println("========下发人脸失败=======" + conn.getResponseMessage());
-                }
+                Map<String, Object> payload = new HashMap<>();
+                payload.put("personId", taPerson.getPersonId());
+                payload.put("image", taPerson.getAvatar());
+
+                Action act = Action.create(Action.TYPE_DISPATCH_FACE, payload);
+
+                WebSocketServer.sendInfo(act.toJSON(), "device", device.getDeviceId());
             } catch (Exception e){
                 e.printStackTrace();
                 return "连接设备(" + device.getDeviceId() + ")人脸下发服务 失败: "+ e.getMessage();

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

@@ -1,17 +1,19 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.mapper.TaPersonMapper;
 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.service.ITaCustomerService;
+import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
+import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,9 +44,14 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaMainUsherRecordService iTaMainUsherRecordService;
+
+    @Autowired
+    MiniApp miniApp;
+
     @Override
-    public void newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception {
-        Integer custId = taMainUsherRecord.getCustomerId();
+    public TaCustomer newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception {
         Integer personId = taMainUsherRecord.getPersonId();
         if (null == personId) {
             TaPerson taPerson = iTaPersonService.newPersonByUsher(taMainUsherRecord);
@@ -52,47 +59,31 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             taMainUsherRecord.setPersonId(personId);
         }
 
-        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
-        if (null == taCustomerMap) {
-            TaCustomer cust = new TaCustomer();
-            cust.setCustomerId(taMainUsherRecord.getPersonId());
-            cust.setCustomerName(taMainUsherRecord.getPersonName());
-            cust.setSex(taMainUsherRecord.getSex());
-            cust.setPhone(taMainUsherRecord.getPhone());
-            cust.setAvatar(taMainUsherRecord.getAvatar());
-            cust.setPlateNumber(taMainUsherRecord.getPlateNumber());
-            cust.setCarModel(taMainUsherRecord.getCarModel());
-            cust.setChannel(taMainUsherRecord.getChannel());
-            cust.setPurpose(taMainUsherRecord.getPurpose());
-            cust.setConsultantId(taMainUsherRecord.getConsultantId());
-            cust.setRealtyConsultant(taMainUsherRecord.getRealtyConsultant());
-            cust.setStatus(StatusUtils.Normal);
-            cust.setCreateDate(LocalDateTime.now());
-
-            int row = taCustomerMapper.insert(cust);
-            if (row <= 0) {
+        Integer custId = taMainUsherRecord.getCustomerId();
+        TaCustomer cust;
+        if (null == custId) {
+            cust = newCustomerFromMainUsher(taMainUsherRecord);
+            if (null == cust) {
                 throw new Exception("生成置业客户失败");
             }
+            taMainUsherRecord.setCustomerId(cust.getCustomerId());
+        } else {
+            cust = taCustomerMapper.selectById(custId);
+        }
 
-            // 反向写入来访记录
-            if (null == custId || custId.intValue() == 0) {
-                taMainUsherRecord.setCustomerId(cust.getCustomerId());
-            }
-
+        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
+        if (null == taCustomerMap) {
             TaCustomerMap custMap = new TaCustomerMap();
             custMap.setCustomerId(cust.getCustomerId());
             custMap.setPersonId(taMainUsherRecord.getPersonId());
 
-            row = taCustomerMapMapper.insert(custMap);
+            int row = taCustomerMapMapper.insert(custMap);
             if (row <= 0) {
                 throw new Exception("生成置业客户映射失败");
             }
-        } else {
-            // 反向写入来访记录
-            if (null == custId || custId.intValue() == 0) {
-                taMainUsherRecord.setCustomerId(taCustomerMap.getCustomerId());
-            }
         }
+
+        return cust;
     }
 
     @Override
@@ -105,4 +96,95 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         return taMainUsherRecordMapper.getSummaryOfCustomer(customerId);
     }
 
+    @Override
+    public void judgeNewCust(TaPerson taPerson) throws Exception {
+        // 首先判定这个人 2 小时内是否来访过
+        LocalDateTime dt = LocalDateTime.now().minusHours(2);
+        List<TaMainUsherRecord> lastList = taMainUsherRecordMapper.getLastList(taPerson.getPersonId(), dt);
+        if (null != lastList && lastList.size() > 0) return;
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 查询是否有映射客户 - 如果有多个映射客户, 先随机取一条
+        // 暂时没有找到好的替代方案
+        TaCustomer taCustomer = taCustomerMapper.getCustomerOf(taPerson.getPersonId(), taPerson.getRealId());
+
+        // 如果是新人过来
+        if (null == taCustomer) {
+            taCustomer = newCustomerByPerson(taPerson);
+        }
+
+        // 新增前台记录
+        iTaMainUsherRecordService.newRecordByDevice(taCustomer);
+
+        return;
+    }
+
+    @Override
+    public void deleteCustOfPerson(Integer personId, Integer realId) {
+        // 删除映射表
+        QueryWrapper<TaCustomerMap> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId).or().eq("person_id", realId);
+        taCustomerMapMapper.delete(queryWrapper);
+
+        // 删除客户表, 更新状态为删除
+        // 默认客户ID 与人员ID是一致的
+        UpdateWrapper<TaCustomer> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", StatusUtils.Delete);
+        updateWrapper.eq("customer_id", personId).or().eq("customer_id", realId);
+        taCustomerMapper.update(new TaCustomer(), updateWrapper);
+    }
+
+    private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {
+        TaCustomer taCustomer = new TaCustomer();
+        taCustomer.setCustomerId(taPerson.getRealId());
+        taCustomer.setAvatar(taPerson.getAvatar());
+        taCustomer.setPhone(taPerson.getPhone());
+//            taCustomer.setSex(taPerson.getSex());
+        taCustomer.setCustomerName(taPerson.getName());
+        taCustomer.setCreateDate(LocalDateTime.now());
+        taCustomer.setStatus(StatusUtils.Normal);
+        int row = taCustomerMapper.insert(taCustomer);
+
+        if (row < 1) {
+            throw new Exception("新增客户信息失败");
+        }
+
+        int mapsNum = taPerson.getPersonId().equals(taPerson.getRealId()) ? 1 : 2;
+
+        for (int i = 0; i < mapsNum; i ++) {
+            TaCustomerMap custMap = new TaCustomerMap();
+            custMap.setPersonId(i == 0 ? taPerson.getRealId() : taPerson.getPersonId());
+            custMap.setCustomerId(taCustomer.getCustomerId());
+            row = taCustomerMapMapper.insert(custMap);
+            if (row < 1) {
+                throw new Exception("新增客户映射信息失败");
+            }
+        }
+
+        return taCustomer;
+    }
+
+    private TaCustomer newCustomerFromMainUsher(TaMainUsherRecord taMainUsherRecord) {
+        TaCustomer taCustomer = new TaCustomer();
+        taCustomer.setCustomerId(taMainUsherRecord.getPersonId());       // 默认客户ID与人员ID一致
+        taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
+        taCustomer.setSex(taMainUsherRecord.getSex());
+        taCustomer.setPhone(taMainUsherRecord.getPhone());
+        taCustomer.setAvatar(taMainUsherRecord.getAvatar());
+        taCustomer.setPlateNumber(taMainUsherRecord.getPlateNumber());
+        taCustomer.setCarModel(taMainUsherRecord.getCarModel());
+        taCustomer.setChannel(taMainUsherRecord.getChannel());
+        taCustomer.setPurpose(taMainUsherRecord.getPurpose());
+        taCustomer.setConsultantId(taMainUsherRecord.getConsultantId());
+        taCustomer.setRealtyConsultant(taMainUsherRecord.getRealtyConsultant());
+        taCustomer.setStatus(StatusUtils.Normal);
+        taCustomer.setCreateDate(LocalDateTime.now());
+
+        int row = taCustomerMapper.insert(taCustomer);
+        if (row < 1) return null;
+
+        return taCustomer;
+    }
+
 }

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

@@ -1,14 +1,21 @@
 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 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.SysUserMapper;
 import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
+import com.huiju.welcome.mapper.TaWechatUserMapper;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
+import com.huiju.welcome.utils.CommConstant;
+import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +36,18 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Autowired
     TaMainUsherRecordMapper taMainUsherRecordMapper;
 
+    @Autowired
+    TaVisitorAppointmentMapper taVisitorAppointmentMapper;
+
+    @Autowired
+    TaWechatUserMapper taWechatUserMapper;
+
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Autowired
+    MiniApp miniApp;
+
     @Override
     public boolean updateNormal(List<TaMainUsherRecord> records) {
         if (records == null || records.size() == 0) return true;
@@ -47,7 +66,34 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public boolean newRecordByFront(TaCustomer taCustomer) {
+    public boolean newRecordByDevice(TaCustomer taCustomer) {
+        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
+        int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+
+        try {
+            Action act = Action.create(Action.TYPE_NEW_MAIN_USHER, JSONObject.toJSONString(taMainUsherRecord));
+            WebSocketServer.sendInfo(act.toJSON(), "miniapp", null);
+        } catch (Exception e) {}
+
+        // 通知对应的置业
+        if (null != taCustomer.getConsultantId()) {
+            try {
+                notifyConsultant(taMainUsherRecord, taCustomer);
+            } catch (Exception e) {}
+        }
+
+        return row > 0;
+    }
+
+    @Override
+    public boolean newRecordByConsultant(TaCustomer taCustomer) {
+        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
+        int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+
+        return row > 0;
+    }
+
+    private TaMainUsherRecord newRecordByCust(TaCustomer taCustomer) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
         taMainUsherRecord.setAppointment(taCustomer.getApointment());
@@ -57,15 +103,69 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         taMainUsherRecord.setPlateNumber(taCustomer.getPlateNumber());
         taMainUsherRecord.setVisiteDate(LocalDateTime.now());
         taMainUsherRecord.setStatus(StatusUtils.Normal);
-
-        int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
-
-        return row > 0;
+        return taMainUsherRecord;
     }
-    
+
     @Override
     public IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg) {
         IPage<TaMainUsherRecord>  taMainUsherRecordList= taMainUsherRecordMapper.aMainUsherRecordList(pg);
         return taMainUsherRecordList;
     }
+
+    @Override
+    public void notifyConsultant(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception {
+        Integer realConsultant = taCustomer.getConsultantId();
+        Integer proxyConsultant = taMainUsherRecord.getConsultantId();
+
+        // 查找置业微信ID
+        String openid = taWechatUserMapper.getOpenidOf(proxyConsultant, CommConstant.WECHAT_CLIENT_MINIAPP);
+        if (StringUtils.isEmpty(openid)) {
+            throw new Exception("置业尚未绑定微信小程序");
+        };
+
+        String visitorName = taMainUsherRecord.getPersonName();
+        String phone = taMainUsherRecord.getPhone();
+        Integer customerId = taMainUsherRecord.getCustomerId();
+
+        String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + String.valueOf(customerId);
+        String tplId = miniApp.getTpls().getVisitor();
+
+        // 如果是客户对应的置业进行接待
+        if (realConsultant.equals(proxyConsultant)) {
+            List<Object> data = new ArrayList<Object>(){{
+                add(visitorName);
+                add(phone);
+                add("您有新客户来访, 请及时接待!");
+            }};
+
+            miniApp.sendTPLMessage(tplId, openid, page, data);
+        } else {
+            // 否则, 给原置业发消息, 给接待置业发消息
+
+            // 原绑定置业消息
+            String rcOpenid = taWechatUserMapper.getOpenidOf(realConsultant, CommConstant.WECHAT_CLIENT_MINIAPP);
+            if (StringUtils.isEmpty(openid)) {
+                throw new Exception("置业尚未绑定微信小程序");
+            };
+
+            SysUser usr1 = sysUserMapper.selectById(proxyConsultant);
+            List<Object> dt1 = new ArrayList<Object>(){{
+                add(visitorName);
+                add(phone);
+                add("您有新客户来访, 已被安排给 " + usr1.getUsername() + " 接待!");
+            }};
+            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
+
+
+
+            // 代理置业
+            SysUser usr2 = sysUserMapper.selectById(realConsultant);
+            List<Object> dt2 = new ArrayList<Object>(){{
+                add(visitorName);
+                add(phone);
+                add(usr2.getUsername() + " 有新客户来访, 请协助接待一下!");
+            }};
+            miniApp.sendTPLMessage(tplId, openid, page, dt2);
+        }
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.huiju.welcome.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaMessageRecordMapper;
+import com.huiju.welcome.model.TaMessageRecord;
+import com.huiju.welcome.service.ITaMessageRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class TaMessageRecordImpl extends ServiceImpl<TaMessageRecordMapper, TaMessageRecord> implements ITaMessageRecordService {
+
+    @Autowired
+    TaMessageRecordMapper taMessageRecordMapper;
+
+    @Override
+    public boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data) {
+        String content = JSONObject.toJSONString(data);
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime twoHourAgo = now.minusHours(2);
+
+        List<TaMessageRecord> lastMessages = taMessageRecordMapper.getLastSameMessages(toUser, page, content, twoHourAgo);
+        if (null != lastMessages && lastMessages.size() > 0) return false;
+
+        TaMessageRecord record = new TaMessageRecord();
+        record.setReceiver(toUser);
+        record.setTplId(tplId);
+        record.setLink(page);
+        record.setContent(content);
+        record.setCreateDate(now);
+        taMessageRecordMapper.insert(record);
+
+        return true;
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.huiju.welcome.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.TaMiniFormidsMapper;
+import com.huiju.welcome.model.TaMiniFormids;
+import com.huiju.welcome.service.ITaMiniFormidsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+public class TaMiniFormidsImpl extends ServiceImpl<TaMiniFormidsMapper, TaMiniFormids> implements ITaMiniFormidsService {
+
+    @Autowired
+    TaMiniFormidsMapper taMiniFormidsMapper;
+
+    @Override
+    public ResponseBean saveFormidBy(String openid, String paramsStr) {
+        JSONObject params = JSONObject.parseObject(paramsStr);
+        JSONArray formids = params.getJSONArray("formids");
+
+        for (Object formid: formids) {
+            TaMiniFormids taMiniFormids = new TaMiniFormids();
+            taMiniFormids.setOpenid(openid);
+            taMiniFormids.setFormid(formid.toString());
+            taMiniFormids.setCreateDate(LocalDateTime.now());
+            taMiniFormidsMapper.insert(taMiniFormids);
+        }
+
+        return ResponseBean.success("");
+    }
+
+    @Override
+    public String getFormidBy(String openid, boolean... delete) {
+        TaMiniFormids taMiniFormids = taMiniFormidsMapper.getFormidCanUse(openid);
+
+        if (null != delete && delete.length > 0 && delete[0]) {
+            QueryWrapper<TaMiniFormids> wrapper = new QueryWrapper<>();
+            wrapper.eq("openid", openid);
+            wrapper.eq("formid", taMiniFormids.getFormid());
+
+            taMiniFormidsMapper.delete(wrapper);
+        }
+
+        return taMiniFormids.getFormid();
+    }
+}

src/main/java/com.huiju.welcome/utils/CommConstant.java

@@ -4,4 +4,8 @@ public class CommConstant {
     public final static String IDENTITY_CONSULTANT = "consultant";
     public final static String IDENTITY_FIRSTUSHER = "first-usher";
     public final static String IDENTITY_MAINUSHER = "main-usher";
+
+    public final static String PAGE_MY_CUSTOMER = "";
+
+    public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
 }

src/main/java/com.huiju.welcome/utils/MiniApp.java

@@ -2,10 +2,13 @@ package com.huiju.welcome.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.service.ITaMessageRecordService;
+import com.huiju.welcome.service.ITaMiniFormidsService;
 import lombok.Data;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.http.HttpEntity;
@@ -25,12 +28,20 @@ import java.util.Map;
 public class MiniApp {
     private Logger log = LoggerFactory.getLogger(MiniApp.class);
 
+    @Autowired
+    ITaMiniFormidsService iTaMiniFormidsService;
+
+    @Autowired
+    ITaMessageRecordService iTaMessageRecordService;
+
     private String url;
 
     private String appid;
 
     private String secret;
 
+    private Tpl tpls;
+
 
     public ResponseBean getOpenid(String code) {
         String api = url + "/" + appid + "/login?code=" + code;
@@ -48,7 +59,11 @@ public class MiniApp {
         return ResponseBean.success(result.getJSONObject("data"));
     }
 
-    public ResponseBean sendTPLMessage(String tplId, String formId, String toUser, String page, List<Object> data) {
+    public ResponseBean sendTPLMessage(String tplId, String toUser, String page, List<Object> data) {
+        boolean needSend = iTaMessageRecordService.saveMessageOrNot(toUser, tplId, page, data);
+        if (!needSend) return ResponseBean.success("");
+
+        String formId = iTaMiniFormidsService.getFormidBy(toUser, true);
         String api = String.format("/api/%s/tpl/%s/form/%s/to/%s", appid, tplId, formId, toUser);
 
         HttpHeaders headers = new HttpHeaders();
@@ -71,4 +86,9 @@ public class MiniApp {
 
         return ResponseBean.success("");
     }
+
+    @Data
+    public static class Tpl {
+        private String visitor;
+    }
 }

src/main/resources/application.yml

@@ -45,6 +45,8 @@ miniapp:
   url: http://47.101.36.130:8001/api/miniapp
   appid: wx3f26e5f48c72d39f
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
+  tpls:
+    visitor: m5fR2X1D-iWUurRe-pQQU8VgcxSSZ5eAVoquMixphFw
 
 # ali-cloud
 ali:

src/main/resources/mapper/TaCustomerMapper.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.welcome.mapper.TaCustomerMapper">
+    <select id="getCustomerOf" resultType="com.huiju.welcome.model.TaCustomer">
+        SELECT
+            *
+        FROM
+            ta_customer t
+        WHERE
+            t.customer_id IN (
+                SELECT
+                    s.person_id
+                FROM
+                    ta_customer_map s
+                WHERE
+                    s.person_id = #{personId}
+                OR s.person_id = #{realId}
+            )
+            LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaMainUsherRecordMapper.xml

@@ -16,4 +16,13 @@
         FROM
         ta_main_usher_record
     </select>
+    <select id="getLastList" resultType="com.huiju.welcome.model.TaMainUsherRecord">
+        SELECT
+            *
+        FROM
+            ta_main_usher_record t
+        WHERE
+            t.person_id = #{personId}
+        AND t.visite_date &gt;= #{dt}
+    </select>
 </mapper>

src/main/resources/mapper/TaMessageRecordMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaMessageRecordMapper">
+    <select id="getLastSameMessages" resultType="com.huiju.welcome.model.TaMessageRecord">
+        SELECT
+            *
+        FROM
+            ta_message_record t
+        WHERE
+            t.receiver = #{receiver}
+        AND t.link = #{link}
+        AND t.content = #{content}
+        AND t.create_date &gt;= #{dt}
+    </select>
+</mapper>

src/main/resources/mapper/TaMiniFormidsMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaMiniFormidsMapper">
+    <select id="getFormidCanUse" resultType="com.huiju.welcome.model.TaMiniFormids">
+        SELECT
+            *
+        FROM
+            ta_mini_formids t
+        WHERE
+            t.openid = #{openid}
+        AND ADDDATE(t.create_date, INTERVAL 7 DAY) >= now()
+        ORDER BY t.create_date ASC
+        LIMIT 1
+    </select>
+</mapper>

src/main/resources/mapper/TaWechatUserMapper.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.welcome.mapper.TaWechatUserMapper">
-
+    <select id="getOpenidOf" resultType="java.lang.String">
+        SELECT
+            t.openid
+        FROM
+            ta_wechat_user t
+        WHERE
+            t.person_id = #{personId}
+        AND t.client_type = #{clientType}
+        LIMIT 1
+    </select>
 </mapper>

target/classes/application.yml

@@ -45,6 +45,8 @@ miniapp:
   url: http://47.101.36.130:8001/api/miniapp
   appid: wx3f26e5f48c72d39f
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
+  tpls:
+    visitor: m5fR2X1D-iWUurRe-pQQU8VgcxSSZ5eAVoquMixphFw
 
 # ali-cloud
 ali: