add feats

.gitignore

@@ -0,0 +1 @@
+target

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -1,7 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" comment="" />
+    <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaCustomWordsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.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/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.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/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/TaVisitingLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingLogController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaPersonMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaPersonMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaVisitingLogMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaVisitingLogMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaPerson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingLog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingWords.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingWords.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitingLogService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitingLogService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AMap.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.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/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaContentLibMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaContentLibMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaDeviceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaDeviceMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageContentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageContentMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaFirstpageNoticeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaImagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaImagesMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaNoticeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaPersonMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaPersonMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaPersonTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaPersonTypeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaSyncLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaSyncLogMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingLogMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingWordsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingWordsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/SysUserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaContentLibMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaContentLibMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaDeviceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaDeviceMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageContentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageContentMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageNoticeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaImagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaImagesMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaNoticeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaPersonMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaPersonMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaPersonTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaPersonTypeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaSyncLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaSyncLogMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaVisitingLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaVisitingLogMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaVisitingWordsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaVisitingWordsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -11,12 +65,12 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="SAWeather.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java">
+    <leaf>
+      <file leaf-file-name="XFYun.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-230">
-              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+            <state relative-caret-position="284">
+              <caret line="52" selection-start-line="52" selection-end-line="52" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -24,28 +78,61 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="646">
-              <caret line="34" column="16" lean-forward="true" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state relative-caret-position="159">
+              <caret line="199" selection-start-line="199" selection-end-line="199" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="380">
+              <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>com.welcome.huiju</find>
+      <find>taPersonService</find>
+      <find>getRealPersonList</find>
+      <find>HttpStatus</find>
+      <find>subDir</find>
+      <find>huiju.files</find>
+      <find>huijuFiles</find>
+      <find>getMultipartFile</find>
+      <find>voice</find>
     </findStrings>
     <replaceStrings>
       <replace>com.huiju.welcome</replace>
     </replaceStrings>
     <dirStrings>
+      <dir>E:\JavaProjects\welcome3.0\service\src\main\resources\mapper</dir>
       <dir>E:\JavaProjects\welcome3.0\service\src\main\java</dir>
+      <dir>E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome</dir>
     </dirStrings>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -54,11 +141,47 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstpageService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/AccessConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/AudioController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/SysUserMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingWords.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingWordsMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaPerson.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingLog.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaSnapshotPerson.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaSnapshotPerson.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaVisitingLogMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaVisitingLogMapper.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/java/com.huiju.welcome/mapper/TaPersonMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaPersonMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingLogController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaSnapshotPersonService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaSnapshotPersonImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaSnapshotPersonMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSnapshotPersonController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaSnapshotPerson.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaSnapshotPerson.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomWordsMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomWordsMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomWordsService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomWordsServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomWords.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>
@@ -106,16 +229,17 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-16" />
-    <option name="width" value="1100" />
-    <option name="height" value="1940" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1296" />
+    <option name="height" value="735" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -141,68 +265,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="interceptor" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="service" type="b2602c69:ProjectViewProjectNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
@@ -214,14 +276,19 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="RequestMappingsPanelOrder0" value="0" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hardware" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Project" />
@@ -230,11 +297,22 @@
     <property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.notifications" />
   </component>
   <component name="RecentsManager">
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.huiju.welcome.service.impl" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\JavaProjects\welcome3.0\service\src\main\resources\mapper" />
       <recent name="E:\JavaProjects\welcome3.0\service\src\main\resources" />
       <recent name="E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.huiju.welcome.service.impl" />
+      <recent name="com.huiju.welcome.service" />
+      <recent name="com.huiju.welcome.model" />
+      <recent name="com.huiju.welcome.mapper" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\JavaProjects\welcome3.0\service" />
       <recent name="E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome" />
     </key>
   </component>
@@ -308,20 +386,27 @@
       <option name="presentableId" value="Default" />
       <updated>1554806511177</updated>
       <workItem from="1554806512544" duration="3856000" />
-      <workItem from="1554858729557" duration="1168000" />
+      <workItem from="1554858729557" duration="5296000" />
+      <workItem from="1555050395776" duration="488000" />
+      <workItem from="1555058275009" duration="599000" />
+      <workItem from="1555290043845" duration="87614000" />
+      <workItem from="1555913006426" duration="9826000" />
+      <workItem from="1556004383365" duration="11766000" />
+      <workItem from="1556091754639" duration="4295000" />
+      <workItem from="1557122821064" duration="702000" />
+      <workItem from="1557283570042" duration="5354000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5024000" />
+    <option name="totallyTimeSpent" value="129796000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1096" height="1855" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50096524" side_tool="true" visible="true" weight="0.32964474" />
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.3291506" />
+      <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" visible="true" weight="0.18230277" />
       <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" />
@@ -329,19 +414,21 @@
       <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" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" weight="0.25655645" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.3295325" />
       <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" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49903476" weight="0.32964474" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <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" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25482625" />
-      <window_info anchor="right" id="Bean Validation" order="3" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3295325" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19029851" />
+      <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.32964474" />
       <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" />
@@ -349,7 +436,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">
@@ -358,150 +444,382 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="7" />
+    </breakpoint-manager>
+  </component>
   <component name="editorHistoryManager">
-    <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/controller/TaFirstpageContentController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="27" column="31" lean-forward="true" selection-start-line="27" selection-start-column="31" selection-end-line="27" selection-end-column="31" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="-523">
+          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/mainbiz/MainbizApplication.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/MainbizApplication.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="190">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        <state relative-caret-position="-3620">
+          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonTypeServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaNoticeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-789">
+          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
+        </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" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1606">
+          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSyncLogController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SysUserMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingLogController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-86">
+          <caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitingWords.java">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitingWordsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaPerson.java">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageNoticeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-466">
+          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstpageService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/SysUserMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" column="6" lean-forward="true" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+        <state relative-caret-position="247">
+          <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/model/SysUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaSnapshotPersonMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="374">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaSnapshotPersonImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="12" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="12" />
+        <state relative-caret-position="294">
+          <caret line="26" column="46" lean-forward="true" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
         </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/ITaSnapshotPersonService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="57">
-          <caret line="3" column="22" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="22" />
+        <state relative-caret-position="323">
+          <caret line="17" column="79" selection-start-line="17" selection-start-column="79" selection-end-line="17" selection-end-column="79" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+    <entry file="jar://D:/REPO/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar!/org/apache/http/HttpStatus.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
-          <caret line="4" column="24" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="24" />
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysParamController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-171">
+          <caret line="58" column="23" selection-start-line="58" selection-start-column="11" selection-end-line="58" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/Serializable.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2755">
+          <caret line="168" column="17" selection-start-line="168" selection-start-column="17" selection-end-line="168" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <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="532">
+          <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/base/ResponseBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="893">
+          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/base/BaseController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="16" selection-start-line="16" selection-end-line="16" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/huiju/welcome/mainbiz/MainbizApplicationTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <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/config/WebSocketConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="285">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/MybatisPlusConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="114">
+          <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaSnapshotPerson.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="21" column="16" lean-forward="true" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/FaceController.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/AccessConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaSnapshotPersonController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1064">
+          <caret line="85" selection-start-line="85" selection-end-line="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="35" column="46" selection-start-line="35" selection-start-column="40" selection-end-line="35" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaSnapshotPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/MainbizApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
-          <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
           <folding>
             <element signature="imports" 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/TaPersonController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="23" column="17" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="17" />
+        <state relative-caret-position="174">
+          <caret line="140" column="48" selection-start-line="140" selection-start-column="48" selection-end-line="140" selection-end-column="48" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <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="-18">
-          <caret line="21" column="20" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
+        <state relative-caret-position="95">
+          <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/utils/FileUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaVisitingWordsMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        <state relative-caret-position="38">
+          <caret line="2" column="67" selection-start-line="2" selection-start-column="67" selection-end-line="2" selection-end-column="67" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaVisitingWordsMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomWordsMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCustomWordsMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
+          <caret line="2" column="57" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <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="330">
+          <caret line="51" column="90" selection-start-line="51" selection-start-column="90" selection-end-line="51" selection-end-column="90" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaDeviceController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="177" column="39" selection-start-line="177" selection-start-column="31" selection-end-line="177" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomWordsService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="6" column="6" lean-forward="true" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitingWordsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/StatusUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomWordsServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        <state relative-caret-position="380">
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaDeviceServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="75" column="5" selection-start-line="75" selection-start-column="5" selection-end-line="75" selection-end-column="5" />
+        <state relative-caret-position="284">
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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/model/TaVisitingWords.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-230">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="258">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomWords.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="551">
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="199" selection-start-line="199" selection-end-line="199" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -510,8 +828,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="34" column="16" lean-forward="true" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state relative-caret-position="304">
+          <caret line="16" column="57" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
         </state>
       </provider>
     </entry>

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v3.0.0</version>
+	<version>v3.1.0</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 
@@ -83,6 +83,14 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

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

