feats

.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:aliyun-java-sdk-core:4.1.1">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/aliyun/aliyun-java-sdk-core/4.1.1/aliyun-java-sdk-core-4.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/aliyun/aliyun-java-sdk-core/4.1.1/aliyun-java-sdk-core-4.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/aliyun/aliyun-java-sdk-core/4.1.1/aliyun-java-sdk-core-4.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.gson:gson:2.8.5">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_5_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okhttp:okhttp:2.5.0">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/squareup/okhttp/okhttp/2.5.0/okhttp-2.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/squareup/okhttp/okhttp/2.5.0/okhttp-2.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/squareup/okhttp/okhttp/2.5.0/okhttp-2.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okio:okio:1.6.0">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/squareup/okio/okio/1.6.0/okio-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/squareup/okio/okio/1.6.0/okio-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_1_14.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.xml.bind:jaxb-core:2.1.14">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-core/2.1.14/jaxb-core-2.1.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-core/2.1.14/jaxb-core-2.1.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-core/2.1.14/jaxb-core-2.1.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.xml.bind:jaxb-impl:2.1">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-impl/2.1/jaxb-impl-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/sun/xml/bind/jaxb-impl/2.1/jaxb-impl-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_0_75.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.tencentcloudapi:tencentcloud-sdk-java:3.0.75">
+    <CLASSES>
+      <root url="jar://D:/REPO/com/tencentcloudapi/tencentcloud-sdk-java/3.0.75/tencentcloud-sdk-java-3.0.75.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/com/tencentcloudapi/tencentcloud-sdk-java/3.0.75/tencentcloud-sdk-java-3.0.75-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/com/tencentcloudapi/tencentcloud-sdk-java/3.0.75/tencentcloud-sdk-java-3.0.75-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__javax_activation_activation_1_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1.1">
+    <CLASSES>
+      <root url="jar://D:/REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/javax/activation/activation/1.1.1/activation-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/javax/activation/activation/1.1.1/activation-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:javax.activation-api:1.2.0">
+    <CLASSES>
+      <root url="jar://D:/REPO/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.xml.bind:jaxb-api:2.3.1">
+    <CLASSES>
+      <root url="jar://D:/REPO/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/service.iml

@@ -125,5 +125,15 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:2.8.3" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.tencentcloudapi:tencentcloud-sdk-java:3.0.75" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
   </component>
 </module>

pom.xml

@@ -97,6 +97,17 @@
 			<artifactId>aliyun-sdk-oss</artifactId>
 			<version>2.8.3</version>
 		</dependency>
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>aliyun-java-sdk-core</artifactId>
+			<version>4.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.tencentcloudapi</groupId>
+			<artifactId>tencentcloud-sdk-java</artifactId>
+			<!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
+			<version>3.0.75</version>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -131,8 +131,6 @@ public class WebSocketServer {
 				continue;
 			}
 		}
-
-		log.error("发送数据失败: [{}-{}] 不在线, 发送内容: {}", type, sid, message);
 	}
 	
 	public static synchronized int getOnlineCount() {

src/main/java/com.huiju.welcome/config/AliOSSProperties.java

@@ -1,34 +0,0 @@
-package com.huiju.welcome.config;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Data
-@ConfigurationProperties(prefix = "ali")
-public class AliOSSProperties {
-    public static String accessKeyId;
-    public static String accessKeySecret;
-    public static OSS oss = new AliOSSProperties.OSS();
-
-    public String getAccessKeyId() { return AliOSSProperties.accessKeyId; }
-    public String getAccessKeySecret() { return AliOSSProperties.accessKeySecret; }
-    public OSS getOss() { return AliOSSProperties.oss; }
-
-    // setters
-    public void setAccessKeyId(String accessKeyId) {
-        AliOSSProperties.accessKeyId = accessKeyId;
-    }
-    public void setAccessKeySecret(String accessKeySecret) { AliOSSProperties.accessKeySecret = accessKeySecret;}
-
-    public static void setOss(OSS oss) {
-        AliOSSProperties.oss = oss;
-    }
-
-    @Data
-    public static class OSS {
-        String endpoint;
-        String bucketName;
-        String bucketURL;
-    }
-}

src/main/java/com.huiju.welcome/config/AliProperties.java

@@ -0,0 +1,47 @@
+package com.huiju.welcome.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "ali")
+public class AliProperties {
+    public static String accessKeyId;
+    public static String accessKeySecret;
+    public static OSS oss = new AliProperties.OSS();
+    public static Face face = new AliProperties.Face();
+
+    public String getAccessKeyId() { return AliProperties.accessKeyId; }
+    public String getAccessKeySecret() { return AliProperties.accessKeySecret; }
+    public OSS getOss() { return AliProperties.oss; }
+    public Face getFace() { return AliProperties.face; }
+
+    // setters
+    public void setAccessKeyId(String accessKeyId) {
+        AliProperties.accessKeyId = accessKeyId;
+    }
+    public void setAccessKeySecret(String accessKeySecret) { AliProperties.accessKeySecret = accessKeySecret;}
+
+    public static void setOss(OSS oss) {
+        AliProperties.oss = oss;
+    }
+    public static void setFace(Face face) {
+        AliProperties.face = face;
+    }
+
+    @Data
+    public static class OSS {
+        String endpoint;
+        String bucketName;
+        String bucketURL;
+    }
+
+    @Data
+    public static class Face {
+        String regionId;
+        String domain;
+        String version;
+        String group;
+    }
+}

src/main/java/com.huiju.welcome/config/TencentProperties.java

@@ -0,0 +1,19 @@
+package com.huiju.welcome.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "tencent")
+public class TencentProperties {
+    String secretId;
+    String secretKey;
+    Iai iai;
+
+    @Data
+    public static class Iai {
+        String region;
+        String group;
+    }
+}

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

@@ -114,12 +114,7 @@ public class CameraController {
 		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());