@@ -113,6 +113,7 @@ public class WebSocketServer {
 				if(sid==null) {
 					item.sendMessage(message);
 				}else if(item.sid.equals(sid)){
+					log.info("推送消息到窗口"+sid+"，推送内容:"+message);
 					item.sendMessage(message);
 				}
 			} catch (IOException e) {

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

@@ -2,31 +2,30 @@ 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.WebSocketServer;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.XFYun;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.HashMap;
@@ -41,9 +40,15 @@ import java.util.Map;
 @RequestMapping("/")
 @Transactional(rollbackFor = Exception.class)
 public class CameraController {
+	private Logger log = LoggerFactory.getLogger(XFYun.class);
+
+	private final static int NEW_PERSON = 1;
 	
 	@Autowired
 	private ITaPersonService taPersonService;
+
+	@Autowired
+	private ITaSnapshotPersonService taSnapshotPersonService;
 	
 	@Autowired
 	private ITaVisitingLogService visitingLogService;
@@ -55,6 +60,9 @@ public class CameraController {
 
 	@Autowired
 	private ITaVisitingWordsService visitingWordsService;
+
+	@Autowired
+	private ITaCustomWordsService taCustomWordsService;
 	
 	@Autowired
 	private ITaPersonTypeService taPersonTypeService;
@@ -64,108 +72,152 @@ public class CameraController {
 	
 	@Value("${huiju.files}")
 	private String huijuFiles;
-	
-	
-	@ApiOperation(value = "人脸识别失败", notes = "人脸识别失败")
-	@PostMapping(value = "/stranger/{deviceId}")
-	public void stranger(@PathVariable String deviceId, HttpServletRequest request){
+
+	@Autowired
+	private ICameraService cameraService;
+
+	@ApiOperation(value = "人脸对比结果上传", notes = "人脸对比结果上传")
+	@PostMapping(value = "/camera/{deviceId}/person")
+	public ResponseBean person(
+			@PathVariable String deviceId,
+			MultipartFile snapshot,
+			TaSnapshotPerson taSnapshotPerson,
+			HttpServletRequest request) {
+		ResponseBean responseBean = new ResponseBean();
+
+		if (null == deviceId || null == taSnapshotPerson) {
+			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入方式不正确");
+			return responseBean;
+		}
+
+		if (!deviceId.equals(taSnapshotPerson.getDeviceId())) {
+			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入不正确");
+			return responseBean;
+		}
+
+		// 抓拍时间为当前时间
+		taSnapshotPerson.setCreateDate(LocalDateTime.now());
+
+		// 人像质量最低值, 低于这个值的认为人脸抓拍失败, 取值范围 1 - 100
+		SysParam faceMinScoreParam = iSysParamService.getById("face-min-score");
+		if (null == faceMinScoreParam) {
+			faceMinScoreParam = new SysParam();
+			faceMinScoreParam.setValue("70");
+		}
+		float faceMinScore = Float.parseFloat(faceMinScoreParam.getValue());
+
+		Integer score = taSnapshotPerson.getScore();
+		if (null == score || score.intValue() < faceMinScore) {
+			return responseBean;
+		}
+
+		// 人脸相似度阈值, 低于设定认为没有识别成功
+		// SDK 中这个值范围是 0.001 - 1, 本系统设定范围是 1 - 100
+		SysParam samePersonThresholdParam = iSysParamService.getById("same-person-threshold");
+		if (null == samePersonThresholdParam) {
+			samePersonThresholdParam = new SysParam();
+			samePersonThresholdParam.setValue("70");
+		}
+		float samePersonThreshold = Float.parseFloat(samePersonThresholdParam.getValue());
+		Float similarity = taSnapshotPerson.getSimilarity();
+
+		// 识别结果
+		boolean newGuy = null == similarity || similarity < (samePersonThreshold / 100);
+
+		TaPerson taPerson = null;
+		if (!newGuy) {
+			taPerson = taPersonService.getById(taSnapshotPerson.getMatchPerson());
+
+			// 抓拍人与比对人是同一个人
+			taSnapshotPerson.setPersonId(taSnapshotPerson.getMatchPerson());
+
+			LocalDateTime lastTime = taPerson.getLastVisiteDate();
+			boolean sameDevice = deviceId.equals(taPerson.getLastVisiteDevice());
+
+			if (null != lastTime && sameDevice) {
+				// 降噪设定
+				SysParam dispatchTimeLimitParam = iSysParamService.getById("dispatch-time-limit");
+				if (null == dispatchTimeLimitParam) {
+					dispatchTimeLimitParam = new SysParam();
+					dispatchTimeLimitParam.setValue("2");
+				}
+				float dispatchTimeLimit = Float.parseFloat(dispatchTimeLimitParam.getValue());
+
+				// 默认 2 分钟内连续识别的都是垃圾数据
+				Duration duration = Duration.between(lastTime, taSnapshotPerson.getCreateDate());
+				if (duration.getSeconds() < (60 * dispatchTimeLimit)) {
+					return responseBean;
+				}
+			}
+		}
+
+		// 抓拍照落地
 		long nowTime = System.currentTimeMillis();
-		String path = huijuFiles + "camera";
-		File tempFile = new File(path);
-		if (!tempFile.exists()) {
-			tempFile.mkdirs();
+		String avatar = "/camera/" + nowTime + "_" + deviceId + ".jpg";
+		getMultipartFile(snapshot, avatar);
+		taSnapshotPerson.setAvatar(avatar);
+
+		if (newGuy) {
+			// 新人入库, 同时写入抓拍人ID
+			taPerson = saveNewPerson(taSnapshotPerson);
+
+			// 同步相机识别库
+			cameraService.dispatchPerson(taPerson);
 		}
-		byte[] data = new byte[1024];
-		//人脸识别失败的情况下下载人脸图片
-		try {
-			int lenth = request.getContentLength();
-			ServletInputStream iii = request.getInputStream();
-			
-			//下载文件
-			FileOutputStream fos=new FileOutputStream(tempFile.getPath() + File.separator + nowTime + "_" + deviceId +".jpg");
-			ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
-			
-			byte[] buffer=new byte[1024];
-			int len=0;
-			while((len=iii.read(buffer))!=-1){
-				fos.write(buffer, 0, len);
-				bos.write(buffer, 0, len);
-				fos.flush();
+
+		// 保存抓拍日志
+		taSnapshotPersonService.save(taSnapshotPerson);
+
+		// 预写到访日志
+		saveVisitingLog(taPerson, taSnapshotPerson);
+
+		// 推送消息
+		sendPersionInfo(taPerson);
+
+		return responseBean;
+	}
+
+	//推送给前端
+	private void sendPersionInfo(TaPerson taPerson) {
+		TaVisitingWords taVisitingWords = null;
+		String deviceId = taPerson.getLastVisiteDevice();
+		String words = taPerson.getWords();
+		Integer sex = "2".equals(taPerson.getSex()) ? 2 : 1;
+		String personName = taPerson.getName();
+		if (null == personName) personName = "";
+
+		// 检查是不是有定制语音
+		QueryWrapper<TaCustomWords> wrapper = new QueryWrapper<>();
+		wrapper.eq("device_id", deviceId);
+		wrapper.eq("person_id", taPerson.getPersonId());
+		TaCustomWords taCustomWords = taCustomWordsService.getOne(wrapper);
+		if (null != taCustomWords) {
+			String wds = taCustomWords.getWords();
+			if (null != wds && !"".equals(wds.trim())) {
+				words = wds.trim();
 			}
-			fos.close();
-			iii.close();
-			data = bos.toByteArray();
-			bos.close();
-			
-		}catch (Exception e){
-			e.printStackTrace();
 		}
-		LocalDateTime localDateTime = LocalDateTime.now();
-		//入人员库
-		String fileName = "/camera/" + nowTime + "_" + deviceId + ".jpg";
-		TaPerson taPerson = new TaPerson();
-		taPerson.setAvatar(fileName);
-		taPerson.setStatus(StatusUtils.Normal);
-		taPerson.setCreateDate(localDateTime);
-		taPerson.setLastVisiteDate(localDateTime);
-		taPerson.setLastVisiteDevice(deviceId);
-		taPerson.setTypeId(StatusUtils.Normal);
-		taPersonService.save(taPerson);
-		//入来访人员库
-		TaDevice taDevice = taDeviceService.getById(deviceId);
-		TaVisitingLog taVisitingLog = new TaVisitingLog();
-		taVisitingLog.setPersonId(taPerson.getPersonId());
-		taVisitingLog.setVisiteDate(localDateTime);
-		taVisitingLog.setDeviceId(taDevice.getDeviceId());
-		taVisitingLog.setDeviceName(taDevice.getDeviceName());
-		taVisitingLog.setAvatar(fileName);
-		visitingLogService.save(taVisitingLog);
-
-		//推送消息给前端
-		sendPersionInfo(taPerson.getPersonId(),deviceId);
-		
-		//分发人脸到各个相机
-		RestTemplate restTemplate = new RestTemplate();
-		
-		QueryWrapper<TaDevice> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("status",StatusUtils.Normal);
-		List<TaDevice> taDeviceList = taDeviceService.list(queryWrapper);
-		byte[] finalData = data;
-		taDeviceList.stream().forEach(e -> {
-			try {
-				String cameraUrl = e.getApi() + "/video/" + taPerson.getPersonId();
-				HttpHeaders headers = new HttpHeaders();
-				headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-				
-				HttpEntity httpEntity = new HttpEntity(finalData);
-				restTemplate.exchange(cameraUrl, HttpMethod.POST, httpEntity, String.class);
-			}catch (Exception ee){
-			
+
+		if (null == words || "".equals(words)) {
+			// 当前分类下不一定维护了欢迎词
+			QueryWrapper<TaVisitingWords> query = new QueryWrapper<>();
+			query.eq("device_id", deviceId);
+			query.eq("type_id", taPerson.getTypeId());
+			taVisitingWords = visitingWordsService.getOne(query);
+			if (null == taVisitingWords) {
+				return;
 			}
-		});
-	}
-	
-	private void sendPersionInfo(Integer personId, String deviceId) {
-		//推送给前端
-		TaPerson newPerson = taPersonService.getById(personId);
-		QueryWrapper<TaVisitingWords> queryWrapperWords = new QueryWrapper<>();
-		queryWrapperWords.eq("device_id",deviceId);
-		queryWrapperWords.eq("type_id",newPerson.getTypeId());
-		TaVisitingWords taVisitingWords = visitingWordsService.getOne(queryWrapperWords);
-
-		Integer sex = "2".equals(newPerson.getSex()) ? 2 : 1;
-		String personName = newPerson.getName();
-		if (null == personName) {
-			personName = "";
+
+			words = taVisitingWords.getWords();
 		}
 
-		String words = taVisitingWords.getWords().replace("{{name}}", personName).replace("{{sex}}", sex == 2 ? "女士" : "先生");
+
+		words = words.replace("{{name}}", personName).replace("{{sex}}", sex == 2 ? "女士" : "先生");
 		taVisitingWords.setWords(words);
 
 		Map<String,Object> map = new HashMap<>();
-		map.put("person",newPerson);
+		map.put("person",taPerson);
 		map.put("taVisitingWords",taVisitingWords);
-
 		map.put("audio", xfYun.voice( personName + "," + words, sex  == 2 ? 1 : 2));
 		try {
 			WebSocketServer.sendInfo(JSONObject.toJSONString(map),deviceId);
@@ -174,71 +226,83 @@ public class CameraController {
 		}
 	}
 
-	@ApiOperation(value = "人脸识别成功", notes = "人脸识别成功")
-	@PostMapping(value = "/familiar/{deviceId}/{personId}")
-	public void familiar(@PathVariable String deviceId,
-	                     @PathVariable Integer personId,HttpServletRequest request){
-		//根据persionId和deviceId获取人员的数据
-		TaPerson taPerson = taPersonService.getById(personId);
-		//查看此人是否需要显示
-		TaPersonType taPersonType = taPersonTypeService.getById(taPerson.getTypeId());
-		if (!taPersonType.getNeedShow()){
-			return;
-		}
-		SysParam sysParam = iSysParamService.getById("dispatch-time-limit");
-		LocalDateTime localDateTime = LocalDateTime.now();
-		//相同设备号才有五分钟的可能并且判断当前时间减去最后到访时间 是否大于五分钟（可配置的）
-		Duration duration = Duration.between(taPerson.getLastVisiteDate(),localDateTime);
-		if (taPerson.getLastVisiteDevice().equals(deviceId) && duration.toMinutes() < Long.valueOf(sysParam.getValue())){
-			return;
-		}
-		//获取图片
-		long nowTime = System.currentTimeMillis();
-		String path = huijuFiles + "camera";
-		File tempFile = new File(path);
-		if (!tempFile.exists()) {
-			tempFile.mkdirs();
+	// 获取上传单文件
+	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();
+
 		try {
-			int lenth = request.getContentLength();
-			ServletInputStream iii = request.getInputStream();
-			
-			//下载文件
-			FileOutputStream fos=new FileOutputStream(tempFile.getPath() + File.separator + nowTime + "_" + deviceId + ".jpg");
-			byte[] buffer=new byte[1024];
-			int len=0;
-			while((len=iii.read(buffer))!=-1){
-				fos.write(buffer, 0, len);
-				
-				fos.flush();
-			}
-			fos.close();
-			iii.close();
-		}catch (Exception e){
+			byte[] fBytes = f.getBytes();
+			ByteBuffer buf = ByteBuffer.wrap(fBytes);
+			FileChannel fc = new FileOutputStream(huijuFiles + newFname).getChannel();
+			fc.write(buf);
+			fc.close();
+		} catch (Exception e) {
 			e.printStackTrace();
+			log.error("读取抓拍图片失败: " + e.getMessage());
+			return false;
+		}
+
+		log.info("成功落地抓拍图: " + huijuFiles + newFname);
+
+		return true;
+	}
+
+	private TaPerson saveNewPerson(TaSnapshotPerson taSnapshotPerson) {
+		TaPerson person = new TaPerson();
+		person.setTypeId(NEW_PERSON);
+		person.setAvatar(taSnapshotPerson.getAvatar());
+		person.setStatus(StatusUtils.Normal);
+		person.setLastVisiteDate(taSnapshotPerson.getCreateDate());
+		person.setLastVisiteDevice(taSnapshotPerson.getDeviceId());
+		person.setSex(taSnapshotPerson.getSex().toString());
+
+		boolean rtn = taPersonService.save(person);
+		if (!rtn) {
+			return null;
 		}
-		
-		//入人员库
-		String fileName = "/camera/" + nowTime + "_" + deviceId + ".jpg";
-		
-		//更新最后到访时间和设备
-		TaPerson lastTaPerson = new TaPerson();
-		lastTaPerson.setPersonId(personId);
-		lastTaPerson.setLastVisiteDate(localDateTime);
-		lastTaPerson.setLastVisiteDevice(deviceId);
-		taPersonService.updateById(lastTaPerson);
-		//入来访人员库
-		TaDevice taDevice = taDeviceService.getById(deviceId);
+
+		// 更新 real_id
+		UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+		wrapper.set("real_id", person.getPersonId());
+		wrapper.eq("person_id", person.getPersonId());
+		taPersonService.update(new TaPerson(), wrapper);
+
+		taSnapshotPerson.setPersonId(person.getPersonId());
+		person.setRealId(person.getPersonId());
+		return person;
+	}
+
+	//
+	private TaVisitingLog saveVisitingLog(TaPerson taPerson, TaSnapshotPerson taSnapshotPerson) {
 		TaVisitingLog taVisitingLog = new TaVisitingLog();
-		taVisitingLog.setPersonId(personId);
-		taVisitingLog.setVisiteDate(localDateTime);
+		TaDevice taDevice = taDeviceService.getById(taSnapshotPerson.getDeviceId());
+
+		taVisitingLog.setPersonId(taPerson.getPersonId());
+		taVisitingLog.setRealPerson(taPerson.getRealId());
+		taVisitingLog.setAvatar(taPerson.getAvatar());
 		taVisitingLog.setDeviceId(taDevice.getDeviceId());
 		taVisitingLog.setDeviceName(taDevice.getDeviceName());
-		taVisitingLog.setAvatar(fileName);
-		visitingLogService.save(taVisitingLog);
-		//推送消息给前端
-		sendPersionInfo(taPerson.getPersonId(),deviceId);
+		taVisitingLog.setVisiteDate(LocalDateTime.now());
+		taVisitingLog.setName(taPerson.getName());
+
+		// 反更新最后来访时间
+		taPerson.setLastVisiteDate(taVisitingLog.getVisiteDate());
+		taPerson.setLastVisiteDevice(taDevice.getDeviceId());
+		UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+		wrapper.set("last_visite_date", taVisitingLog.getVisiteDate());
+		wrapper.set("last_visite_device", taDevice.getDeviceId());
+		wrapper.eq("person_id", taPerson.getPersonId());
+		taPersonService.update(taPerson, wrapper);
+
+		boolean rtn = visitingLogService.save(taVisitingLog);
+		return !rtn ? null : taVisitingLog;
 	}
 }

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

@@ -1,9 +1,13 @@
 package com.huiju.welcome.controller;
 
 
+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.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.utils.Encrypt;
 import com.huiju.welcome.utils.StatusUtils;
@@ -16,6 +20,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * <p>
@@ -92,7 +99,7 @@ public class SysUserController extends BaseController {
 
     @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
     @RequestMapping(value = "/user", method = RequestMethod.GET)
-    public ResponseBean get(HttpServletRequest request) {
+    public ResponseBean user(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         HttpSession httpSession = request.getSession();
 
@@ -105,6 +112,110 @@ public class SysUserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageNum", value = "当前页"),
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageSize", value = "每页数量"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "name", value = "姓名"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "手机号"),
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "isSales", value = "是否销售"),
+    })
+    @RequestMapping(value = "/sysuser", method = RequestMethod.GET)
+    public ResponseBean list(
+            @RequestParam Integer pageNum,
+            @RequestParam  Integer pageSize,
+            String name,
+            String phone,
+            Integer isSales,
+            HttpServletRequest request
+    ) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<SysUser> pg = new Page<>();
+        pg.setCurrent(pageNum);
+        pg.setSize(pageSize);
+        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
+        queryWrapper.gt("user_id", 1); // 去掉管理员
+
+        if (null != name && !"".equals(name)) {
+            queryWrapper.like("nickname", name);
+        }
+
+        if (null != phone && !"".equals(phone)) {
+            queryWrapper.eq("phone", phone);
+        }
+
+        if (null != isSales && isSales.intValue() > 0 ) {
+            queryWrapper.eq("is_sales", isSales);
+        }
+
+        // 取消传递密码字段
+        IPage<SysUser> nwPg = sysUserService.page(pg, queryWrapper);
+        List<SysUser> usrList = nwPg.getRecords();
+        for (SysUser usr : usrList) {
+            usr.setPassword("");
+        }
+
+        responseBean.addSuccess(nwPg);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "int", name = "id", value = "用户详情")
+    })
+    @RequestMapping(value = "/sysuser/{id}", method = RequestMethod.GET)
+    public ResponseBean get(@PathVariable Integer id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (id.intValue() < 2) {
+            responseBean.addError(HttpStatus.SC_NOT_FOUND, "错误的用户ID");
+            return responseBean;
+        }
+
+        SysUser sysUser = sysUserService.getById(id);
+        sysUser.setPassword("");
+
+        responseBean.addSuccess(sysUser);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "新增人员", notes = "新增人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "SysUser", name = "sysUser", value = "用户详情")
+    })
+    @RequestMapping(value = "/sysuser", method = RequestMethod.POST)
+    public ResponseBean create(@RequestBody SysUser sysUser, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        sysUser.setCreateDate(LocalDateTime.now());
+
+        boolean success = sysUserService.save(sysUser);
+        if (!success) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "新增用户失败");
+            return responseBean;
+        }
+
+        return responseBean;
+    }
+
+    @ApiOperation(value = "编辑人员", notes = "编辑人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "SysUser", name = "sysUser", value = "用户详情")
+    })
+    @RequestMapping(value = "/sysuser", method = RequestMethod.PUT)
+    public ResponseBean update(@RequestBody SysUser sysUser, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        boolean success = sysUserService.updateById(sysUser);
+        if (!success) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新用户失败");
+            return responseBean;
+        }
+
+        return responseBean;
+    }
+
     private boolean checkPassword(String password, SysUser user)  {
         String passwd = Encrypt.md5(password, user.getUserId().toString());
         if (null == passwd || !passwd.equals(user.getPassword())) {

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

@@ -1,12 +1,18 @@
 package com.huiju.welcome.controller;
 
 
+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.WebSocketServer;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaDevice;
+import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaDeviceService;
+import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.utils.StatusUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,7 +25,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -35,6 +45,12 @@ public class TaDeviceController extends BaseController {
     @Autowired
     ITaDeviceService taDeviceService;
 
+    @Autowired
+    ITaPersonService taPersonService;
+
+    @Autowired
+    private ICameraService cameraService;
+
     @ApiOperation(value = "获取设备列表", notes = "获取设备列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageNum", value = "当前页"),
@@ -54,6 +70,98 @@ public class TaDeviceController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "批量下发人脸", notes = "批量下发人脸")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="query", dataType="Integer", name="from", value="人员ID"),
+            @ApiImplicitParam(paramType="query", dataType="Integer", name="lastNum", value="上次处理个数"),
+            @ApiImplicitParam(paramType="query", dataType="String", name="deviceId", value="设备 id"),
+            @ApiImplicitParam(paramType="query", dataType="String", name="wsId", value="websocket id"),
+    })
+    @RequestMapping(value = "/device/person", method = RequestMethod.POST)
+    public ResponseBean DispatchBatch(@RequestParam String deviceId, Integer from, Integer lastNum, String wsId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (null == from) from = 1;
+        if (null == lastNum) lastNum = 0;
+
+        TaDevice taDevice = taDeviceService.getById(deviceId);
+        if (null == taDevice) {
+            responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备不存在");
+            return responseBean;
+        }
+
+        // 获取所有的人员
+        QueryWrapper<TaPerson> wrapper = new QueryWrapper<>();
+        wrapper.ge("person_id", from);
+        wrapper.orderByAsc("person_id");
+
+        Page<TaPerson> preDef = new Page<>();
+        preDef.setCurrent(1);
+        preDef.setSize(9999999l); // 代表无限大
+
+        IPage<TaPerson> pg = taPersonService.page(preDef, wrapper);
+        Map<String, Object> msg = new HashMap<>();
+        if (null != wsId && !"".equals(wsId) && from.intValue() == 0) {
+            msg.put("step", "ready");
+            msg.put("total", pg.getTotal());
+            try {
+                // 通知前端开始处理
+                WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        List<TaPerson> personList = pg.getRecords();
+        int total = null == personList ? 0 : personList.size();
+        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());
+                    try {
+                        // 通知前端当前处理到这个人
+                        WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                // 下发
+                String result = cameraService.dispatchPerson(person, taDevice);
+//                String result = "success";
+//                try {
+//                    Thread.sleep(50);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+
+                boolean success = null == result || "".equals(result) || "success".equals(result);
+                if (!success) {
+                    responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, result);
+                    return responseBean;
+                }
+
+                lastNum ++;
+            }
+        }
+
+        if (null != wsId && !"".equals(wsId)) {
+            msg.clear();
+            msg.put("step", "finish");
+            try {
+                // 通知前端所有人已处理完
+                WebSocketServer.sendInfo(JSON.toJSONString(msg), wsId);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return responseBean;
+    }
+
 
     @ApiOperation(value = "设备注册", notes = "设备注册")
     @ApiImplicitParams({

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

@@ -1,12 +1,11 @@
 package com.huiju.welcome.controller;
 
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.TaPerson;
 import com.huiju.welcome.model.TaVisitingLog;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaDeviceService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaVisitingLogService;
@@ -20,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,6 +45,9 @@ public class TaPersonController extends BaseController {
     @Autowired
     ITaDeviceService taDeviceService;
 
+    @Autowired
+    private ICameraService cameraService;
+
     @ApiOperation(value = "新增人员", notes = "新增人员")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "TaPerson", name = "taPerson", value = "人员详情")
@@ -59,6 +63,13 @@ public class TaPersonController extends BaseController {
             return responseBean;
         }
 
+        taPerson.setRealId(taPerson.getPersonId());
+        success = taPersonService.updateById(taPerson);
+        if (!success) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "新增人员失败");
+            return responseBean;
+        }
+
         return responseBean;
     }
 
@@ -78,6 +89,23 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "合并人员", notes = "合并人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "int", name = "from", value = "待合并人员ID"),
+            @ApiImplicitParam(paramType = "body", dataType = "TaPerson", name = "to", value = "合并到人员ID")
+    })
+    @RequestMapping(value = "/merge/person/{from}", method = RequestMethod.PUT)
+    public  ResponseBean merge(@PathVariable Integer from, @RequestBody TaPerson to) {
+        ResponseBean responseBean = new ResponseBean();
+        boolean success = taPersonService.mergePerson(from, to);
+        if (!success) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "合并人员失败");
+            return responseBean;
+        }
+
+        return responseBean;
+    }
+
     @ApiOperation(value = "更新人员头像", notes = "更新人员头像")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="path", dataType="Integer", name="personId", value="人员ID"),
@@ -110,9 +138,10 @@ public class TaPersonController extends BaseController {
     public ResponseBean DispatchProfile(@PathVariable int personId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaPerson taPerson = taPersonService.getById(personId);
-        String success = taPersonService.updateAvatar(taPerson);
-        if (!success.equals("success")) {
-            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, success);
+        String result = cameraService.dispatchPerson(taPerson);
+        boolean success = null == result || "".equals(result) || "success".equals(result);
+        if (!success) {
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, result);
             return responseBean;
         }
         return responseBean;
@@ -126,7 +155,10 @@ public class TaPersonController extends BaseController {
 	public ResponseBean get(@PathVariable int id, HttpServletRequest request) {
 		ResponseBean responseBean = new ResponseBean();
 
-		Map<String, Object> res = taPersonService.detail(id);
+//		Map<String, Object> res = taPersonService.detail(id);
+        Map<String, Object> res = new HashMap<>();
+        res.put("detail", taPersonService.getById(id));
+
 		responseBean.addSuccess(res);
 		return responseBean;
 	}
@@ -135,7 +167,8 @@ public class TaPersonController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageNum", value = "当前页"),
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageSize", value = "每页数量"),
-            @ApiImplicitParam(paramType = "query", dataType = "int", name = "typeId", value = "每页数量"),
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "typeId", value = "类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "personId", value = "人员ID"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "name", value = "姓名"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "电话"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "beginDate", value = "起始日期"),
@@ -146,6 +179,7 @@ public class TaPersonController extends BaseController {
             @RequestParam Integer pageNum,
             @RequestParam  Integer pageSize,
             Integer typeId,
+            Integer personId,
             String name,
             String phone,
             String beginDate,
@@ -154,35 +188,40 @@ public class TaPersonController extends BaseController {
     ) {
         ResponseBean responseBean = new ResponseBean();
 
-        Page<TaPerson> pg = new Page<>();
-        pg.setCurrent(pageNum);
-        pg.setSize(pageSize);
-        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("last_visite_date");
-        queryWrapper.eq("status", StatusUtils.Normal);
+        Page<TaPerson> page = new Page<>(pageNum, pageSize);
 
-        if (null != name && !"".equals(name)) {
-            queryWrapper.like("name", name);
-        }
+        if (null != typeId && typeId < 1) typeId = null;
+        if (null != personId && personId < 1) personId = null;
+        if (null != name && "".equals(name)) name = null;
+        if (null != phone && "".equals(phone)) phone = null;
+        if (null != beginDate && "".equals(beginDate)) beginDate = null;
+        if (null != endDate && "".equals(endDate)) endDate = null;
 
-        if (null != phone && !"".equals(phone)) {
-            queryWrapper.eq("phone", phone);
-        }
+        responseBean.addSuccess(taPersonService.getRealPersonList(page, personId, typeId, name, phone, beginDate, endDate));
 
-        if (null != beginDate && !"".equals(beginDate)) {
-            queryWrapper.gt("last_visite_date", LocalDateTime.parse(beginDate));
-        }
+        return responseBean;
+    }
 
-        if (null != endDate && !"".equals(endDate)) {
-            queryWrapper.gt("last_visite_date", LocalDateTime.parse(endDate));
-        }
+    @ApiOperation(value = "统计人员", notes = "统计人员")
+    @RequestMapping(value = "/stats/person", method = RequestMethod.GET)
+    public ResponseBean statsPerson() {
+        ResponseBean responseBean = new ResponseBean();
 
-        if (typeId.intValue() > 0 ) {
-            queryWrapper.eq("type_id", typeId);
+        List<Map<String, String>> person = taPersonService.statsPerson();
+        if (null == person) {
+            person = new ArrayList<>();
         }
+        if (person.size() == 0) {
+            Map<String, String> mp = new HashMap<>();
+            person.add(mp);
+        }
+
+        Long regularClients = taVisitingLogService.getRegularClientTodayAmount();
+        if (null ==  regularClients) regularClients = 0l;
 
-        responseBean.addSuccess(taPersonService.page(pg, queryWrapper));
+        person.get(0).put("regular", String.valueOf(regularClients));
 
+        responseBean.addSuccess(person);
         return responseBean;
     }
 }

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

@@ -0,0 +1,54 @@
+package com.huiju.welcome.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaSnapshotPerson;
+import com.huiju.welcome.service.ITaSnapshotPersonService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-14
+ */
+@RestController
+@RequestMapping("/")
+public class TaSnapshotPersonController {
+
+    @Autowired
+    private ITaSnapshotPersonService taSnapshotPersonService;
+
+
+    @ApiOperation(value = "获取抓拍列表", notes = "获取抓拍列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageNum", value = "当前页"),
+            @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageSize", value = "每页数量"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "deviceId", value = "设备ID"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "startDate", value = "开始日期"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "endDate", value = "结束日期")
+    })
+    @RequestMapping(value = "/snapshot", method = RequestMethod.GET)
+    public ResponseBean list(@RequestParam Integer pageNum, @RequestParam  Integer pageSize, @RequestParam  String deviceId, String startDate, String endDate, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        if (null != startDate && "".equals(startDate)) startDate = null;
+        if (null != endDate && "".equals(endDate)) endDate = null;
+
+        Page<TaSnapshotPerson> page = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taSnapshotPersonService.getSnapshotList(page, deviceId, startDate, endDate));
+
+        return responseBean;
+    }
+}

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.TaPerson;
 import com.huiju.welcome.model.TaVisitingLog;