+		Float faceMinScore = iSysParamService.getFaceMinScore();
 
 		Integer score = taSnapshotPerson.getScore();
 		if (null == score || score.intValue() < faceMinScore) {
@@ -128,12 +123,7 @@ public class CameraController {
 
 		// 人脸相似度阈值, 低于设定认为没有识别成功
 		// 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 samePersonThreshold = iSysParamService.getSamePersonThreshold();
 		Float similarity = taSnapshotPerson.getSimilarity();
 
 		// 识别结果
@@ -151,12 +141,7 @@ public class CameraController {
 
 			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());
+				Float dispatchTimeLimit = iSysParamService.getDispatchTimeLimit();
 
 				// 默认 2 分钟内连续识别的都是垃圾数据
 				Duration duration = Duration.between(lastTime, taSnapshotPerson.getCreateDate());
@@ -200,8 +185,9 @@ public class CameraController {
 	public ResponseBean car(
 			@PathParam("deviceId") String deviceId,
 			@RequestParam("sceneImage") MultipartFile carImage,
-			@RequestParam("driverImage") MultipartFile driverImage,
-			@RequestParam("copilotImage") MultipartFile copilotImage,
+			@RequestParam("licenseImage") MultipartFile licenseImage,
+			@RequestParam(value = "driverImage", required = false) MultipartFile driverImage,
+			@RequestParam(value = "copilotImage", required = false) MultipartFile copilotImage,
 			@RequestParam("plateNumber") String plateNumber,
 			@RequestParam("color") String color,
 			@RequestParam("carModel") String carModel
@@ -215,6 +201,9 @@ public class CameraController {
 		if (null != carImage && !carImage.isEmpty()) {
 			taCarRecord.setCarImage(getMultipartFile(carImage));
 		}
+		if (null != licenseImage && !licenseImage.isEmpty()) {
+			taCarRecord.setLicenseImage(getMultipartFile(licenseImage));
+		}
 		if (null != driverImage && !driverImage.isEmpty()) {
 			taCarRecord.setDriverImage(getMultipartFile(driverImage));
 		}
@@ -224,7 +213,7 @@ public class CameraController {
 
 		iTaCarRecordService.newRecordByDevice(taCarRecord);
 
-		return null;
+		return ResponseBean.success("");
 	}
 
 	//推送给前端

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

@@ -1,10 +1,13 @@
 package com.huiju.welcome.controller;
 
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.utils.AliFaceUtils;
 import com.huiju.welcome.utils.AliOSSUtils;
+import com.huiju.welcome.utils.TencentFaceUtils;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,41 +27,32 @@ import java.io.IOException;
 @RestController
 @RequestMapping("/")
 public class ImgController {
-	
-	@Value("${huiju.files}")
-	private String huijuFiles;
 
-	private String subDir = "upload" + File.separator;
+	@Autowired
+	TencentFaceUtils tencentFaceUtils;
+
+	@PostMapping("/face")
+	public ResponseBean testUpload2Aliface() {
+		try {
+			tencentFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
+			return ResponseBean.success("");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ResponseBean.error("", 400);
+	}
 	
 	@ApiOperation(value = "图片/视频上传以及获取url", notes = "图片/视频上传以及获取url")
 	@PostMapping(value = "/uploadFile", consumes = "multipart/*", headers = "content-type=multipart/form-data")
 	public ResponseBean uploadFile(@ApiParam(value = "uploadFile" ,required = true) MultipartFile uploadFile){
-		ResponseBean responseBean = new ResponseBean();
-		String suffix = uploadFile.getOriginalFilename().substring(uploadFile.getOriginalFilename().lastIndexOf(".") + 1);
-		String fileName = System.currentTimeMillis() + "." + suffix;
-		String path = huijuFiles;
-		File tempFile = new File(path + subDir);
-		if (!tempFile.exists()) {
-			tempFile.mkdirs();
-		}
+		String defaultUploadDir = "/";
+
 		try {
-			//下载文件
-			FileOutputStream fos=new FileOutputStream(tempFile.getPath() + File.separator + fileName);
-			FileInputStream fs=(FileInputStream) uploadFile.getInputStream();
-			byte[] buffer=new byte[1024];
-			int len=0;
-			while((len=fs.read(buffer))!=-1){
-				fos.write(buffer, 0, len);
-			}
-			fos.close();
-			fs.close();
-		}catch (Exception e){
-			e.printStackTrace();
-			responseBean.addError(e.getMessage());
-			return responseBean;
+			String img = AliOSSUtils.putObject(uploadFile, defaultUploadDir);
+			return ResponseBean.success(img);
+		} catch (IOException e) {
+			return ResponseBean.error("上传图片失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
 		}
-		responseBean.addSuccess(File.separator + subDir + fileName);
-		return responseBean;
 	}
 
 	@PostMapping("/miniapp/upload")

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

@@ -55,7 +55,7 @@ public class SysUserController extends BaseController {
             return responseBean;
         }
 
-        SysUser sysUser = sysUserService.getDetailByUsername(username);
+        SysUser sysUser = sysUserService.getDetailByLoginname(username);
         if (null == sysUser) {
             responseBean.addError(HttpStatus.SC_BAD_REQUEST, "账户或者密码不正确");
             return responseBean;
@@ -118,7 +118,7 @@ public class SysUserController extends BaseController {
             @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 = "是否销售"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "identity", value = "用户身份"),
     })
     @RequestMapping(value = "/sysuser", method = RequestMethod.GET)
     public ResponseBean list(
@@ -126,7 +126,7 @@ public class SysUserController extends BaseController {
             @RequestParam  Integer pageSize,
             String name,
             String phone,
-            Integer isSales,
+            String identity,
             HttpServletRequest request
     ) {
         ResponseBean responseBean = new ResponseBean();
@@ -139,15 +139,15 @@ public class SysUserController extends BaseController {
         queryWrapper.gt("user_id", 1); // 去掉管理员
 
         if (null != name && !"".equals(name)) {
-            queryWrapper.like("nickname", name);
+            queryWrapper.like("username", name);
         }
 
         if (null != phone && !"".equals(phone)) {
             queryWrapper.eq("phone", phone);
         }
 
-        if (null != isSales && isSales.intValue() > 0 ) {
-            queryWrapper.eq("is_sales", isSales);
+        if (null != identity ) {
+            queryWrapper.eq("user_identity", identity);
         }
 
         // 取消传递密码字段

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

@@ -24,7 +24,9 @@ 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;
 
 /**
  * <p>
@@ -195,6 +197,9 @@ public class TaCustomerController extends BaseController {
 
             if (iTaCustomerService.updateById(taCustomer)){
 
+                // 反更新人员
+                iTaPersonService.updateByCustomer(taCustomer);
+
                 List<TaPerson> group = iTaCustomerService.getGroup(taCustomer.getCustomerId());
                 taCustomer.setGroup(group);
 
@@ -234,6 +239,15 @@ public class TaCustomerController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping("/miniapp/history/customer")
+    public ResponseBean history(String phone) {
+        Map<String, Object> filters = new HashMap<String, Object>(){{
+            put("phone", phone);
+        }};
+
+        return ResponseBean.success(iTaCustomerService.getHistoryRecBy(filters));
+    }
+
     /**
      * 分页查询
      */

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

@@ -223,16 +223,16 @@ public class TaFirstpageController extends BaseController {
     @ApiOperation(value = "前端获取指定首屏内容", notes = "前端获取指定首屏内容")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataType = "String", name = "deviceId", value = "设备ID"),
-            @ApiImplicitParam(paramType = "Query", dataType = "String", name = "weatherName", value = "天气名称")
+            @ApiImplicitParam(paramType = "Query", dataType = "String", name = "city", value = "地址")
     })
     @RequestMapping(value = "/screen/fristpage/device/{deviceId}", method = RequestMethod.GET)
     public ResponseBean screenGet(@PathVariable String deviceId, HttpServletRequest request,
-                                  @RequestParam(value ="weatherName",required = false)String weatherName) {
-        return detail(0, deviceId, request,weatherName);
+                                  @RequestParam(value ="city",required = false)String city) {
+        return detail(0, deviceId, request, city);
     }
 
     // getDetail 获取首屏详情
-    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request,String weatherName) {
+    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request,String city) {
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaFirstpage> q = new QueryWrapper<>();
@@ -247,8 +247,8 @@ public class TaFirstpageController extends BaseController {
             responseBean.addError(HttpStatus.SC_NOT_FOUND, "内容不存在");
             return responseBean;
         }
-        //天气值weatherName
-        taFirstpage.setWeatherName(weatherName);
+        //
+        taFirstpage.setCity(city);
         // 获取内容
         Map<String, Object> ctt = taFirstpageService.detail(taFirstpage);
         responseBean.addSuccess(ctt);

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

@@ -1,6 +1,8 @@
 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.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
@@ -9,12 +11,10 @@ import com.huiju.welcome.model.SysUser;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFollowupRecord;
 import com.huiju.welcome.model.TaMainUsherRecord;
-import com.huiju.welcome.service.ISysUserService;
-import com.huiju.welcome.service.ITaCustomerService;
-import com.huiju.welcome.service.ITaFollowupRecordService;
-import com.huiju.welcome.service.ITaMainUsherRecordService;
+import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,10 +44,7 @@ public class TaMainUsherRecordController extends BaseController {
     private ITaFollowupRecordService iTaFollowupRecordService;
 
     @Autowired
-    private ITaCustomerService iTaCustomerService;
-
-    @Autowired
-    private ISysUserService iSysUserService;
+    private ITaPersonService iTaPersonService;
 
     /**
      * 保存对象
@@ -58,26 +55,9 @@ public class TaMainUsherRecordController extends BaseController {
     public ResponseBean save(@RequestBody TaMainUsherRecord taMainUsherRecord){
         ResponseBean responseBean = new ResponseBean();
         try {
-            taMainUsherRecord.setStatus(StatusUtils.Normal);
-
-            if (null == taMainUsherRecord.getConsultantId() || taMainUsherRecord.getConsultantId().intValue() == 0) {
-                return ResponseBean.error("请设置置业顾问", HttpStatus.SC_BAD_REQUEST);
-            } else {
-                SysUser user = iSysUserService.getById(taMainUsherRecord.getConsultantId());
-                taMainUsherRecord.setRealtyConsultant(user.getUsername());
-            }
-
-            // 先添加到置业的客户中
-            TaCustomer taCustomer = iTaCustomerService.newVisitRecord(taMainUsherRecord);
-
-            if (iTaMainUsherRecordService.save(taMainUsherRecord)){
+            iTaMainUsherRecordService.newRecordByMiniapp(taMainUsherRecord);
 
-                iTaMainUsherRecordService.notifyConsultant(taMainUsherRecord, taCustomer);
-
-                responseBean.addSuccess(taMainUsherRecord);
-            }else {
-                responseBean.addError("fail");
-            }
+            responseBean.addSuccess(taMainUsherRecord);
         }catch (Exception e){
             logger.error("taMainUsherRecordAdd -=- {}",e.toString());
             responseBean.addError(e.getMessage());
@@ -90,15 +70,11 @@ public class TaMainUsherRecordController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/mainUsherRecord/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/miniapp/mainUsherRecord/{id}/delete", method= RequestMethod.PUT)
     public ResponseBean delete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaMainUsherRecordService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
+            iTaMainUsherRecordService.deleteRecord(id);
         }catch (Exception e){
             logger.error("taMainUsherRecordDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());
@@ -115,26 +91,7 @@ public class TaMainUsherRecordController extends BaseController {
     public ResponseBean update(@RequestBody TaMainUsherRecord taMainUsherRecord, @PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            taMainUsherRecord.setStatus(StatusUtils.Normal);
-
-            if (null == taMainUsherRecord.getConsultantId() || taMainUsherRecord.getConsultantId().intValue() == 0) {
-                return ResponseBean.error("请设置置业顾问", HttpStatus.SC_BAD_REQUEST);
-            } else {
-                SysUser user = iSysUserService.getById(taMainUsherRecord.getConsultantId());
-                taMainUsherRecord.setRealtyConsultant(user.getUsername());
-            }
-
-            // 先添加到置业的客户中
-            TaCustomer taCustomer = iTaCustomerService.newVisitRecord(taMainUsherRecord);
-
-            if (iTaMainUsherRecordService.updateById(taMainUsherRecord)){
-
-                iTaMainUsherRecordService.notifyConsultant(taMainUsherRecord, taCustomer);
-
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
+            iTaMainUsherRecordService.updateByMiniapp(taMainUsherRecord);
         }catch (Exception e){
             logger.error("taMainUsherRecordUpdate -=- {}",e.toString());
             responseBean.addError(e.getMessage());
@@ -166,6 +123,24 @@ public class TaMainUsherRecordController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/miniapp/mainUsherRecord/{id}/whitelist")
+    public ResponseBean whitelist(@PathVariable Integer id, @RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("白名单信息为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        Integer personId = params.getInteger("personId");
+        if (null == personId || personId.intValue() == 0) {
+            return ResponseBean.error("未找到需要设置白对单对象", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        iTaPersonService.setPersonIntoWhitelist(personId);
+        iTaMainUsherRecordService.deleteRecord(id);
+
+        return ResponseBean.success("");
+    }
+
     /**
      * 分页查询
      */

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

@@ -231,36 +231,4 @@ public class TaPersonController extends BaseController {
         responseBean.addSuccess(person);
         return responseBean;
     }
-
-    /**
-     * 小程序端, 添加人员到白名单。
-     * 实际上是把人员类型设置为工作人员
-     * @param paramStr
-     * @return
-     */
-    @PutMapping("/miniapp/whitelist")
-    public ResponseBean addToWhiteList(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (null == params) {
-            return ResponseBean.error("白名单信息为空或者非法", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        Integer personId = params.getInteger("personId");
-        if (null == personId || personId.intValue() == 0) {
-            return ResponseBean.error("未找到需要设置白对单对象", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("type_id", 3);
-        updateWrapper.eq("person_id", personId);
-
-        if (taPersonService.update(new TaPerson(), updateWrapper)) {
-            return ResponseBean.success("success");
-        } else {
-            return ResponseBean.error("设置白名单出错", HttpStatus.SC_INTERNAL_SERVER_ERROR);
-        }
-    }
-
-
-
 }

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

@@ -10,7 +10,9 @@ import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.model.TaWechatUser;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
+import com.huiju.welcome.service.ITaWechatUserService;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
@@ -26,6 +28,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,6 +45,9 @@ public class TaVisitorAppointmentController extends BaseController {
     @Autowired
     ITaVisitorAppointmentService taVisitorAppointmentService;
 
+    @Autowired
+    ITaWechatUserService iTaWechatUserService;
+
     @GetMapping("/appointment")
     public ResponseBean list(
             @RequestParam(defaultValue = "1") Integer page,
@@ -80,7 +87,8 @@ public class TaVisitorAppointmentController extends BaseController {
             return resp;
         }
 
-        taVisitorAppointment.setCreateUser(Integer.valueOf(JWTUtils.getSubject(request)));
+        TaWechatUser user = iTaWechatUserService.getById(Integer.valueOf(JWTUtils.getSubject(request)));
+        taVisitorAppointment.setCreateUser(user.getPersonId());
 
         boolean success = taVisitorAppointmentService.save(taVisitorAppointment);
         if (success) {

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

@@ -87,7 +87,7 @@ public class TaWechatUserController extends BaseController {
 
             boolean success = iTaWechatUserService.save(taWechatUser);
             if (!success) {
-                ResponseBean.error("预存用户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+                return ResponseBean.error("预存用户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
             }
         }
 
@@ -107,41 +107,41 @@ public class TaWechatUserController extends BaseController {
         TaWechatUser taWechatUser = iTaWechatUserService.getById(Integer.valueOf(userId));
 
         if (null == taWechatUser) {
-            ResponseBean.error("数据异常, 请清空缓存后重新操作", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            return ResponseBean.error("数据异常, 请清空缓存后重新操作", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
 
         if (null != taWechatUser.getPersonId()) {
-            ResponseBean.error("不支持人员重复绑定", HttpStatus.SC_BAD_REQUEST);
+            return ResponseBean.error("不支持人员重复绑定", HttpStatus.SC_BAD_REQUEST);
         }
 
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
-            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
         }
 
         String phone = params.getString("phone");
         String captcha = params.getString("captcha");
 
         if (null == phone || "".equals(phone.trim()) || null == captcha || "".equals(captcha.trim())) {
-            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
         }
 
         // todo
         // 先简单验证
         if (!"1234".equals(captcha)) {
-            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
         }
 
         SysUser sysUser = iSysUserService.getByPhone(phone);
         if (null == sysUser) {
-            ResponseBean.error("该手机号对应人员不存在", HttpStatus.SC_BAD_REQUEST);
+            return ResponseBean.error("该手机号对应人员不存在", HttpStatus.SC_BAD_REQUEST);
         }
 
         taWechatUser.setPersonId(sysUser.getUserId());
         boolean success = iTaWechatUserService.updateById(taWechatUser);
 
         if (!success) {
-            ResponseBean.error("人员绑定失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            return ResponseBean.error("人员绑定失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
 
         Map<String, Object> map = new HashMap<>();

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

@@ -36,6 +36,7 @@ public class AccessInterceptor implements HandlerInterceptor {
         "/screen",
         "/camera",
         "/websocket",
+         "/face",
         "/miniapp/login"
     };
 

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

@@ -22,5 +22,5 @@ public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
     TaCustomer getCustomerOf(@Param("personId") Integer personId, @Param("realId") Integer realId);
     IPage<TaCustomer> customerPage(IPage<TaCustomer> pg, String customerName, String phone, String platNumber);
 
-    List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber);
+    List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber, @Param("phone") String phone);
 }

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

@@ -27,7 +27,7 @@ public class SysUser implements Serializable {
     @TableId(value = "user_id", type = IdType.AUTO)
     private Integer userId;
 
-    private String nickname;
+    private String loginname;
 
     private String password;
 

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

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

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

@@ -39,6 +39,8 @@ public class TaDevice implements Serializable {
 
     private String api;
 
+    private String afr;
+
     private Integer status;
 
     private LocalDateTime onlineDate;

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

@@ -42,7 +42,7 @@ public class TaFirstpage implements Serializable {
      * 前端获取指定首屏内容输入动态名称
      */
     @TableField(exist = false)
-    private  String weatherName;
+    private  String city;
 
     @TableField(exist = false)
     private List<TaFirstpageContent> content;

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

@@ -13,4 +13,11 @@ import com.huiju.welcome.model.SysParam;
  */
 public interface ISysParamService extends IService<SysParam> {
 
+    Float getSamePersonThreshold();
+
+    String getParamOfWithDefault(String id, String def);
+
+    Float getFaceMinScore();
+
+    Float getDispatchTimeLimit();
 }

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

@@ -13,7 +13,7 @@ import com.huiju.welcome.model.SysUser;
  */
 public interface ISysUserService extends IService<SysUser> {
 
-    SysUser getDetailByUsername(String username);
+    SysUser getDetailByLoginname(String username);
 
     SysUser getByPhone(String phone);
 }

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

@@ -1,10 +1,8 @@
 package com.huiju.welcome.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.welcome.model.TaCarRecord;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaMainUsherRecord;
-import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.*;
 
 import java.util.List;
 import java.util.Map;
@@ -17,9 +15,6 @@ import java.util.Map;
  * @since 2019-06-12
  */
 public interface ITaCustomerService extends IService<TaCustomer> {
-
-    TaCustomer newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception;
-
     List<TaPerson> getGroup(Integer customerId);
 
     Map<String, Object> getLastVisitInfo(Integer customerId);
@@ -30,7 +25,17 @@ public interface ITaCustomerService extends IService<TaCustomer> {
 
     List<TaCustomer> getSomeCustMayBe(String plateNumber);
 
-    TaCustomer newCustByCarDevice(TaCarRecord taCarRecord);
+    TaCustomer newCustByCarDevice(TaCarRecord taCarRecord, TaVisitorAppointment ...taVisitorAppointment);
 
     void notifyConsultant(TaCustomer taCustomer) throws Exception;
+
+    boolean updateConsultant(TaCustomer taCustomer, Integer consultantId);
+
+    TaCustomer newCustByMainUsher(TaMainUsherRecord taMainUsherRecord) throws Exception;
+
+    Map<String, Object> getHistoryRecBy(Map<String,Object> filters);
+
+    TaCustomer getSameByPerson(Integer personId);
+
+    boolean updataByCarRecord(TaCustomer taCustomer, TaCarRecord taCarRecord);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.model.TaPerson;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     void notifyConsultant(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception;
 
-    boolean newRecordByDevice(TaCustomer taCustomer);
+    boolean newRecordByDevice(TaCustomer taCustomer, TaPerson taPerson);
 
     boolean newRecordByConsultant(TaCustomer taCustomer);
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment);
@@ -32,4 +33,10 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
      * @return
      */
     ResponseBean customerPage(int pageNum, int pageSize, String customerName, String phone, String platNumber);
+
+    boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
+
+    boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
+
+    boolean deleteRecord(Integer id);
 }

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

@@ -6,5 +6,5 @@ import com.huiju.welcome.model.TaMessageRecord;
 import java.util.List;
 
 public interface ITaMessageRecordService extends IService<TaMessageRecord> {
-    boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data);
+    boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data, boolean save);
 }

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

@@ -52,4 +52,8 @@ public interface ITaPersonService extends IService<TaPerson> {
     TaPerson newPersonByFront(TaCustomer taCustomer);
 
     TaPerson newPersonByUsher(TaMainUsherRecord taMainUsherRecord);
+
+    boolean updateByCustomer(TaCustomer taCustomer);
+
+    boolean setPersonIntoWhitelist(Integer personId);
 }

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaVisitorAppointment;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +26,8 @@ public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointm
      * @return
      */
     ResponseBean visitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber,String personName,String phone);
+
+    List<TaVisitorAppointment> getAppointmentsBy(Map<String,Object> filters);
+
+    List<TaVisitorAppointment> getAppointmentsByPlateNumber(String plateNumber);
 }

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

@@ -9,6 +9,9 @@ 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 com.huiju.welcome.utils.TencentFaceUtils;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,17 +22,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Service
 public class CameraServiceImpl implements ICameraService {
     @Autowired
     private ITaDeviceService taDeviceService;
 
+    @Autowired
+    TencentFaceUtils tencentFaceUtils;
+
     @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);
+            queryWrapper.eq("afr",StatusUtils.BoolTrue);
             taDeviceList = taDeviceService.list(queryWrapper);
         } else {
             taDeviceList = Arrays.asList(devices);
@@ -51,6 +59,14 @@ public class CameraServiceImpl implements ICameraService {
             }
         }
 
+        // 下发到腾讯云人脸识别
+        try {
+            tencentFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
+        } catch (TencentCloudSDKException e) {
+            e.printStackTrace();
+            log.error("下发人脸到腾讯云失败: " + e.getMessage());
+        }
+
         return "";
     }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.SysParamMapper;
 import com.huiju.welcome.model.SysParam;
 import com.huiju.welcome.service.ISysParamService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +17,37 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, SysParam> implements ISysParamService {
+    @Autowired
+    SysParamMapper sysParamMapper;
+
+    @Override
+    public Float getSamePersonThreshold() {
+        String val = getParamOfWithDefault("same-person-threshold", "70");
+        return Float.parseFloat(val);
+    }
+
+    @Override
+    public String getParamOfWithDefault(String id, String def) {
+        SysParam sysParam = sysParamMapper.selectById(id);
+        if (null == sysParam) return def;
+
+        String val = sysParam.getValue();
+        if (null == val || "".equals(val)) return def;
+
+        return val;
+    }
+
+    @Override
+    public Float getFaceMinScore() {
+        String val = getParamOfWithDefault("face-min-score", "70");
+        return Float.parseFloat(val);
+    }
+
+    @Override
+    public Float getDispatchTimeLimit() {
+        String val = getParamOfWithDefault("dispatch-time-limit", "2");
+        return Float.parseFloat(val);
+    }
+
 
 }

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

@@ -24,9 +24,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysUserMapper sysUserMapper;
 
     @Override
-    public SysUser getDetailByUsername(String username) {
+    public SysUser getDetailByLoginname(String username) {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username",username);
+        queryWrapper.eq("loginname",username);
         return sysUserMapper.selectOne(queryWrapper);
     }
 

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

@@ -6,9 +6,11 @@ import com.huiju.welcome.mapper.TaCarRecordMapper;
 import com.huiju.welcome.model.TaCarRecord;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.service.ITaCarRecordService;
-import com.huiju.welcome.service.ITaCustomerService;
-import com.huiju.welcome.service.ITaFirstUsherRecordService;
+import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.TencentFaceUtils;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.iai.v20180301.models.Candidate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,15 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
     @Autowired
     private ITaCustomerService iTaCustomerService;
 
+    @Autowired
+    private TencentFaceUtils tencentFaceUtils;
+
+    @Autowired
+    private ISysParamService iSysParamService;
+
+    @Autowired
+    private ITaVisitorAppointmentService iTaVisitorAppointmentService;
+
     @Override
     public IPage<TaCarRecord> getPageList(IPage<TaCarRecord> page, String plateNumber, Date recordDate, String customerName, String phone) {
         return taCarRecordMapper.getPageList(page, plateNumber, recordDate, customerName, phone);
@@ -56,12 +67,44 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         taCarRecordMapper.insert(taCarRecord);
 
         // 到客户中查询是否有相关人员
-        TaCustomer taCustomer;
+        TaCustomer taCustomer = null;
         List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(taCarRecord.getPlateNumber());
 
         // 如果没有对应人员
         if (null == taCustomerList || taCustomerList.size() == 0) {
-            taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
+            // 再去人脸库比对一次
+            Integer personId = null;
+            try {
+                Float threshold = iSysParamService.getSamePersonThreshold();
+                Candidate result = tencentFaceUtils.searchFace(taCarRecord.getDriverImage());
+                if (result.getScore() >= threshold) {
+                    personId = Integer.valueOf(result.getPersonId());
+                }
+            } catch (TencentCloudSDKException e) {
+                e.printStackTrace();
+            }
+
+            // 依据人脸与预约判断
+            // 人脸优先级高
+            if (null != personId && personId > 0) {
+                // 找到对应人脸
+                taCustomer = iTaCustomerService.getSameByPerson(personId);
+                if (null != taCustomer) {
+                    // 尝试更新部分客户信息
+                    iTaCustomerService.updataByCarRecord(taCustomer, taCarRecord);
+                }
+            }
+
+            // 去预约记录查询一次
+            List<TaVisitorAppointment> appointments = iTaVisitorAppointmentService.getAppointmentsByPlateNumber(taCarRecord.getPlateNumber());
+
+            if (null == taCustomer) {
+                if (null != appointments && appointments.size() > 0) {
+                    taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord, appointments.get(0));
+                } else {
+                    taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
+                }
+            }
         } else {
             // 对应客户, 先随机取一条
             taCustomer = taCustomerList.get(0);

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

@@ -3,17 +3,17 @@ package com.huiju.welcome.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.welcome.mapper.TaCustomerMapMapper;
-import com.huiju.welcome.mapper.TaCustomerMapper;
-import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
-import com.huiju.welcome.mapper.TaWechatUserMapper;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.*;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
+import com.huiju.welcome.service.ITaVisitorAppointmentService;
 import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,46 +53,16 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     ITaMainUsherRecordService iTaMainUsherRecordService;
 
     @Autowired
-    TaWechatUserMapper taWechatUserMapper;
+    ITaVisitorAppointmentService iTaVisitorAppointmentService;
 
     @Autowired
-    MiniApp miniApp;
-
-    @Override
-    public TaCustomer newVisitRecord(TaMainUsherRecord taMainUsherRecord) throws Exception {
-        Integer personId = taMainUsherRecord.getPersonId();
-        if (null == personId) {
-            TaPerson taPerson = iTaPersonService.newPersonByUsher(taMainUsherRecord);
-            personId = taPerson.getRealId();
-            taMainUsherRecord.setPersonId(personId);
-        }
-
-        Integer custId = taMainUsherRecord.getCustomerId();
-        TaCustomer cust;
-        if (null == custId) {
-            cust = newCustomerFromMainUsher(taMainUsherRecord);
-            if (null == cust) {
-                throw new Exception("生成置业客户失败");
-            }
-            taMainUsherRecord.setCustomerId(cust.getCustomerId());
-        } else {
-            cust = taCustomerMapper.selectById(custId);
-        }
-
-        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
-        if (null == taCustomerMap) {
-            TaCustomerMap custMap = new TaCustomerMap();
-            custMap.setCustomerId(cust.getCustomerId());
-            custMap.setPersonId(taMainUsherRecord.getPersonId());
+    TaWechatUserMapper taWechatUserMapper;
 
-            int row = taCustomerMapMapper.insert(custMap);
-            if (row <= 0) {
-                throw new Exception("生成置业客户映射失败");
-            }
-        }
+    @Autowired
+    SysUserMapper sysUserMapper;
 
-        return cust;
-    }
+    @Autowired
+    MiniApp miniApp;
 
     @Override
     public List<TaPerson> getGroup(Integer customerId) {
@@ -107,11 +78,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     public void judgeNewCust(TaPerson taPerson) throws Exception {
         // 首先判定这个人 2 小时内是否来访过
         LocalDateTime dt = LocalDateTime.now().minusHours(2);
-        List<TaMainUsherRecord> lastList = taMainUsherRecordMapper.getLastList(taPerson.getPersonId(), dt);
+        List<TaMainUsherRecord> lastList = taMainUsherRecordMapper.getLastList(taPerson.getRealId(), dt);
         if (null != lastList && lastList.size() > 0) return;
 
-        LocalDateTime now = LocalDateTime.now();
-
         // 查询是否有映射客户 - 如果有多个映射客户, 先随机取一条
         // 暂时没有找到好的替代方案
         TaCustomer taCustomer = taCustomerMapper.getCustomerOf(taPerson.getPersonId(), taPerson.getRealId());
@@ -122,8 +91,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         }
 
         // 新增前台记录
-        iTaMainUsherRecordService.newRecordByDevice(taCustomer);
-
+        iTaMainUsherRecordService.newRecordByDevice(taCustomer, taPerson);
         return;
     }
 
@@ -144,17 +112,22 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
     @Override
     public List<TaCustomer> getSomeCustMayBe(String plateNumber) {
-        return taCustomerMapper.getSomeCustMayBe(plateNumber);
+        return taCustomerMapper.getSomeCustMayBe(plateNumber, null);
     }
 
     @Override
-    public TaCustomer newCustByCarDevice(TaCarRecord taCarRecord) {
+    public TaCustomer newCustByCarDevice(TaCarRecord taCarRecord, TaVisitorAppointment ...taVisitorAppointments) {
         TaCustomer taCustomer = new TaCustomer();
+        TaVisitorAppointment appointment = null != taVisitorAppointments && taVisitorAppointments.length > 0 ? taVisitorAppointments[0] : null;
+
+        String name = StringUtils.ifNull(taCarRecord.getCustomerName(), null != appointment ? appointment.getPersonName() : null);
+        String phone = null != appointment ? appointment.getPhone() : null;
 
         taCustomer.setCreateDate(LocalDateTime.now());
         taCustomer.setStatus(StatusUtils.Normal);
-        taCustomer.setCustomerName(taCarRecord.getCustomerName());
-        taCustomer.setAvatar(taCarRecord.getDriverImage());
+        taCustomer.setCustomerName(name);
+        taCustomer.setPhone(phone);
+        taCustomer.setAvatar(taCarRecord.getLicenseImage());
         taCustomer.setCarModel(taCarRecord.getCarModel());
         taCustomer.setPlateNumber(taCarRecord.getPlateNumber());
 
@@ -166,7 +139,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         customerMap.setPersonId(taPerson.getPersonId());
 
         taCustomerMapMapper.insert(customerMap);
-        taCustomerMapper.insert(taCustomer);
+
+        insertCustomer(taCustomer);
 
         return taCustomer;
     }
@@ -174,7 +148,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Override
     public void notifyConsultant(TaCustomer taCustomer) throws Exception {
         String tpl = miniApp.getTpls().getVisitor();
-        String page = "";
+        String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + taCustomer.getCustomerId();
         String openid = taWechatUserMapper.getOpenidOf(taCustomer.getConsultantId(), CommConstant.WECHAT_CLIENT_MINIAPP);
         if (null == openid) {
             throw new Exception("发送消息给置业失败, 当前置业[" + taCustomer.getConsultantId() + "]未绑定小程序账号");
@@ -188,6 +162,112 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         miniApp.sendTPLMessage(tpl, openid, page, data);
     }
 
+    @Override
+    public boolean updateConsultant(TaCustomer taCustomer, Integer consultantId) {
+        SysUser usr = sysUserMapper.selectById(consultantId);
+        if (null == usr) {
+            log.error("更新客户置业失败, 置业ID {} 不存在", consultantId);
+            return false;
+        }
+
+        Integer originConsultant = taCustomer.getConsultantId();
+        taCustomer.setConsultantId(consultantId);
+        taCustomer.setRealtyConsultant(usr.getUsername());
+
+        // 如果变更了置业顾问
+        if (null == originConsultant || originConsultant.intValue() < 1 || !originConsultant.equals(consultantId)) {
+            try {
+                notifyConsultant(taCustomer);
+            } catch (Exception e) {}
+        }
+
+        int row = taCustomerMapper.updateById(taCustomer);
+        return row > 0;
+    }
+
+    @Override
+    public TaCustomer newCustByMainUsher(TaMainUsherRecord taMainUsherRecord) throws Exception {
+        Integer personId = taMainUsherRecord.getPersonId();
+        if (null == personId) {
+            TaPerson taPerson = iTaPersonService.newPersonByUsher(taMainUsherRecord);
+            personId = taPerson.getRealId();
+            taMainUsherRecord.setPersonId(personId);
+        }
+
+        Integer custId = taMainUsherRecord.getCustomerId();
+        TaCustomer cust;
+        if (null == custId) {
+            cust = copyDataFromMainUsher(taMainUsherRecord);
+            if (!insertCustomer(cust)) {
+                throw new Exception("新增客户信息失败");
+            }
+
+            taMainUsherRecord.setCustomerId(cust.getCustomerId());
+        } else {
+            cust = taCustomerMapper.selectById(custId);
+        }
+
+        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
+        if (null == taCustomerMap) {
+            TaCustomerMap custMap = new TaCustomerMap();
+            custMap.setCustomerId(cust.getCustomerId());
+            custMap.setPersonId(taMainUsherRecord.getPersonId());
+
+            int row = taCustomerMapMapper.insert(custMap);
+            if (row <= 0) {
+                throw new Exception("生成置业客户映射失败");
+            }
+        }
+
+        return cust;
+    }
+
+    @Override
+    public Map<String, Object> getHistoryRecBy(Map<String, Object> filters) {
+        Map<String, Object> result = new HashMap<String, Object>(){{
+            put("phone", filters.get("phone").toString());
+        }};
+
+        List<TaVisitorAppointment> appointments = iTaVisitorAppointmentService.getAppointmentsBy(filters);
+        if (null != appointments && appointments.size() > 0) {
+            result.put("appointment", 1);
+            result.put("name", appointments.get(0).getPersonName());
+            result.put("consultantId", appointments.get(0).getCreateUser());
+        }
+
+        List<TaCustomer> custs = taCustomerMapper.getSomeCustMayBe(null, filters.get("phone").toString());
+        if (null != custs || custs.size() > 0) {
+            result.put("name", custs.get(0).getCustomerName());
+            result.put("consultantId", custs.get(0).getConsultantId());
+            result.put("consultantName", custs.get(0).getRealtyConsultant());
+            result.put("purpose", custs.get(0).getPurpose());
+        }
+
+        return result;
+    }
+
+    @Override
+    public TaCustomer getSameByPerson(Integer personId) {
+        return taCustomerMapper.getCustomerOf(personId, personId);
+    }
+
+    @Override
+    public boolean updataByCarRecord(TaCustomer taCustomer, TaCarRecord taCarRecord) {
+        boolean needUpate = false;
+
+        if (StringUtils.isEmpty(taCustomer.getPlateNumber())) {
+            needUpate = true;
+            taCustomer.setPlateNumber(taCarRecord.getPlateNumber());
+            taCustomer.setCarModel(taCarRecord.getCarModel());
+        }
+
+        if (needUpate) {
+            return taCustomerMapper.updateById(taCustomer) > 0;
+        }
+
+        return true;
+    }
+
     private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {
         TaCustomer taCustomer = new TaCustomer();
         taCustomer.setCustomerId(taPerson.getRealId());
@@ -197,10 +277,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomer.setCustomerName(taPerson.getName());
         taCustomer.setCreateDate(LocalDateTime.now());
         taCustomer.setStatus(StatusUtils.Normal);
-        int row = taCustomerMapper.insert(taCustomer);
 
-        if (row < 1) {
-            throw new Exception("新增客户信息失败");
+        if (!insertCustomer(taCustomer)) {
+            throw new Exception("新增客户失败");
         }
 
         int mapsNum = taPerson.getPersonId().equals(taPerson.getRealId()) ? 1 : 2;
@@ -209,7 +288,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             TaCustomerMap custMap = new TaCustomerMap();
             custMap.setPersonId(i == 0 ? taPerson.getRealId() : taPerson.getPersonId());
             custMap.setCustomerId(taCustomer.getCustomerId());
-            row = taCustomerMapMapper.insert(custMap);
+            int row = taCustomerMapMapper.insert(custMap);
             if (row < 1) {
                 throw new Exception("新增客户映射信息失败");
             }
@@ -218,7 +297,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         return taCustomer;
     }
 
-    private TaCustomer newCustomerFromMainUsher(TaMainUsherRecord taMainUsherRecord) {
+    private TaCustomer copyDataFromMainUsher(TaMainUsherRecord taMainUsherRecord) {
         TaCustomer taCustomer = new TaCustomer();
         taCustomer.setCustomerId(taMainUsherRecord.getPersonId());       // 默认客户ID与人员ID一致
         taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
@@ -234,10 +313,18 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomer.setStatus(StatusUtils.Normal);
         taCustomer.setCreateDate(LocalDateTime.now());
 
-        int row = taCustomerMapper.insert(taCustomer);
-        if (row < 1) return null;
-
         return taCustomer;
     }
 
+    private boolean insertCustomer(TaCustomer taCustomer) {
+        Integer consultantId = taCustomer.getConsultantId();
+        if (null != consultantId && consultantId.intValue() > 0) {
+            try {
+                notifyConsultant(taCustomer);
+            } catch (Exception e) {}
+        }
+
+        return taCustomerMapper.insert(taCustomer) > 0;
+    }
+
 }

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

@@ -1,5 +1,7 @@
 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -72,7 +74,7 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
 
     @Override
     public void notifyMiniapp(TaFirstUsherRecord taFirstUsherRecord) {
-        Action act = Action.create(Action.TYPE_NEW_FIRST_USHER, taFirstUsherRecord);
+        Action act = Action.create(Action.TYPE_NEW_FIRST_USHER, JSONObject.toJSONString(taFirstUsherRecord, SerializerFeature.WriteMapNullValue));
         try {
             WebSocketServer.sendInfo(act.toJSON(), CommConstant.WECHAT_CLIENT_MINIAPP, null);
         } catch (Exception e) {}

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

@@ -43,7 +43,7 @@ public class TaFirstpageServiceImpl extends ServiceImpl<TaFirstpageMapper, TaFir
 
         // 获取天气
         if (taFirstpage.getWeatherShow()) {
-            res.put("weather",  saWeather.weather(taFirstpage));
+            res.put("weather",  saWeather.weather(taFirstpage.getCity()));
         }
 
         // 获取公告

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

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaCustomerMapper;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
@@ -53,6 +55,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Autowired
     SysUserMapper sysUserMapper;
 
+    @Autowired
+    ITaCustomerService iTaCustomerService;
+
     @Autowired
     MiniApp miniApp;
 
@@ -65,7 +70,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             recs.add(rec.getRecId());
         }
 
-        UpdateWrapper<TaMainUsherRecord> wrapper = new UpdateWrapper();
+        UpdateWrapper<TaMainUsherRecord> wrapper = new UpdateWrapper<>();
         wrapper.set("status", StatusUtils.Normal);
         wrapper.in("rec_id", recs);
 
@@ -74,20 +79,22 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public boolean newRecordByDevice(TaCustomer taCustomer) {
+    public boolean newRecordByDevice(TaCustomer taCustomer, TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
+        taMainUsherRecord.setStatus(StatusUtils.Ready);
+        taMainUsherRecord.setPersonId(taPerson.getRealId());
         int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
 
         try {
-            Action act = Action.create(Action.TYPE_NEW_MAIN_USHER, JSONObject.toJSONString(taMainUsherRecord));
-            WebSocketServer.sendInfo(act.toJSON(), "miniapp", null);
-        } catch (Exception e) {}
+            Action act = Action.create(Action.TYPE_NEW_MAIN_USHER, JSONObject.toJSONString(taMainUsherRecord, SerializerFeature.WriteMapNullValue));
+            WebSocketServer.sendInfo(act.toJSON(), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {e.printStackTrace();}
 
         // 通知对应的置业
         if (null != taCustomer.getConsultantId()) {
             try {
                 notifyConsultant(taMainUsherRecord, taCustomer);
-            } catch (Exception e) {}
+            } catch (Exception e) {e.printStackTrace();}
         }
 
         return row > 0;
@@ -104,13 +111,22 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     private TaMainUsherRecord newRecordByCust(TaCustomer taCustomer) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
+        taMainUsherRecord.setPersonName(taCustomer.getCustomerName());
+        taMainUsherRecord.setAvatar(taCustomer.getAvatar());
+        taMainUsherRecord.setPhone(taCustomer.getPhone());
         taMainUsherRecord.setAppointment(taCustomer.getApointment());
         taMainUsherRecord.setConsultantId(taCustomer.getConsultantId());
         taMainUsherRecord.setChannel(taCustomer.getChannel());
         taMainUsherRecord.setPurpose(taCustomer.getPurpose());
         taMainUsherRecord.setPlateNumber(taCustomer.getPlateNumber());
         taMainUsherRecord.setVisiteDate(LocalDateTime.now());
-        taMainUsherRecord.setStatus(StatusUtils.Normal);
+
+        if (StringUtils.isEmpty(taCustomer.getPhone())) {
+            taMainUsherRecord.setStatus(StatusUtils.Ready);
+        } else {
+            taMainUsherRecord.setStatus(StatusUtils.Normal);
+        }
+
         return taMainUsherRecord;
     }
 
@@ -129,7 +145,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         String openid = taWechatUserMapper.getOpenidOf(proxyConsultant, CommConstant.WECHAT_CLIENT_MINIAPP);
         if (StringUtils.isEmpty(openid)) {
             throw new Exception("置业尚未绑定微信小程序");
-        };
+        }
 
         String visitorName = taMainUsherRecord.getPersonName();
         String phone = taMainUsherRecord.getPhone();
@@ -154,7 +170,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             String rcOpenid = taWechatUserMapper.getOpenidOf(realConsultant, CommConstant.WECHAT_CLIENT_MINIAPP);
             if (StringUtils.isEmpty(openid)) {
                 throw new Exception("置业尚未绑定微信小程序");
-            };
+            }
 
             SysUser usr1 = sysUserMapper.selectById(proxyConsultant);
             List<Object> dt1 = new ArrayList<Object>(){{
@@ -183,4 +199,108 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         response.addSuccess(result);
         return response;
     }
+
+    @Override
+    public boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
+        Integer consultantId = taMainUsherRecord.getConsultantId();
+        if (null == consultantId || consultantId < 1) {
+            throw new Exception("置业顾问不能为空");
+        }
+
+        if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
+            throw new Exception("客户电话不能为空");
+        }
+
+        taMainUsherRecord.setStatus(StatusUtils.Normal);
+
+        // 新增客户
+        iTaCustomerService.newCustByMainUsher(taMainUsherRecord);
+
+        return taMainUsherRecordMapper.insert(taMainUsherRecord) > 0;
+    }
+
+    @Override
+    public boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
+        Integer consultantId = taMainUsherRecord.getConsultantId();
+        if (null == consultantId || consultantId < 1) {
+            throw new Exception("置业顾问不能为空");
+        }
+
+        if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
+            throw new Exception("客户电话不能为空");
+        }
+
+        taMainUsherRecord.setStatus(StatusUtils.Normal);
+
+        int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
+
+        // 是否更新了置业
+        TaCustomer taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+        Integer originConsultant = taCustomer.getConsultantId();
+
+        // 是否需要更新客户信息
+        if (StringUtils.isEmpty(taCustomer.getCustomerName()) || StringUtils.isEmpty(taCustomer.getPhone())) {
+            if (StringUtils.isEmpty(taCustomer.getCustomerName())) {
+                taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
+            }
+
+            if (StringUtils.isEmpty(taCustomer.getPhone())) {
+                taCustomer.setPhone(taMainUsherRecord.getPhone());
+            }
+
+            iTaCustomerService.updateById(taCustomer);
+        }
+
+        // 如果原来置业为空
+        if (null == originConsultant || originConsultant < 1) {
+            iTaCustomerService.updateConsultant(taCustomer, consultantId);
+        } else if (!consultantId.equals(originConsultant)) {
+            // 如果临时替换跟踪置业
+            // 那么需要给原始置业, 以及临时置业各自发一条消息
+            String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + String.valueOf(taCustomer.getCustomerId());
+            String tplId = miniApp.getTpls().getVisitor();
+
+            // 原绑定置业
+            String rcOpenid = taWechatUserMapper.getOpenidOf(originConsultant, CommConstant.WECHAT_CLIENT_MINIAPP);
+            if (StringUtils.isEmpty(rcOpenid)) {
+                throw new Exception("置业尚未绑定微信小程序");
+            }
+            SysUser rcUser = sysUserMapper.selectById(originConsultant);
+
+            // 临时置业
+            String proxyOpenid = taWechatUserMapper.getOpenidOf(consultantId, CommConstant.WECHAT_CLIENT_MINIAPP);
+            if (StringUtils.isEmpty(proxyOpenid)) {
+                throw new Exception("置业尚未绑定微信小程序");
+            }
+            SysUser proxyUser = sysUserMapper.selectById(consultantId);
+
+            // 通知原置业, 客户被临时置业接待
+            List<Object> dt1 = new ArrayList<Object>(){{
+                add(taCustomer.getCustomerName());
+                add(taCustomer.getPhone());
+                add("您有新客户来访, 已被安排给 " + proxyUser.getUsername() + " 接待!");
+            }};
+            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
+
+            // 通知临时置业
+            List<Object> dt2 = new ArrayList<Object>(){{
+                add(taCustomer.getCustomerName());
+                add(taCustomer.getPhone());
+                add(rcUser.getUsername() + " 有新客户来访, 请协助接待一下!");
+            }};
+            miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
+        }
+
+        return row > 0;
+    }
+
+    @Override
+    public boolean deleteRecord(Integer id) {
+        UpdateWrapper<TaMainUsherRecord> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", StatusUtils.Delete);
+        updateWrapper.eq("rec_id", id);
+        int row = taMainUsherRecordMapper.update(new TaMainUsherRecord(), updateWrapper);
+
+        return row > 0;
+    }
 }

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

@@ -18,7 +18,7 @@ public class TaMessageRecordImpl extends ServiceImpl<TaMessageRecordMapper, TaMe
     TaMessageRecordMapper taMessageRecordMapper;
 
     @Override
-    public boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data) {
+    public boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data, boolean save) {
         String content = JSONObject.toJSONString(data);
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime twoHourAgo = now.minusHours(2);
@@ -26,13 +26,15 @@ public class TaMessageRecordImpl extends ServiceImpl<TaMessageRecordMapper, TaMe
         List<TaMessageRecord> lastMessages = taMessageRecordMapper.getLastSameMessages(toUser, page, content, twoHourAgo);
         if (null != lastMessages && lastMessages.size() > 0) return false;
 
-        TaMessageRecord record = new TaMessageRecord();
-        record.setReceiver(toUser);
-        record.setTplId(tplId);
-        record.setLink(page);
-        record.setContent(content);
-        record.setCreateDate(now);
-        taMessageRecordMapper.insert(record);
+        if (save) {
+            TaMessageRecord record = new TaMessageRecord();
+            record.setReceiver(toUser);
+            record.setTplId(tplId);
+            record.setLink(page);
+            record.setContent(content);
+            record.setCreateDate(now);
+            taMessageRecordMapper.insert(record);
+        }
 
         return true;
     }

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

@@ -8,13 +8,19 @@ import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaMiniFormidsMapper;
 import com.huiju.welcome.model.TaMiniFormids;
 import com.huiju.welcome.service.ITaMiniFormidsService;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 
 @Service
+@Slf4j
 public class TaMiniFormidsImpl extends ServiceImpl<TaMiniFormidsMapper, TaMiniFormids> implements ITaMiniFormidsService {
+//    Logger log = LoggerFactory.getLogger(TaMiniFormidsImpl.class);
 
     @Autowired
     TaMiniFormidsMapper taMiniFormidsMapper;
@@ -24,10 +30,13 @@ public class TaMiniFormidsImpl extends ServiceImpl<TaMiniFormidsMapper, TaMiniFo
         JSONObject params = JSONObject.parseObject(paramsStr);
         JSONArray formids = params.getJSONArray("formids");
 
-        for (Object formid: formids) {
+        for (Object id: formids) {
+            String formid = id.toString();
+            if ("the formId is a mock one".equals(formid)) continue;
+
             TaMiniFormids taMiniFormids = new TaMiniFormids();
             taMiniFormids.setOpenid(openid);
-            taMiniFormids.setFormid(formid.toString());
+            taMiniFormids.setFormid(formid);
             taMiniFormids.setCreateDate(LocalDateTime.now());
             taMiniFormidsMapper.insert(taMiniFormids);
         }
@@ -38,6 +47,11 @@ public class TaMiniFormidsImpl extends ServiceImpl<TaMiniFormidsMapper, TaMiniFo
     @Override
     public String getFormidBy(String openid, boolean... delete) {
         TaMiniFormids taMiniFormids = taMiniFormidsMapper.getFormidCanUse(openid);
+        if (null == taMiniFormids) {
+            log.error("没有找对 openid [{}] 发送消息需要的 formid", openid);
+            return null;
+        }
+
 
         if (null != delete && delete.length > 0 && delete[0]) {
             QueryWrapper<TaMiniFormids> wrapper = new QueryWrapper<>();

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

@@ -10,11 +10,13 @@ import com.huiju.welcome.mapper.TaDeviceMapper;
 import com.huiju.welcome.mapper.TaPersonMapper;
 import com.huiju.welcome.mapper.TaPersonTypeMapper;
 import com.huiju.welcome.model.*;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaOperationLogService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaVisitingLogService;
 import com.huiju.welcome.utils.LogBuilder;
 import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     private ITaOperationLogService taOperationLogService;
+
+    @Autowired
+    private ICameraService iCameraService;
     
     @Value("${huiju.files}")
     private String huijuFiles;
@@ -74,6 +79,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
             QueryWrapper<TaDevice> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", StatusUtils.Normal);
+            queryWrapper.eq("afr", StatusUtils.BoolTrue);
             taDeviceList = taDeviceMapper.selectList(queryWrapper);
         } else {
             taDeviceList = Arrays.asList(dev);
@@ -244,6 +250,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Override
     public TaPerson newPersonByFront(TaCustomer taCustomer) {
         TaPerson taPerson = new TaPerson();
+        taPerson.setAvatar(taCustomer.getAvatar());
         taPerson.setPhone(taCustomer.getPhone());
         taPerson.setName(taCustomer.getCustomerName());
         taPerson.setStatus(StatusUtils.Normal);
@@ -257,6 +264,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         taPerson.setRealId(taPerson.getPersonId());
         taPersonMapper.updateById(taPerson);
 
+        // 下发人脸到各设备
+        iCameraService.dispatchPerson(taPerson);
+
         return taPerson;
     }
 
@@ -279,6 +289,37 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPerson;
     }
 
+    @Override
+    public boolean updateByCustomer(TaCustomer taCustomer) {
+        if (StringUtils.isEmpty(taCustomer.getPhone())) return true;
+
+        // 默认客户与人员ID是一致的
+        UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("phone", taCustomer.getPhone());
+        updateWrapper.set("name", taCustomer.getCustomerName());
+        updateWrapper.eq("real_id", taCustomer.getCustomerId()).or().eq("person_id", taCustomer.getCustomerId());
+
+        int row = taPersonMapper.update(new TaPerson(), updateWrapper);
+        return row > 0;
+    }
+
+    /**
+     * 加入白名单， 实际上置为工作人员
+     * @param personId
+     * @return
+     */
+    @Override
+    public boolean setPersonIntoWhitelist(Integer personId) {
+
+        UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("type_id", 3);
+        updateWrapper.eq("person_id", personId);
+
+        int row = taPersonMapper.update(new TaPerson(), updateWrapper);
+
+        return row > 0;
+    }
+
     private String getTypeName(TaPerson taPerson) {
         TaPersonType taPersonType = taPersonTypeMapper.selectById(taPerson.getTypeId());
         return null == taPersonType ? null : taPersonType.getTypeName();

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,43 +52,14 @@ public class TaVisitingLogServiceImpl extends ServiceImpl<TaVisitingLogMapper, T
     public ResponseBean getTimeline() {
         LocalDateTime now = LocalDateTime.now();
 
-        // 十分钟内
-        LocalDateTime tenMini = now.minusMinutes(10);
-        QueryWrapper<TaVisitingLog> query1 = new QueryWrapper<>();
-        query1.ge("visite_date", tenMini);
-        query1.orderByDesc("visite_date");
-        List<TaVisitingLog> tenMiniList = taVisitingLogMapper.selectList(query1);
-
-        // 半小时内
-        LocalDateTime halfHour = now.minusMinutes(30);
-        QueryWrapper<TaVisitingLog> query2 = new QueryWrapper<>();
-        query2.le("visite_date", tenMini);
-        query2.ge("visite_date", halfHour);
-        query2.orderByDesc("visite_date");
-        List<TaVisitingLog> halfHourList = taVisitingLogMapper.selectList(query2);
-
-        // 一小时内
-        LocalDateTime oneHour = now.minusHours(1);
-        QueryWrapper<TaVisitingLog> query3 = new QueryWrapper<>();
-        query3.le("visite_date", halfHour);
-        query3.ge("visite_date", oneHour);
-        query3.orderByDesc("visite_date");
-        List<TaVisitingLog> oneHourList = taVisitingLogMapper.selectList(query3);
-
         // 四小时内
         LocalDateTime fourHour = now.minusHours(4);
         QueryWrapper<TaVisitingLog> query4 = new QueryWrapper<>();
-        query4.le("visite_date", oneHour);
         query4.ge("visite_date", fourHour);
+        query4.groupBy("real_person");
         query4.orderByDesc("visite_date");
         List<TaVisitingLog> fourHourList = taVisitingLogMapper.selectList(query4);
 
-        Map<String, Object> result = new HashMap<>();
-        result.put("tenMini", tenMiniList);
-        result.put("halfHour", halfHourList);
-        result.put("oneHour", oneHourList);
-        result.put("fourHour", fourHourList);
-
-        return ResponseBean.success(result);
+        return ResponseBean.success(fourHourList);
     }
 }

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

@@ -8,6 +8,7 @@ import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
 import com.huiju.welcome.utils.DateUtils;
+import com.huiju.welcome.utils.StatusUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -43,7 +45,27 @@ public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppoin
 
         return ResponseBean.success("");
     }
-    
+
+    @Override
+    public List<TaVisitorAppointment> getAppointmentsBy(Map<String, Object> filters) {
+        QueryWrapper<TaVisitorAppointment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", filters.get("phone"));
+        queryWrapper.eq("status", StatusUtils.Normal);
+        queryWrapper.orderByDesc("create_date");
+
+        return taVisitorAppointmentMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<TaVisitorAppointment> getAppointmentsByPlateNumber(String plateNumber) {
+        QueryWrapper<TaVisitorAppointment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("plat_number", plateNumber);
+        queryWrapper.eq("status", StatusUtils.Normal);
+        queryWrapper.orderByDesc("create_date");
+
+        return taVisitorAppointmentMapper.selectList(queryWrapper);
+    }
+
     @Override
     public ResponseBean visitorAppointmentList(IPage pg, String platNumber, String personName,String phone) {
        ResponseBean responseBean= new ResponseBean();

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

@@ -0,0 +1,121 @@
+package com.huiju.welcome.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.huiju.welcome.config.AliProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(AliProperties.class)
+public class AliFaceUtils {
+
+    public final static String ACT_ADD_FACE = "AddFace";
+    public final static String ACT_RECOGNIZE_FACE = "RecognizeFace";
+
+    DefaultProfile profile;
+    DefaultAcsClient client;
+
+    @Autowired
+    public AliFaceUtils(AliProperties p) {
+        profile = DefaultProfile.getProfile(AliProperties.face.getRegionId(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
+        client = new DefaultAcsClient(profile);
+    }
+
+    /**
+     * 添加人脸
+     * @param personId
+     * @param name
+     * @param url
+     * @param datas
+     * @throws Exception
+     */
+    public void addFace(Integer personId, String name, String url, String ...datas) throws Exception {
+        log.info("阿里人脸比对, 请求上传人脸: {}[{}] {}", name, personId, url);
+
+        if (null == url && null == datas) {
+            throw new Exception("图片地址 或者 Base64 数据必填一个");
+        }
+
+        CommonRequest request = generalRequest(ACT_ADD_FACE);
+        request.putBodyParameter("Person", name);
+        request.putBodyParameter("Image", personId);
+
+        if (null == datas || datas.length < 1) {
+            request.putBodyParameter("ImageUrl", url);
+        } else {
+            request.putBodyParameter("Content", datas[0]);
+        }
+
+        excuteRequest(request);
+    }
+
+    /**
+     * 人脸库比对
+     * @param url
+     * @param datas
+     * @throws Exception
+     */
+    public JSONObject recognizeFace(String url, String ...datas) throws Exception {
+        log.info("阿里人脸比对, 请求比对人脸: {}", url);
+
+        if (null == url && null == datas) {
+            throw new Exception("图片地址 或者 Base64 数据必填一个");
+        }
+
+        CommonRequest request = generalRequest(ACT_RECOGNIZE_FACE);
+
+        if (null == datas || datas.length < 1) {
+            request.putBodyParameter("ImageUrl", url);
+        } else {
+            request.putBodyParameter("Content", datas[0]);
+        }
+
+        return excuteRequest(request);
+    }
+
+    private JSONObject excuteRequest(CommonRequest request) throws Exception {
+        CommonResponse response = client.getCommonResponse(request);
+        if (response.getHttpStatus() == HttpStatus.SC_OK) {
+            try {
+                JSONObject result = JSONObject.parseObject(response.getData());
+
+                Boolean success = result.getBoolean("Success");
+                if (null == success || !success) {
+                    String error = "校验阿里人脸比对接口返回出错: " + result.getString("Message");
+                    log.error(error);
+                    throw new Exception(error);
+                }
+
+                return result;
+            } catch (Exception e) {
+                String error = "校验阿里人脸比对接口出错: " + e.getMessage();
+                log.error(error);
+                e.printStackTrace();
+                throw new Exception(error);
+            }
+        } else {
+            String error = "网络请求上传比对人脸失败, 错误码: {}" + response.getHttpStatus();
+            log.error(error);
+            throw new Exception(error);
+        }
+    }
+
+    private CommonRequest generalRequest(String action) {
+        CommonRequest request = new CommonRequest();
+        request.setMethod(MethodType.POST);
+        request.setDomain(AliProperties.face.getDomain());
+        request.setVersion(AliProperties.face.getVersion());
+        request.setAction(action);
+        request.putBodyParameter("Group", AliProperties.face.getGroup());
+        return request;
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.huiju.welcome.utils;
 
 import com.aliyun.oss.OSSClient;
-import com.huiju.welcome.config.AliOSSProperties;
+import com.huiju.welcome.config.AliProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.MultipartFile;
@@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 
 @Configuration
-@EnableConfigurationProperties(AliOSSProperties.class)
+@EnableConfigurationProperties(AliProperties.class)
 public class AliOSSUtils {
 
     /**
@@ -46,13 +46,13 @@ public class AliOSSUtils {
     }
 
     private static String putFile(String fname, InputStream input) {
-        OSSClient ossClient = new OSSClient(AliOSSProperties.oss.getEndpoint(), AliOSSProperties.accessKeyId, AliOSSProperties.accessKeySecret);
-        ossClient.putObject(AliOSSProperties.oss.getBucketName(), fname, input);
+        OSSClient ossClient = new OSSClient(AliProperties.oss.getEndpoint(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
+        ossClient.putObject(AliProperties.oss.getBucketName(), fname, input);
         ossClient.shutdown();
 
         // String url = ossClient.generatePresignedUrl(AliOSSUtils.oss.getBucketName(), fname, expiration).toString();
 
-        String preURL = AliOSSProperties.oss.getBucketURL();
+        String preURL = AliProperties.oss.getBucketURL();
         if (!preURL.endsWith("/")) {
             preURL += "/";
         }

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

@@ -5,7 +5,7 @@ public class CommConstant {
     public final static String IDENTITY_FIRSTUSHER = "first-usher";
     public final static String IDENTITY_MAINUSHER = "main-usher";
 
-    public final static String PAGE_MY_CUSTOMER = "";
+    public final static String PAGE_MY_CUSTOMER = "pages/client/myclient/myclient";
 
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
 }

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

@@ -44,7 +44,7 @@ public class MiniApp {
 
 
     public ResponseBean getOpenid(String code) {
-        String api = url + "/" + appid + "/login?code=" + code;
+        String api = url + "/api/miniapp/" + appid + "/login?code=" + code;
         RestTemplate restTemplate = new RestTemplate();
         String resp = restTemplate.exchange(api,HttpMethod.resolve("GET"), new HttpEntity<String>(null, null),String.class).getBody();
 
@@ -60,10 +60,14 @@ public class MiniApp {
     }
 
     public ResponseBean sendTPLMessage(String tplId, String toUser, String page, List<Object> data) {
-        boolean needSend = iTaMessageRecordService.saveMessageOrNot(toUser, tplId, page, data);
+        boolean needSend = iTaMessageRecordService.saveMessageOrNot(toUser, tplId, page, data, false);
         if (!needSend) return ResponseBean.success("");
 
         String formId = iTaMiniFormidsService.getFormidBy(toUser, true);
+        if (null == formId) {
+            return ResponseBean.error("发送模板消息失败, 没有可用的 formid ", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
         String api = String.format("/api/%s/tpl/%s/form/%s/to/%s", appid, tplId, formId, toUser);
 
         HttpHeaders headers = new HttpHeaders();
@@ -74,7 +78,12 @@ public class MiniApp {
 
         RestTemplate restTemplate = new RestTemplate();
         HttpEntity<Map<String, Object>> request = new HttpEntity<Map<String, Object>>(sendData, headers);
-        String resp = restTemplate.postForEntity(url, request, String.class).getBody();
+        String resp ="";
+        try{
+            resp = restTemplate.postForEntity(url+api, request, String.class).getBody();
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
 
         JSONObject result = JSONObject.parseObject(resp);
         Integer respCode = result.getInteger("code");
@@ -84,6 +93,8 @@ public class MiniApp {
             return ResponseBean.error("调用小程序接口失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
 
+        iTaMessageRecordService.saveMessageOrNot(toUser, tplId, page, data, true);
+
         return ResponseBean.success("");
     }
 

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

@@ -1,6 +1,5 @@
 package com.huiju.welcome.utils;
 
-import com.huiju.welcome.model.TaFirstpage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -43,10 +42,10 @@ public class SAWeather {
     @Value("${saweather.needMoreDay}")
     private String needMoreDay;
 
-    public String weather(TaFirstpage taFirstpage) {
+    public String weather(String town) {
         List<String> params = new ArrayList<>();
         // WeatherName 为空时 显示默认
-        String temporaryCity = org.springframework.util.StringUtils.isEmpty(taFirstpage.getWeatherName()) ? city:taFirstpage.getWeatherName();
+        String temporaryCity = StringUtils.isEmpty(town) ? city: town;
         params.add("area=" + temporaryCity);
         params.add("needIndex=" + needIndex);
         params.add("need3HourForcast=" + need3HourForcast);

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

@@ -8,4 +8,7 @@ public class StatusUtils {
 
     public static final int Offline = 0;
     public static final int Online = 1;
+
+    public static final int BoolFalse = 0;
+    public static final int BoolTrue = 1;
 }

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

@@ -0,0 +1,102 @@
+package com.huiju.welcome.utils;
+
+import com.huiju.welcome.config.TencentProperties;
+import com.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.common.exception.TencentCloudSDKException;
+import com.tencentcloudapi.iai.v20180301.IaiClient;
+import com.tencentcloudapi.iai.v20180301.models.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(TencentProperties.class)
+public class TencentFaceUtils {
+    TencentProperties properties;
+    Credential cred;
+
+    @Autowired
+    public TencentFaceUtils(TencentProperties properties) {
+        this.properties = properties;
+        this.cred = new Credential(properties.getSecretId(), properties.getSecretKey());
+    }
+
+    public GetPersonBaseInfoResponse getPersonBaseInfo(String personId) throws TencentCloudSDKException {
+        GetPersonBaseInfoRequest request = new GetPersonBaseInfoRequest();
+        request.setPersonId(personId);
+
+        IaiClient client = new IaiClient(this.cred, this.properties.getIai().getRegion());
+        return client.GetPersonBaseInfo(request);
+    }
+
+    public void createPerson(String personId, String personName, String url, String ...images) throws TencentCloudSDKException {
+        // 已经存在的人员, 不重复创建
+        try {
+            getPersonBaseInfo(personId);
+            return;
+        } catch (TencentCloudSDKException e) {
+            if (e.toString().indexOf("InvalidParameterValue.PersonIdNotExist") == -1) {
+                throw e;
+            }
+        }
+
+        CreatePersonRequest request = new CreatePersonRequest();
+        request.setGroupId(this.properties.getIai().getGroup());
+        request.setPersonId(personId);
+        request.setPersonName(personName);
+        if (null != url && !"".equals(url)) {
+            request.setUrl(url);
+        } else if (null != images && images.length > 0) {
+            request.setImage(images[0]);
+        }
+
+        IaiClient client = new IaiClient(this.cred, this.properties.getIai().getRegion());
+        client.CreatePerson(request);
+    }
+
+    public void createFace(String personId, String url, String ...images) throws TencentCloudSDKException {
+        // 因为目前腾讯接口没有办法获取确切的错误码, 所以先尝试着去新增人员
+        // https://github.com/TencentCloud/tencentcloud-sdk-java/issues/22
+
+        try {
+            createPerson(personId, personId, url);
+        } catch (TencentCloudSDKException e) {
+            log.error(e.toString());
+        }
+
+        CreateFaceRequest request = new CreateFaceRequest();
+        request.setPersonId(personId);
+        if (null != url && !"".equals(url)) {
+            request.setUrls(new String[]{ url });
+        } else if (null != images && images.length > 0) {
+            request.setImages(images);
+        } else {
+            throw new TencentCloudSDKException("必须设置人脸图片");
+        }
+
+        IaiClient client = new IaiClient(this.cred, this.properties.getIai().getRegion());
+        client.CreateFace(request);
+    }
+
+    public Candidate searchFace(String url, String ...images) throws TencentCloudSDKException {
+        SearchFacesRequest request = new SearchFacesRequest();
+        request.setGroupIds(new String[]{ this.properties.getIai().getGroup() });
+        if (null != url && !"".equals(url)) {
+            request.setUrl(url);
+        } else if (null != images && images.length > 0) {
+            request.setImage(images[0]);
+        } else {
+            throw new TencentCloudSDKException("必须设置人脸图片");
+        }
+
+        IaiClient client = new IaiClient(this.cred, this.properties.getIai().getRegion());
+        SearchFacesResponse response = client.SearchFaces(request);
+        Result[] results = response.getResults();
+        if (null == results || results.length < 1) return null;
+
+        Candidate[] candidates = results[0].getCandidates();
+        return candidates[0];
+    }
+}

src/main/resources/application.yml

@@ -42,7 +42,7 @@ saweather:
 
 # 小程序服务
 miniapp:
-  url: http://47.101.36.130:8001/api/miniapp
+  url: http://miniapp.ycjcjy.com
   appid: wx3f26e5f48c72d39f
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
   tpls:
@@ -50,10 +50,23 @@ miniapp:
 
 # ali-cloud
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  # accessKeyId: LTAIkc75dpkJw8Lb
+  # accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAIqDWVYleuHNqb
+  accessKeySecret: DCAtxoMKQxS3HmrHCbQUs7LaaTR6lB
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+  face:
+    regionId: cn-shanghai
+    domain: face.cn-shanghai.aliyuncs.com
+    version: 2018-12-03
+    group: default
 
+tencent:
+  secretId: AKIDjFV4MN5aHp78sMObJ9i01lmWt2uokw6z
+  secretKey: oKhohKlwsSowqa5KM8drpX1FCtLfmhMq
+  iai:
+    region: ap-shanghai
+    group: default

src/main/resources/mapper/TaCustomerMapper.xml

@@ -42,7 +42,10 @@
         FROM
             ta_customer t
         WHERE
+	      (
             t.plate_number = #{plateNumber}
+            OR t.phone = #{phone}
+          )
         AND IFNULL(t.customer_name, '') != ''
         AND t.`status` = 1
     </select>

target/classes/application.yml

@@ -42,7 +42,7 @@ saweather:
 
 # 小程序服务
 miniapp:
-  url: http://47.101.36.130:8001/api/miniapp
+  url: http://miniapp.ycjcjy.com
   appid: wx3f26e5f48c72d39f
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
   tpls:
@@ -50,10 +50,23 @@ miniapp:
 
 # ali-cloud
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  # accessKeyId: LTAIkc75dpkJw8Lb
+  # accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAIqDWVYleuHNqb
+  accessKeySecret: DCAtxoMKQxS3HmrHCbQUs7LaaTR6lB
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
     bucketName: estateagents
     bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+  face:
+    regionId: cn-shanghai
+    domain: face.cn-shanghai.aliyuncs.com
+    version: 2018-12-03
+    group: default
 
+tencent:
+  secretId: AKIDjFV4MN5aHp78sMObJ9i01lmWt2uokw6z
+  secretKey: oKhohKlwsSowqa5KM8drpX1FCtLfmhMq
+  iai:
+    region: ap-shanghai
+    group: default