+import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaVisitingLogService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * <p>
@@ -30,6 +34,9 @@ public class TaVisitingLogController extends BaseController {
     @Autowired
     private ITaVisitingLogService taVisitingLogService;
 
+    @Autowired
+    private ITaPersonService taPersonService;
+
     @ApiOperation(value = "编辑访问记录", notes = "编辑访问记录")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "TaVisitingLog", name = "taVisitingLog", value = "访问记录")
@@ -38,6 +45,20 @@ public class TaVisitingLogController extends BaseController {
     public ResponseBean update(@RequestBody TaVisitingLog taVisitingLog, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
 
+        Integer sales = taVisitingLog.getSalesId();
+        if (null != sales && sales.intValue() > 0) {
+            // 更新人员主表
+            TaPerson taPerson = new TaPerson();
+            taPerson.setPersonId(taVisitingLog.getPersonId());
+            taPerson.setLastSales(sales);
+            taPerson.setLastSalesName(taVisitingLog.getSalesName());
+            boolean success = taPersonService.updateSales(taPerson);
+            if (!success) {
+                responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新内容失败, 请重试");
+                return responseBean;
+            }
+        }
+
         boolean success = taVisitingLogService.updateById(taVisitingLog);
         if (!success) {
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新内容失败, 请重试");
@@ -48,34 +69,47 @@ public class TaVisitingLogController extends BaseController {
         return responseBean;
     }
 
-    @ApiOperation(value = "获取人员列表", notes = "获取人员列表")
+    @ApiOperation(value = "获取访问列表", notes = "获取访问列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageNum", value = "当前页"),
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "pageSize", value = "每页数量"),
-            @ApiImplicitParam(paramType = "query", dataType = "int", name = "typeId", value = "每页数量"),
             @ApiImplicitParam(paramType = "query", dataType = "int", name = "personId", value = "人员ID"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "beginDate", value = "起始日期"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "endDate", value = "结束日期"),
     })
     @RequestMapping(value = "/visitinglog", method = RequestMethod.GET)
     public ResponseBean list(
             @RequestParam Integer pageNum,
             @RequestParam  Integer pageSize,
             Integer personId,
+            String beginDate,
+            String endDate,
             HttpServletRequest request) {
-
         ResponseBean responseBean = new ResponseBean();
 
-        Page<TaVisitingLog> pg = new Page<>();
-        pg.setCurrent(pageNum);
-        pg.setSize(pageSize);
-        QueryWrapper<TaVisitingLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("visite_date");
+        if (null != personId && personId < 1) personId = null;
+        if (null != beginDate && "".equals(beginDate)) beginDate = null;
+        if (null != endDate && "".equals(endDate)) endDate = null;
 
-        if (null != personId) {
-            queryWrapper.eq("person_id", personId);
-        }
+        Page<TaVisitingLog> page = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taVisitingLogService.getVisitingList(page, beginDate, endDate, personId));
 
-        responseBean.addSuccess(taVisitingLogService.page(pg, queryWrapper));
+        return responseBean;
+    }
+
+    @ApiOperation(value = "日访问量统计", notes = "日访问量统计")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "startDate", value = "起始日期"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "endDate", value = "结束日期"),
+    })
+    @RequestMapping(value = "/stats/daily/visitinglog", method = RequestMethod.GET)
+    public ResponseBean visitingDailyAmout(@RequestParam String startDate, @RequestParam String endDate, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        DateTimeFormatter df = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+        LocalDateTime startDt = LocalDateTime.parse(startDate, df);
+        LocalDateTime endDt = LocalDateTime.parse(endDate, df);
 
+        responseBean.addSuccess(taVisitingLogService.getVisitingDailyAmount(startDt, endDt));
         return responseBean;
     }
 }

src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java

@@ -28,6 +28,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/familiar",
             "/stranger",
             "/screen",
+            "/camera",
             "/websocket"
     };
 

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

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaCustomWords;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Mapper
+public interface TaCustomWordsMapper extends BaseMapper<TaCustomWords> {
+
+}

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

@@ -1,10 +1,13 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.model.TaPerson;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,6 +21,15 @@ import java.util.Map;
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
     boolean updatePersonAvatar(TaPerson taPerson);
-	
 	Map<String, String> getDetailInfo(@Param("personId") Integer personId, @Param("deviceId") String deviceId);
+	List<Map<String, String>> statsPerson();
+	IPage<TaPerson> getRealPersonList(
+			Page<TaPerson> page,
+			@Param("personId") Integer personId,
+			@Param("typeId") Integer typeId,
+			@Param("name") String name,
+			@Param("phone") String phone,
+			@Param("beginDate") String beginDate,
+			@Param("endDate") String endDate
+	);
 }

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

@@ -0,0 +1,22 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.model.TaSnapshotPerson;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Mapper
+public interface TaSnapshotPersonMapper extends BaseMapper<TaSnapshotPerson> {
+    IPage<TaSnapshotPerson> getSnapshotList(Page<TaSnapshotPerson> page, @Param("deviceId") String deviceId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+}

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

@@ -1,8 +1,15 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.model.TaVisitingLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,5 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaVisitingLogMapper extends BaseMapper<TaVisitingLog> {
+    List<Map<String, String>> getVisitingDailyAmount(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+
+    List<Map<String, Long>> getRegularClientTodayAmount();
 
+    IPage<TaVisitingLog> getVisitingList(Page page, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("personId") Integer personId);
 }

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -34,5 +35,13 @@ public class SysUser implements Serializable {
 
     private Integer status;
 
+    private String openid;
 
+    private Boolean isSales;
+
+    private String wxId;
+
+    private LocalDateTime createDate;
+
+    private String phone;
 }

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

@@ -0,0 +1,29 @@
+package com.huiju.welcome.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomWords implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String deviceId;
+
+    private Integer personId;
+
+    private String words;
+}

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

@@ -51,4 +51,13 @@ public class TaPerson implements Serializable {
     
     private String lastVisiteDevice;
 
+    private String words;
+
+    private Integer lastSales;
+
+    private String lastSalesName;
+
+    private String intention;
+
+    private Integer realId;
 }

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

@@ -0,0 +1,54 @@
+package com.huiju.welcome.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSnapshotPerson  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "snapshot_id", type = IdType.AUTO)
+    private Integer snapshotId;
+
+    private LocalDateTime createDate;
+
+    private Integer personId;
+
+    private String avatar;
+
+    private String deviceId;
+
+    private Integer matchPerson;
+
+    private Float similarity;
+
+    @TableField("`status`")
+    private Integer status;
+
+    private Integer score;
+
+    private Integer sex;
+
+    private Integer age;
+
+    private Integer ageDeviation;
+
+    private Integer hasGlasses;
+
+    @TableField(exist = false)
+    private String matchName;
+
+    @TableField(exist = false)
+    private String matchAvatar;
+}

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

@@ -50,4 +50,12 @@ public class TaVisitingLog implements Serializable {
     private Integer visitNum;
 
     private String visitPurpose;
+
+    private Integer salesId;
+
+    private String salesName;
+
+    private String intention;
+
+    private Integer realPerson;
 }

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

@@ -31,5 +31,5 @@ public class TaVisitingWords implements Serializable {
 
     private Integer status;
 
-
+    private Double weight;
 }

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

@@ -0,0 +1,8 @@
+package com.huiju.welcome.service;
+
+import com.huiju.welcome.model.TaDevice;
+import com.huiju.welcome.model.TaPerson;
+
+public interface ICameraService {
+    String dispatchPerson(TaPerson taPerson, TaDevice ...devices);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaCustomWords;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+public interface ITaCustomWordsService extends IService<TaCustomWords> {
+
+}

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

@@ -1,8 +1,12 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,9 +19,25 @@ import java.util.Map;
  */
 public interface ITaPersonService extends IService<TaPerson> {
 
-    String updateAvatar(TaPerson taPerson);
+    String updateAvatar(TaPerson taPerson,TaDevice...dev);
 
     Map<String,Object> detail(int id);
 	
 	Map<String, String> getDetailInfo(Integer personId, String deviceId);
+
+    List<Map<String, String>> statsPerson();
+
+    boolean updateSales(TaPerson taPerson);
+
+    boolean mergePerson(Integer fromPerson, TaPerson toPerson);
+
+    IPage<TaPerson> getRealPersonList(
+            Page<TaPerson> page,
+            Integer personId,
+            Integer typeId,
+            String name,
+            String phone,
+            String beginDate,
+            String endDate
+    );
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaSnapshotPerson;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+public interface ITaSnapshotPersonService extends IService<TaSnapshotPerson> {
+    IPage<TaSnapshotPerson> getSnapshotList(Page<TaSnapshotPerson> page, String deviceId, String startDate, String endDate);
+}

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

@@ -1,8 +1,14 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaVisitingLog;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +18,9 @@ import com.huiju.welcome.model.TaVisitingLog;
  * @since 2019-03-12
  */
 public interface ITaVisitingLogService extends IService<TaVisitingLog> {
+    List<Map<String, String>> getVisitingDailyAmount(LocalDateTime startDate, LocalDateTime endDate);
+
+    Long getRegularClientTodayAmount();
 
+    IPage<TaVisitingLog> getVisitingList(Page<TaVisitingLog> page, String startDate, String endDate, Integer personId);
 }

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

@@ -0,0 +1,62 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.welcome.model.TaDevice;
+import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.service.ICameraService;
+import com.huiju.welcome.service.ITaDeviceService;
+import com.huiju.welcome.utils.Encrypt;
+import com.huiju.welcome.utils.StatusUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class CameraServiceImpl implements ICameraService {
+    @Autowired
+    private ITaDeviceService taDeviceService;
+
+    @Override
+    public String dispatchPerson(TaPerson taPerson, TaDevice... devices) {
+        List<TaDevice> taDeviceList = null;
+        if (null == devices || devices.length == 0) {
+            QueryWrapper<TaDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status",StatusUtils.Normal);
+            taDeviceList = taDeviceService.list(queryWrapper);
+        } else {
+            taDeviceList = Arrays.asList(devices);
+        }
+
+        //分发人脸到各个相机
+        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());
+                }
+            } catch (Exception e){
+                e.printStackTrace();
+                return "连接设备(" + device.getDeviceId() + ")人脸下发服务 失败: "+ e.getMessage();
+            }
+        }
+
+        return "";
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaCustomWordsMapper;
+import com.huiju.welcome.model.TaCustomWords;
+import com.huiju.welcome.service.ITaCustomWordsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Service
+public class TaCustomWordsServiceImpl extends ServiceImpl<TaCustomWordsMapper, TaCustomWords> implements ITaCustomWordsService {
+
+}

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

@@ -2,6 +2,9 @@ package com.huiju.welcome.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaDeviceMapper;
 import com.huiju.welcome.mapper.TaPersonMapper;
@@ -26,9 +29,7 @@ import org.springframework.web.client.RestTemplate;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -57,20 +58,32 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     private String huijuFiles;
 
     @Override
-    public String updateAvatar(TaPerson taPerson) {
+    public String updateAvatar(TaPerson taPerson, TaDevice ...dev) {
         String state = "";
+
+        List<TaDevice> taDeviceList = null;
+        if (null == dev || dev.length == 0) {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
+            QueryWrapper<TaDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", StatusUtils.Normal);
+            taDeviceList = taDeviceMapper.selectList(queryWrapper);
+        } else {
+            taDeviceList = Arrays.asList(dev);
+        }
+
         try {
             //分发人脸到各个相机
             RestTemplate restTemplate = new RestTemplate();
             //获取文件流
-            FileInputStream fileInputStream = new FileInputStream(new File(huijuFiles + taPerson.getAvatar()));
+            String avatar = taPerson.getAvatar();
+            if (avatar.startsWith("/")) {
+                avatar = avatar.substring(1);
+            }
+
+            FileInputStream fileInputStream = new FileInputStream(new File(huijuFiles + avatar));
             byte[] byt = new byte[fileInputStream.available()];
             fileInputStream.read(byt);
-        
-            ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
-            QueryWrapper<TaDevice> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("status", StatusUtils.Normal);
-            List<TaDevice> taDeviceList = taDeviceMapper.selectList(queryWrapper);
+
             for(TaDevice taDevice : taDeviceList){
                 String cameraUrl = taDevice.getApi() + "/video/" + taPerson.getPersonId();
                 HttpHeaders headers = new HttpHeaders();
@@ -99,7 +112,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         TaPerson taPerson = getById(id);
 
         QueryWrapper<TaVisitingLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", id);
+        queryWrapper.eq("real_person", taPerson.getRealId());
         queryWrapper.orderByDesc("visite_date");
 
         List<TaVisitingLog> logs = taVisitingLogService.list(queryWrapper);
@@ -120,4 +133,53 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public Map<String, String> getDetailInfo(Integer personId, String deviceId) {
         return taPersonMapper.getDetailInfo(personId,deviceId);
     }
+
+    @Override
+    public List<Map<String, String>> statsPerson() {
+        return taPersonMapper.statsPerson();
+    }
+
+    @Override
+    public boolean updateSales(TaPerson taPerson) {
+        UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+        wrapper.eq("person_id", taPerson.getPersonId());
+        wrapper.isNull("last_sales");
+
+        return taPersonMapper.update(taPerson, wrapper) >= 0;
+    }
+
+    @Override
+    public boolean mergePerson(Integer fromPerson, TaPerson toPerson) {
+        // 合并基础信息
+        UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+        wrapper.set("name", toPerson.getName());
+        wrapper.set("sex", toPerson.getSex());
+        wrapper.set("type_id", toPerson.getTypeId());
+        wrapper.set("phone", toPerson.getPhone());
+        wrapper.set("email", toPerson.getEmail());
+        wrapper.set("remark", toPerson.getRemark());
+        wrapper.set("real_id", toPerson.getRealId());
+        wrapper.set("words", toPerson.getWords());
+        wrapper.eq("person_id", fromPerson);
+
+        boolean success = taPersonMapper.update(new TaPerson(), wrapper) >= 0;
+        if (!success) return false;
+
+        wrapper.eq("person_id", toPerson.getPersonId());
+        success = taPersonMapper.update(new TaPerson(), wrapper) >= 0;
+        if (!success) return false;
+
+        // 合并访问记录
+        TaVisitingLog taVisitingLog = new TaVisitingLog();
+        taVisitingLog.setRealPerson(toPerson.getRealId());
+        taVisitingLog.setPersonId(fromPerson);
+        UpdateWrapper<TaVisitingLog> wrapper2 = new UpdateWrapper<>();
+        wrapper2.eq("person_id", fromPerson);
+        return taVisitingLogService.update(taVisitingLog, wrapper2);
+    }
+
+    @Override
+    public IPage<TaPerson> getRealPersonList(Page<TaPerson> page, Integer personId, Integer typeId, String name, String phone, String beginDate, String endDate) {
+        return taPersonMapper.getRealPersonList(page, personId, typeId, name, phone, beginDate, endDate);
+    }
 }

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

@@ -0,0 +1,29 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaSnapshotPersonMapper;
+import com.huiju.welcome.model.TaSnapshotPerson;
+import com.huiju.welcome.service.ITaSnapshotPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Service
+public class TaSnapshotPersonImpl extends ServiceImpl<TaSnapshotPersonMapper, TaSnapshotPerson> implements ITaSnapshotPersonService {
+    @Autowired
+    private TaSnapshotPersonMapper taSnapshotPersonMapper;
+
+    @Override
+    public IPage<TaSnapshotPerson> getSnapshotList(Page<TaSnapshotPerson> page, String deviceId, String startDate, String endDate) {
+        return taSnapshotPersonMapper.getSnapshotList(page, deviceId, startDate, endDate);
+    }
+}

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

@@ -1,11 +1,18 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaVisitingLogMapper;
 import com.huiju.welcome.model.TaVisitingLog;
 import com.huiju.welcome.service.ITaVisitingLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,4 +23,24 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaVisitingLogServiceImpl extends ServiceImpl<TaVisitingLogMapper, TaVisitingLog> implements ITaVisitingLogService {
+
+    @Autowired
+    private TaVisitingLogMapper taVisitingLogMapper;
+
+    public List<Map<String, String>> getVisitingDailyAmount(LocalDateTime startDate, LocalDateTime endDate) {
+        return taVisitingLogMapper.getVisitingDailyAmount(startDate, endDate);
+    }
+
+    @Override
+    public Long getRegularClientTodayAmount() {
+        List<Map<String, Long>> res = taVisitingLogMapper.getRegularClientTodayAmount();
+        if (null == res || res.size() == 0) return 0l;
+
+        return res.get(0).get("total");
+    }
+
+    @Override
+    public IPage<TaVisitingLog> getVisitingList(Page<TaVisitingLog> page, String startDate, String endDate, Integer personId) {
+        return taVisitingLogMapper.getVisitingList(page, startDate, endDate, personId);
+    }
 }

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

@@ -1,33 +0,0 @@
-package com.huiju.welcome.utils;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.http.HttpMethod;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-@Component
-@ConfigurationProperties(prefix = "file")
-public class AMap {
-    @Value("${amap.key}")
-    private String key;
-
-    @Value("${amap.weather.api}")
-    private String url;
-
-    @Value("${amap.weather.method}")
-    private String method;
-
-    @Value("${amap.weather.city}")
-    private String city;
-
-    @Value("${amap.weather.extensions}")
-    private String extensions;
-
-    public String weather() {
-        RestTemplate restTemplate = new RestTemplate();
-        String uri = url + "?key=" + key + "&city="+city+"&extensions="+ extensions;
-
-        return restTemplate.exchange(uri,HttpMethod.resolve(method), null,String.class).getBody();
-    }
-}

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

@@ -6,9 +6,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.36.130:3306/welcome2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: welcome
     password: welcome
   servlet:
@@ -18,6 +18,12 @@ mybatis-plus:
     call-setters-on-nulls: true
   mapper-locations: classpath:mapper/*.xml
 
+# 科大讯飞语音合成
+xfyun:
+  huijuapi: http://ycapi.jcjyhn.com/welcome-api/
+huiju:
+  files: E:\\files\\
+
 # 阿里云市场 - 免费天气
 # https://market.aliyun.com/products/56928004/cmapi014123.html?spm=5176.2020520132.101.2.34e17218FhSo5V#sku=yuncode812300000
 saweather:

src/main/resources/mapper/SysUserMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.SysUserMapper">
+<mapper namespace="com.huiju.welcome.mapper.SysUserMapper">
 
 </mapper>

src/main/resources/mapper/TaContentLibMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaContentLibMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaContentLibMapper">
 
 </mapper>

src/main/resources/mapper/TaCustomWordsMapper.xml

@@ -0,0 +1,4 @@
+<?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.TaCustomWordsMapper">
+</mapper>

src/main/resources/mapper/TaDeviceMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaDeviceMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaDeviceMapper">
 
 </mapper>

src/main/resources/mapper/TaFirstpageContentMapper.xml

@@ -1,8 +1,8 @@
 <?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.welcome.huiju.mapper.TaFirstpageContentMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageContentMapper">
 
-    <select id="getFirstpageContent" resultType="com.welcome.huiju.model.TaContentLib">
+    <select id="getFirstpageContent" resultType="com.huiju.welcome.model.TaContentLib">
         SELECT
             t.content,
             t.content_type AS contentType,

src/main/resources/mapper/TaFirstpageMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaFirstpageMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageMapper">
 
 </mapper>

src/main/resources/mapper/TaFirstpageNoticeMapper.xml

@@ -1,8 +1,8 @@
 <?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.welcome.huiju.mapper.TaFirstpageNoticeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageNoticeMapper">
 
-    <select id="getFirstpageNotice" resultType="com.welcome.huiju.model.TaNotice">
+    <select id="getFirstpageNotice" resultType="com.huiju.welcome.model.TaNotice">
         SELECT
             t.content,
             t.create_date AS createDate,

src/main/resources/mapper/TaImagesMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaImagesMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaImagesMapper">
 
 </mapper>

src/main/resources/mapper/TaNoticeMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaNoticeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaNoticeMapper">
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -1,7 +1,7 @@
 <?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.welcome.huiju.mapper.TaPersonMapper">
-    <update id="updatePersonAvatar" statementType="PREPARED" parameterType="com.welcome.huiju.model.TaPerson">
+<mapper namespace="com.huiju.welcome.mapper.TaPersonMapper">
+    <update id="updatePersonAvatar" statementType="PREPARED" parameterType="com.huiju.welcome.model.TaPerson">
         UPDATE ta_person
         SET avatar = #{avatar}
         WHERE
@@ -19,4 +19,51 @@
         WHERE
             t.person_id = #{personId}
     </select>
+
+    <select id="statsPerson" resultType="Map">
+        SELECT
+            count(distinct t.real_id) AS total,
+            sum(
+                IF (
+                    to_days(t.create_date) = to_days(now())
+                    OR to_days(t.last_visite_date) = to_days(now()),
+                    1,
+                    0
+                )
+            ) AS today
+        FROM
+            `ta_person` t
+        JOIN ta_person_type s USING (type_id)
+        WHERE
+            s.need_show = 1
+    </select>
+
+    <select id="getRealPersonList" resultType="com.huiju.welcome.model.TaPerson">
+        SELECT t.*
+        FROM ta_person t
+        JOIN ta_person s USING (person_id)
+        <where>
+            <if test='personId != null'>
+                t.person_id = #{personId}
+            </if>
+            <if test='typeId != null'>
+                AND t.type_id = #{typeId}
+            </if>
+            <if test='name != null'>
+                AND t.name like concat('%', #{name}, '%')
+            </if>
+            <if test='phone != null'>
+                AND t.phone = #{phone}
+            </if>
+            <if test='beginDate != null'>
+                AND t.last_visite_date &gt;= str_to_date(#{beginDate}, '%Y-%m-%dT%T')
+            </if>
+            <if test='endDate != null'>
+                AND t.last_visite_date &lt;= str_to_date(#{endDate}, '%Y-%m-%dT%T')
+            </if>
+        </where>
+        GROUP BY t.real_id
+        ORDER BY t.last_visite_date DESC
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonTypeMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaPersonTypeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaPersonTypeMapper">
 
 </mapper>

src/main/resources/mapper/TaSnapshotPerson.xml

@@ -0,0 +1,25 @@
+<?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.TaSnapshotPersonMapper">
+    <select id="getSnapshotList" resultType="com.huiju.welcome.model.TaSnapshotPerson">
+        SELECT
+            t.*,
+            m.`name` AS matchName,
+            m.avatar AS matchAvatar
+        FROM ta_snapshot_person t
+        LEFT JOIN ta_person s ON t.match_person = s.person_id
+        LEFT JOIN ta_person m on s.real_id = m.person_id
+        <where>
+            <if test="null != deviceId">
+                t.device_id = #{deviceId}
+            </if>
+            <if test="null != startDate">
+                AND t.create_date &gt;= str_to_date(#{startDate}, '%Y-%m-%dT%T')
+            </if>
+            <if test="null != endDate">
+                AND t.create_date &lt;= str_to_date(#{endDate}, '%Y-%m-%dT%T')
+            </if>
+        </where>
+        ORDER BY t.create_date desc
+    </select>
+</mapper>

src/main/resources/mapper/TaSyncLogMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaSyncLogMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaSyncLogMapper">
 
 </mapper>

src/main/resources/mapper/TaVisitingLogMapper.xml

@@ -1,5 +1,82 @@
 <?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.welcome.huiju.mapper.TaVisitingLogMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaVisitingLogMapper">
+    <select id="getVisitingList" resultType="com.huiju.welcome.model.TaVisitingLog">
+        SELECT
+            t.log_id,
+            t.person_id,
+            t.visite_date,
+            t.car_style,
+            t.license_plate_num,
+            t.channel,
+            t.remark,
+            t.device_id,
+            t.device_name,
+            t.avatar,
+            t.visit_num,
+            t.visit_purpose,
+            t.sales_id,
+            t.sales_name,
+            t.real_person,
+            t.intention,
+            s.`name`
+        FROM
+            ta_visiting_log t
+        LEFT JOIN ta_person s ON t.real_person = s.real_id
+        <where>
+            <if test="null != personId">
+                t.real_person = #{personId}
+            </if>
+            <if test="null != startDate">
+                AND t.visite_date &gt;= str_to_date(#{startDate}, '%Y-%m-%dT%T')
+            </if>
+            <if test="null != endDate">
+                AND t.visite_date &lt;= str_to_date(#{endDate}, '%Y-%m-%dT%T')
+            </if>
+        </where>
+        ORDER BY t.visite_date DESC
+    </select>
 
+    <select id="getVisitingDailyAmount" resultType="map">
+        SELECT
+          t.dt as visiteDate,
+          sum(IF(s.person_id IS NULL, 0, 1)) as amount
+        FROM
+          (
+            SELECT
+              DATE_FORMAT(
+                DATE_ADD(
+                  #{startDate},
+                  INTERVAL rownum DAY
+                ),
+                '%Y-%m-%d'
+            ) AS dt
+            FROM sequence
+            WHERE rownum &lt; DATEDIFF(#{endDate}, #{startDate}) + 1
+        ) t
+        LEFT JOIN ta_visiting_log s ON t.dt = DATE_FORMAT(s.visite_date, '%Y-%m-%d')
+        GROUP BY    t.dt
+    </select>
+
+    <select id="getRegularClientTodayAmount" resultType="map">
+        SELECT
+            count(DISTINCT a.real_person) AS total
+        FROM
+            (
+                SELECT
+                    t.real_person,
+                    t.person_id,
+                    count(*)
+                FROM
+                    ta_visiting_log t
+                JOIN ta_person s ON t.person_id = s.person_id
+                WHERE
+                    TO_DAYS(s.last_visite_date) = TO_DAYS(now())
+                GROUP BY
+                    t.real_person,
+                    TO_DAYS(t.visite_date)
+                HAVING
+                    count(*) > 1
+            ) a
+    </select>
 </mapper>

src/main/resources/mapper/TaVisitingWordsMapper.xml

@@ -1,5 +1,4 @@
 <?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.welcome.huiju.mapper.TaVisitingWordsMapper">
-
+<mapper namespace="com.huiju.welcome.mapper.TaVisitingWordsMapper">
 </mapper>

target/classes/application.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.36.130:3306/welcome2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: welcome
     password: welcome
   servlet:
@@ -17,3 +17,25 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
   mapper-locations: classpath:mapper/*.xml
+
+# 科大讯飞语音合成
+xfyun:
+  huijuapi: http://ycapi.jcjyhn.com/welcome-api/
+huiju:
+  files: E:\\files\\
+
+# 阿里云市场 - 免费天气
+# https://market.aliyun.com/products/56928004/cmapi014123.html?spm=5176.2020520132.101.2.34e17218FhSo5V#sku=yuncode812300000
+saweather:
+  appcode: 7be3addb3f79424abe200778db8f9642
+  api: http://saweather.market.alicloudapi.com/spot-to-weather
+  method: GET
+  # 地区
+  city: 南京浦口
+  # 穿衣指数等 指导数据
+  needIndex: 1
+  # 其他
+  need3HourForcast: 0
+  needAlarm: 0
+  needHourData: 0
+  needMoreDay: 0

target/classes/mapper/SysUserMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.SysUserMapper">
+<mapper namespace="com.huiju.welcome.mapper.SysUserMapper">
 
 </mapper>

target/classes/mapper/TaContentLibMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaContentLibMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaContentLibMapper">
 
 </mapper>

target/classes/mapper/TaDeviceMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaDeviceMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaDeviceMapper">
 
 </mapper>

target/classes/mapper/TaFirstpageContentMapper.xml

@@ -1,8 +1,8 @@
 <?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.welcome.huiju.mapper.TaFirstpageContentMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageContentMapper">
 
-    <select id="getFirstpageContent" resultType="com.welcome.huiju.model.TaContentLib">
+    <select id="getFirstpageContent" resultType="com.huiju.welcome.model.TaContentLib">
         SELECT
             t.content,
             t.content_type AS contentType,

target/classes/mapper/TaFirstpageMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaFirstpageMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageMapper">
 
 </mapper>

target/classes/mapper/TaFirstpageNoticeMapper.xml

@@ -1,8 +1,8 @@
 <?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.welcome.huiju.mapper.TaFirstpageNoticeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaFirstpageNoticeMapper">
 
-    <select id="getFirstpageNotice" resultType="com.welcome.huiju.model.TaNotice">
+    <select id="getFirstpageNotice" resultType="com.huiju.welcome.model.TaNotice">
         SELECT
             t.content,
             t.create_date AS createDate,

target/classes/mapper/TaImagesMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaImagesMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaImagesMapper">
 
 </mapper>

target/classes/mapper/TaNoticeMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaNoticeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaNoticeMapper">
 
 </mapper>

target/classes/mapper/TaPersonMapper.xml

@@ -1,7 +1,7 @@
 <?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.welcome.huiju.mapper.TaPersonMapper">
-    <update id="updatePersonAvatar" statementType="PREPARED" parameterType="com.welcome.huiju.model.TaPerson">
+<mapper namespace="com.huiju.welcome.mapper.TaPersonMapper">
+    <update id="updatePersonAvatar" statementType="PREPARED" parameterType="com.huiju.welcome.model.TaPerson">
         UPDATE ta_person
         SET avatar = #{avatar}
         WHERE
@@ -19,4 +19,51 @@
         WHERE
             t.person_id = #{personId}
     </select>
+
+    <select id="statsPerson" resultType="Map">
+        SELECT
+            count(distinct t.real_id) AS total,
+            sum(
+                IF (
+                    to_days(t.create_date) = to_days(now())
+                    OR to_days(t.last_visite_date) = to_days(now()),
+                    1,
+                    0
+                )
+            ) AS today
+        FROM
+            `ta_person` t
+        JOIN ta_person_type s USING (type_id)
+        WHERE
+            s.need_show = 1
+    </select>
+
+    <select id="getRealPersonList" resultType="com.huiju.welcome.model.TaPerson">
+        SELECT t.*
+        FROM ta_person t
+        JOIN ta_person s USING (person_id)
+        <where>
+            <if test='personId != null'>
+                t.person_id = #{personId}
+            </if>
+            <if test='typeId != null'>
+                AND t.type_id = #{typeId}
+            </if>
+            <if test='name != null'>
+                AND t.name like concat('%', #{name}, '%')
+            </if>
+            <if test='phone != null'>
+                AND t.phone = #{phone}
+            </if>
+            <if test='beginDate != null'>
+                AND t.last_visite_date &gt;= str_to_date(#{beginDate}, '%Y-%m-%dT%T')
+            </if>
+            <if test='endDate != null'>
+                AND t.last_visite_date &lt;= str_to_date(#{endDate}, '%Y-%m-%dT%T')
+            </if>
+        </where>
+        GROUP BY t.real_id
+        ORDER BY t.last_visite_date DESC
+    </select>
+
 </mapper>

target/classes/mapper/TaPersonTypeMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaPersonTypeMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaPersonTypeMapper">
 
 </mapper>

target/classes/mapper/TaSyncLogMapper.xml

@@ -1,5 +1,5 @@
 <?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.welcome.huiju.mapper.TaSyncLogMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaSyncLogMapper">
 
 </mapper>

target/classes/mapper/TaVisitingLogMapper.xml

@@ -1,5 +1,82 @@
 <?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.welcome.huiju.mapper.TaVisitingLogMapper">
+<mapper namespace="com.huiju.welcome.mapper.TaVisitingLogMapper">
+    <select id="getVisitingList" resultType="com.huiju.welcome.model.TaVisitingLog">
+        SELECT
+            t.log_id,
+            t.person_id,
+            t.visite_date,
+            t.car_style,
+            t.license_plate_num,
+            t.channel,
+            t.remark,
+            t.device_id,
+            t.device_name,
+            t.avatar,
+            t.visit_num,
+            t.visit_purpose,
+            t.sales_id,
+            t.sales_name,
+            t.real_person,
+            t.intention,
+            s.`name`
+        FROM
+            ta_visiting_log t
+        LEFT JOIN ta_person s ON t.real_person = s.real_id
+        <where>
+            <if test="null != personId">
+                t.real_person = #{personId}
+            </if>
+            <if test="null != startDate">
+                AND t.visite_date &gt;= str_to_date(#{startDate}, '%Y-%m-%dT%T')
+            </if>
+            <if test="null != endDate">
+                AND t.visite_date &lt;= str_to_date(#{endDate}, '%Y-%m-%dT%T')
+            </if>
+        </where>
+        ORDER BY t.visite_date DESC
+    </select>
 
+    <select id="getVisitingDailyAmount" resultType="map">
+        SELECT
+          t.dt as visiteDate,
+          sum(IF(s.person_id IS NULL, 0, 1)) as amount
+        FROM
+          (
+            SELECT
+              DATE_FORMAT(
+                DATE_ADD(
+                  #{startDate},
+                  INTERVAL rownum DAY
+                ),
+                '%Y-%m-%d'
+            ) AS dt
+            FROM sequence
+            WHERE rownum &lt; DATEDIFF(#{endDate}, #{startDate}) + 1
+        ) t
+        LEFT JOIN ta_visiting_log s ON t.dt = DATE_FORMAT(s.visite_date, '%Y-%m-%d')
+        GROUP BY    t.dt
+    </select>
+
+    <select id="getRegularClientTodayAmount" resultType="map">
+        SELECT
+            count(DISTINCT a.real_person) AS total
+        FROM
+            (
+                SELECT
+                    t.real_person,
+                    t.person_id,
+                    count(*)
+                FROM
+                    ta_visiting_log t
+                JOIN ta_person s ON t.person_id = s.person_id
+                WHERE
+                    TO_DAYS(s.last_visite_date) = TO_DAYS(now())
+                GROUP BY
+                    t.real_person,
+                    TO_DAYS(t.visite_date)
+                HAVING
+                    count(*) > 1
+            ) a
+    </select>
 </mapper>

target/classes/mapper/TaVisitingWordsMapper.xml

@@ -1,5 +1,4 @@
 <?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.welcome.huiju.mapper.TaVisitingWordsMapper">
-
+<mapper namespace="com.huiju.welcome.mapper.TaVisitingWordsMapper">
 </mapper>

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

@@ -0,0 +1,95 @@
+com\huiju\welcome\controller\TaVisitingWordsController.class
+com\huiju\welcome\service\impl\TaNoticeServiceImpl.class
+com\huiju\welcome\config\AccessConfig.class
+com\huiju\welcome\service\impl\TaVisitingLogServiceImpl.class
+com\huiju\welcome\controller\CameraController.class
+com\huiju\welcome\service\ITaPersonTypeService.class
+com\huiju\welcome\MainbizApplication.class
+com\huiju\welcome\service\impl\TaSyncLogServiceImpl.class
+com\huiju\welcome\config\MybatisPlusConfig.class
+com\huiju\welcome\controller\TaNoticeController.class
+com\huiju\welcome\mapper\TaPersonMapper.class
+com\huiju\welcome\model\SysParam.class
+com\huiju\welcome\service\impl\SysUserServiceImpl.class
+com\huiju\welcome\controller\TaSnapshotPersonController.class
+com\huiju\welcome\service\ITaDeviceService.class
+com\huiju\welcome\common\base\ResponseBean.class
+com\huiju\welcome\utils\StatusUtils.class
+com\huiju\welcome\model\TaNotice.class
+com\huiju\welcome\interceptor\AccessInterceptor.class
+com\huiju\welcome\mapper\SysUserMapper.class
+com\huiju\welcome\model\TaVisitingLog.class
+com\huiju\welcome\mapper\TaSnapshotPersonMapper.class
+com\huiju\welcome\service\impl\TaSnapshotPersonImpl.class
+com\huiju\welcome\controller\TaVisitingLogController.class
+com\huiju\welcome\model\TaVisitingWords.class
+com\huiju\welcome\model\TaFirstpage.class
+com\huiju\welcome\model\TaSnapshotPerson.class
+com\huiju\welcome\service\ITaFirstpageService.class
+com\huiju\welcome\controller\SysUserController.class
+com\huiju\welcome\service\impl\TaVisitingWordsServiceImpl.class
+com\huiju\welcome\service\ITaCustomWordsService.class
+com\huiju\welcome\controller\TaFirstpageController.class
+com\huiju\welcome\model\TaSyncLog.class
+com\huiju\welcome\utils\Encrypt.class
+com\huiju\welcome\service\impl\TaDeviceServiceImpl.class
+com\huiju\welcome\model\TaPersonType.class
+com\huiju\welcome\common\WebSocketServer.class
+com\huiju\welcome\controller\TaPersonTypeController.class
+com\huiju\welcome\service\impl\TaContentLibServiceImpl.class
+com\huiju\welcome\service\impl\TaCustomWordsServiceImpl.class
+com\huiju\welcome\service\ISysUserService.class
+com\huiju\welcome\service\ITaFirstpageNoticeService.class
+com\huiju\welcome\service\ITaContentLibService.class
+com\huiju\welcome\service\ISysParamService.class
+com\huiju\welcome\service\ITaNoticeService.class
+com\huiju\welcome\mapper\TaFirstpageContentMapper.class
+com\huiju\welcome\controller\TaFirstpageContentController.class
+com\huiju\welcome\service\ITaSnapshotPersonService.class
+com\huiju\welcome\common\base\BaseController.class
+com\huiju\welcome\utils\XFYun.class
+com\huiju\welcome\service\ITaSyncLogService.class
+com\huiju\welcome\mapper\TaFirstpageMapper.class
+com\huiju\welcome\service\ITaFirstpageContentService.class
+com\huiju\welcome\mapper\TaVisitingLogMapper.class
+com\huiju\welcome\model\TaContentLib.class
+com\huiju\welcome\controller\AudioController.class
+com\huiju\welcome\mapper\SysParamMapper.class
+com\huiju\welcome\common\uuid\IdGen$IdGenHolder.class
+com\huiju\welcome\mapper\TaFirstpageNoticeMapper.class
+com\huiju\welcome\model\TaPerson.class
+com\huiju\welcome\model\TaCustomWords.class
+com\huiju\welcome\model\TaFirstpageNotice.class
+com\huiju\welcome\controller\ImgController.class
+com\huiju\welcome\config\WebSocketConfig.class
+com\huiju\welcome\service\impl\TaFirstpageServiceImpl.class
+com\huiju\welcome\mapper\TaCustomWordsMapper.class
+com\huiju\welcome\mapper\TaContentLibMapper.class
+com\huiju\welcome\common\uuid\IdGen.class
+com\huiju\welcome\mapper\TaDeviceMapper.class
+com\huiju\welcome\model\TaFirstpageContent.class
+com\huiju\welcome\service\impl\TaFirstpageContentServiceImpl.class
+com\huiju\welcome\utils\FileUtil.class
+com\huiju\welcome\service\ICameraService.class
+com\huiju\welcome\mapper\TaVisitingWordsMapper.class
+com\huiju\welcome\service\impl\TaPersonServiceImpl.class
+com\huiju\welcome\service\impl\CameraServiceImpl.class
+com\huiju\welcome\service\impl\TaFirstpageNoticeServiceImpl.class
+com\huiju\welcome\model\TaDevice.class
+com\huiju\welcome\service\ITaPersonService.class
+com\huiju\welcome\service\impl\TaPersonTypeServiceImpl.class
+com\huiju\welcome\controller\TaContentLibController.class
+com\huiju\welcome\mapper\TaSyncLogMapper.class
+com\huiju\welcome\controller\TaDeviceController.class
+com\huiju\welcome\service\impl\SysParamServiceImpl.class
+com\huiju\welcome\utils\SAWeather.class
+com\huiju\welcome\controller\TaPersonController.class
+com\huiju\welcome\controller\TaSyncLogController.class
+com\huiju\welcome\service\ITaVisitingLogService.class
+com\huiju\welcome\model\TaImages.class
+com\huiju\welcome\controller\SysParamController.class
+com\huiju\welcome\service\ITaVisitingWordsService.class
+com\huiju\welcome\model\SysUser.class
+com\huiju\welcome\mapper\TaPersonTypeMapper.class
+com\huiju\welcome\mapper\TaNoticeMapper.class
+com\huiju\welcome\controller\TaFirstpageNoticeController.class

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

@@ -4,12 +4,15 @@ E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\Ta
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaFirstpageContentServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaFirstpageNoticeController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaNoticeController.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaCustomWordsMapper.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ICameraService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaPersonService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaNoticeMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\MainbizApplication.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaNoticeServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaFirstpageMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaImages.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaSnapshotPersonMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaVisitingLogServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaContentLibMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaPersonType.java
@@ -25,12 +28,13 @@ E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaDeviceMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\common\base\ResponseBean.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\ImgController.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaCustomWordsService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaDeviceService.java
-E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\utils\AMap.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\SysParamMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\utils\SAWeather.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaFirstpageController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaSyncLog.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaSnapshotPerson.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\config\WebSocketConfig.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaFirstpageNoticeMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaContentLibService.java
@@ -41,11 +45,13 @@ E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\Au
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\SysUserMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaVisitingLog.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\common\uuid\IdGen.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaCustomWordsServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ISysParamService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ISysUserService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaVisitingWords.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaFirstpageServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaVisitingWordsServiceImpl.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaCustomWords.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaContentLib.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\SysParamServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaVisitingWordsService.java
@@ -64,12 +70,15 @@ E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaDevic
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaSyncLogServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaFirstpageContentMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaFirstpageService.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\CameraServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaVisitingWordsController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\config\AccessConfig.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaSyncLogMapper.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\SysUser.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaSnapshotPersonService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\common\base\BaseController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaPersonServiceImpl.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaSnapshotPersonController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaNotice.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaContentLibServiceImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaVisitingWordsMapper.java
@@ -80,5 +89,6 @@ E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\mapper\TaPers
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaFirstpageContentController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\controller\TaPersonController.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\model\TaFirstpageContent.java
+E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\impl\TaSnapshotPersonImpl.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\service\ITaPersonTypeService.java
 E:\JavaProjects\welcome3.0\service\src\main\java\com.huiju.welcome\utils\XFYun.java