bug fix

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

@@ -8,6 +8,7 @@ import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.AliFaceUtils;
 import com.huiju.welcome.utils.AliOSSUtils;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.XFYun;
@@ -58,6 +59,9 @@ public class CameraController {
 	@Autowired
 	private ICameraService cameraService;
 
+	@Autowired
+	private AliFaceUtils aliFaceUtils;
+
 	@GetMapping("/ping")
 	public String ping() {
 		return "pong";
@@ -93,7 +97,7 @@ public class CameraController {
 
 	@PostMapping("/camera/{deviceId}/face")
 	public ResponseBean face(
-			@PathParam("deviceId") String deviceId,
+			@PathVariable("deviceId") String deviceId,
 			@RequestParam(value = "avatar", required = false) MultipartFile avatar,
 			@RequestParam(value = "score", defaultValue = "0") Integer score
 	) {
@@ -111,10 +115,34 @@ public class CameraController {
 			return ResponseBean.success("");
 		}
 
+		TaSnapshotPerson taSnapshotPerson = new TaSnapshotPerson();
+
 		// 人脸比对检索
-		// todo
+		JSONObject result = null;
+		try {
+			result = aliFaceUtils.searchFace(avatarURL);
+		} catch (Exception e) {
+			log.error("比对人脸失败: {}", e.getMessage());
+			e.printStackTrace();
+			return ResponseBean.error("比对人脸失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+		}
+
+		if (null != result) {
+			Float rate = result.getFloat("rate");
+			if (null == rate) {
+				log.error("比对人脸异常, 比对阈值结果为空");
+				rate = 0.0f;
+			} else {
+				rate *= 100;
+			}
+			Integer matchPerson = result.getInteger("personId");
+
+			taSnapshotPerson.setSimilarity(rate);
+			taSnapshotPerson.setMatchPerson(matchPerson);
+		} else {
+			taSnapshotPerson.setSimilarity(0f);
+		}
 
-		TaSnapshotPerson taSnapshotPerson = new TaSnapshotPerson();
 		taSnapshotPerson.setCreateDate(LocalDateTime.now());
 		taSnapshotPerson.setStatus(StatusUtils.Normal);
 		taSnapshotPerson.setAvatar(avatarURL);
@@ -127,7 +155,7 @@ public class CameraController {
 
 	@PostMapping(value = "/camera/{deviceId}/car")
 	public ResponseBean car(
-			@PathParam("deviceId") String deviceId,
+			@PathVariable("deviceId") String deviceId,
 			@RequestParam("sceneImage") MultipartFile carImage,
 			@RequestParam("licenseImage") MultipartFile licenseImage,
 			@RequestParam(value = "driverImage", required = false) MultipartFile driverImage,
@@ -141,6 +169,7 @@ public class CameraController {
 		taCarRecord.setPlateNumber(plateNumber);
 		taCarRecord.setColor(color);
 		taCarRecord.setCarModel(carModel);
+		taCarRecord.setCreateDate(LocalDateTime.now());
 
 		if (null != carImage && !carImage.isEmpty()) {
 			taCarRecord.setCarImage(getMultipartFile(carImage));

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

@@ -0,0 +1,41 @@
+package com.huiju.welcome.controller;
+
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.service.ITaCarService;
+import com.huiju.welcome.utils.CommConstant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaCarController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCarController.class);
+
+    @Autowired
+    public ITaCarService iTaCarService;
+
+    @PutMapping("/car/whitelist/{id}")
+    public ResponseBean addWhiteList(@PathVariable String id) {
+        iTaCarService.setCarType(id, CommConstant.TYPE_CAR_INNER);
+        return ResponseBean.success("");
+    }
+
+    @DeleteMapping("/car/whitelist/{id}")
+    public ResponseBean deleteWhiteList(@PathVariable String id) {
+        iTaCarService.setCarType(id, CommConstant.TYPE_CAR_NORMAL);
+        return ResponseBean.success("");
+    }
+
+}

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

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -135,4 +136,10 @@ public class TaCarRecordController extends BaseController {
         responseBean.addSuccess(pageList);
         return responseBean;
     }
+
+    @RequestMapping("/miniapp/carRecord/timeline")
+    public ResponseBean timeline() {
+        List<TaCarRecord> result = iTaCarRecordService.getTimeline();
+        return ResponseBean.success(result);
+    }
 }

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

@@ -145,4 +145,14 @@ public class TaVisitorAppointmentController extends BaseController {
         return result;
     }
 
+    @ApiOperation(value = "访客预约信息",notes = "访客预约信息")
+    @RequestMapping(value="/miniapp/appointment",method= RequestMethod.GET)
+    public ResponseBean myAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
+                                          @RequestParam(defaultValue = "10") int pageSize,
+                                          HttpServletRequest request) {
+        TaWechatUser user = iTaWechatUserService.getById(Integer.valueOf(JWTUtils.getSubject(request)));
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentService.getMyAppointmentList(pageNum, pageSize, user.getPersonId());
+        return ResponseBean.success(result);
+    }
+
 }

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

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

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

@@ -0,0 +1,45 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_car")
+public class TaCar implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "plate_number", type = IdType.INPUT)
+    private String plateNumber;
+
+    private String color;
+
+    private String carModel;
+
+    private String carImage;
+
+    private String typeId;
+
+    @TableField("`status`")
+    private Integer status;
+
+    private LocalDateTime createDate;
+}

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

@@ -61,4 +61,9 @@ public class TaCarRecord implements Serializable {
     @TableField(exist = false)
     private String phone;
 
+    /**
+     * 预约人数
+     */
+    @TableField(exist = false)
+    private Integer personNum;
 }

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

@@ -20,4 +20,8 @@ public interface ISysParamService extends IService<SysParam> {
     Float getFaceMinScore();
 
     Float getDispatchTimeLimit();
+
+    Float getTplMessageInterval();
+
+    Float getCustomerVisitInterval();
 }

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

@@ -7,6 +7,7 @@ import com.huiju.welcome.model.TaCarRecord;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +33,6 @@ public interface ITaCarRecordService extends IService<TaCarRecord> {
     boolean newRecordByDevice(TaCarRecord taCarRecord);
 
     boolean updateRecordByMiniapp(TaCarRecord taCarRecord);
+
+    List<TaCarRecord> getTimeline();
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaCar;
+import com.huiju.welcome.model.TaCarRecord;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+public interface ITaCarService extends IService<TaCar> {
+    TaCar newCarByDevice(TaCarRecord taCarRecord);
+
+    boolean setCarType(String id, String typeId);
+}

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

@@ -23,7 +23,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     void notifyConsultant(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception;
 
-    boolean newRecordByDevice(TaCustomer taCustomer, TaPerson taPerson);
+    boolean newRecordByDeviceDeprecated(TaCustomer taCustomer, TaPerson taPerson);
 
     boolean newRecordByConsultant(TaCustomer taCustomer);
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment);
@@ -39,4 +39,6 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
 
     boolean deleteRecord(Integer id);
+
+    boolean newRecordByDevice(TaPerson taPerson, TaCustomer taCustomer);
 }

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

@@ -57,4 +57,8 @@ public interface ITaPersonService extends IService<TaPerson> {
     TaPerson newPersonByDevice(TaSnapshotPerson taSnapshotPerson);
 
     boolean send2Front(TaPerson taPerson);
+
+    boolean updateByMainUsher(TaMainUsherRecord taMainUsherRecord);
+
+    TaPerson getByIdOrReal(Integer personId);
 }

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

@@ -30,4 +30,6 @@ public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointm
     List<TaVisitorAppointment> getAppointmentsBy(Map<String,Object> filters);
 
     List<TaVisitorAppointment> getAppointmentsByPlateNumber(String plateNumber);
+
+    IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId);
 }

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

@@ -7,9 +7,7 @@ import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
 import com.huiju.welcome.service.*;
-import com.huiju.welcome.utils.Encrypt;
-import com.huiju.welcome.utils.StatusUtils;
-import com.huiju.welcome.utils.TencentFaceUtils;
+import com.huiju.welcome.utils.*;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +31,9 @@ public class CameraServiceImpl implements ICameraService {
     @Autowired
     TencentFaceUtils tencentFaceUtils;
 
+    @Autowired
+    AliFaceUtils aliFaceUtils;
+
     @Autowired
     ISysParamService iSysParamService;
 
@@ -50,38 +51,45 @@ public class CameraServiceImpl implements ICameraService {
 
     @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);
-        }
-
-        //分发人脸到各个相机
-        for(TaDevice device: taDeviceList) {
-            try {
-                Map<String, Object> payload = new HashMap<>();
-                payload.put("personId", taPerson.getPersonId());
-                payload.put("image", taPerson.getAvatar());
-
-                Action act = Action.create(Action.TYPE_DISPATCH_FACE, payload);
-
-                WebSocketServer.sendInfo(act.toJSON(), "device", device.getDeviceId());
-            } catch (Exception e){
-                e.printStackTrace();
-                return "连接设备(" + device.getDeviceId() + ")人脸下发服务 失败: "+ e.getMessage();
-            }
-        }
+//        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);
+//        }
+//
+//        //分发人脸到各个相机
+//        for(TaDevice device: taDeviceList) {
+//            try {
+//                Map<String, Object> payload = new HashMap<>();
+//                payload.put("personId", taPerson.getPersonId());
+//                payload.put("image", taPerson.getAvatar());
+//
+//                Action act = Action.create(Action.TYPE_DISPATCH_FACE, payload);
+//
+//                WebSocketServer.sendInfo(act.toJSON(), "device", device.getDeviceId());
+//            } catch (Exception e){
+//                e.printStackTrace();
+//                return "连接设备(" + device.getDeviceId() + ")人脸下发服务 失败: "+ e.getMessage();
+//            }
+//        }
+//
+//        // 下发到腾讯云人脸识别
+//        try {
+//            tencentFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
+//        } catch (TencentCloudSDKException e) {
+//            e.printStackTrace();
+//            log.error("下发人脸到腾讯云失败: " + e.getMessage());
+//        }
 
-        // 下发到腾讯云人脸识别
         try {
-            tencentFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
-        } catch (TencentCloudSDKException e) {
+            aliFaceUtils.createFace(String.valueOf(taPerson.getRealId()), taPerson.getAvatar());
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("下发人脸到腾讯云失败: " + e.getMessage());
+            log.error("下发人脸到阿里云失败: " + e.getMessage());
         }
 
         return "";
@@ -104,11 +112,22 @@ public class CameraServiceImpl implements ICameraService {
 
         // 识别结果
         boolean newGuy = null == similarity || similarity < (samePersonThreshold / 100);
-
         TaPerson taPerson = null;
+
         if (!newGuy) {
             taPerson = taPersonService.getById(taSnapshotPerson.getMatchPerson());
+            if (null == taPerson) {
+                // 出现这种情况, 说明阿里云的人脸库与本地不一致。
+                newGuy = true;
+            }
 
+            // 如果是工作人员则忽略
+            if (null != taPerson && null != taPerson.getTypeId() && taPerson.getTypeId() == CommConstant.TYPE_INNER_PERSON) {
+                return true;
+            }
+        }
+
+        if (!newGuy) {
             // 抓拍人与比对人是同一个人
             taSnapshotPerson.setPersonId(taSnapshotPerson.getMatchPerson());
 

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

@@ -49,5 +49,17 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, SysParam> i
         return Float.parseFloat(val);
     }
 
+    @Override
+    public Float getTplMessageInterval() {
+        String val = getParamOfWithDefault("tpl-message-interval", "120");
+        return Float.parseFloat(val);
+    }
+
+    @Override
+    public Float getCustomerVisitInterval() {
+        String val = getParamOfWithDefault("customer-visit-interval", "120");
+        return Float.parseFloat(val);
+    }
+
 
 }

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

@@ -1,13 +1,12 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaCarRecordMapper;
-import com.huiju.welcome.model.TaCarRecord;
-import com.huiju.welcome.model.TaCustomer;
-import com.huiju.welcome.model.TaFirstUsherRecord;
-import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.TencentFaceUtils;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.iai.v20180301.models.Candidate;
@@ -36,6 +35,12 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
     @Autowired
     private TaCarRecordMapper taCarRecordMapper;
 
+    @Autowired
+    private ITaCarService iTaCarService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
     @Autowired
     private ITaFirstUsherRecordService iTaFirstUsherRecordService;
 
@@ -63,6 +68,12 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
      */
     @Override
     public boolean newRecordByDevice(TaCarRecord taCarRecord) {
+        // 是否内部车辆
+        TaCar taCar = iTaCarService.getById(taCarRecord.getPlateNumber());
+        if (null != taCar && taCar.getTypeId().equals(CommConstant.TYPE_CAR_INNER)) {
+            return true;
+        }
+
         // 到客户中查询是否有相关人员
         TaCustomer taCustomer = null;
         List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(taCarRecord.getPlateNumber());
@@ -84,6 +95,12 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
             // 依据人脸与预约判断
             // 人脸优先级高
             if (null != personId && personId > 0) {
+                // 是否内部人员
+                TaPerson taPerson = iTaPersonService.getByIdOrReal(personId);
+                if (null != taPerson.getTypeId() && taPerson.getTypeId() == CommConstant.TYPE_INNER_PERSON) {
+                    return true;
+                }
+
                 // 找到对应人脸
                 taCustomer = iTaCustomerService.getSameByPerson(personId);
                 if (null != taCustomer) {
@@ -100,6 +117,7 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
                     taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord, appointments.get(0));
                     taCarRecord.setPhone(appointments.get(0).getPhone());
                     taCarRecord.setCustomerName(appointments.get(0).getPersonName());
+                    taCarRecord.setPersonNum(appointments.get(0).getPersonNum());
                 } else {
                     taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
                 }
@@ -111,6 +129,7 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
 
         // 先入库
         taCarRecordMapper.insert(taCarRecord);
+        iTaCarService.newCarByDevice(taCarRecord);
 
         // 生成保安迎宾记录, 并通知小程序
         TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.newRecordByDevice(taCarRecord);
@@ -125,7 +144,7 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
             }
         }
 
-        return false;
+        return true;
     }
 
     @Override
@@ -133,4 +152,19 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         // 先暂时只做更新动作
         return taCarRecordMapper.updateById(taCarRecord) > 0;
     }
+
+    @Override
+    public List<TaCarRecord> getTimeline() {
+        LocalDateTime now = LocalDateTime.now();
+
+        // 四小时内
+        LocalDateTime fourHour = now.minusHours(4);
+        QueryWrapper<TaCarRecord> query = new QueryWrapper<>();
+        query.ge("create_date", fourHour);
+        query.groupBy("plate_number");
+        query.orderByDesc("create_date");
+        List<TaCarRecord> result = taCarRecordMapper.selectList(query);
+
+        return result;
+    }
 }

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

@@ -0,0 +1,68 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaCarMapper;
+import com.huiju.welcome.model.*;
+import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.CommConstant;
+import com.huiju.welcome.utils.StatusUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+@Service
+public class TaCarServiceImpl extends ServiceImpl<TaCarMapper, TaCar> implements ITaCarService {
+    Logger log = LoggerFactory.getLogger(TaCarServiceImpl.class);
+
+    @Autowired
+    private TaCarMapper taCarMapper;
+
+    @Override
+    public TaCar newCarByDevice(TaCarRecord taCarRecord) {
+        String plateNumber = taCarRecord.getPlateNumber();
+        if (null == plateNumber || "".equals(plateNumber)) {
+            return null;
+        }
+
+        TaCar taCar = taCarMapper.selectById(plateNumber);
+        if (null != taCar) return taCar;
+
+        taCar = new TaCar();
+        taCar.setPlateNumber(taCarRecord.getPlateNumber());
+        taCar.setCarImage(taCarRecord.getCarImage());
+        taCar.setCarModel(taCarRecord.getCarModel());
+        taCar.setColor(taCarRecord.getColor());
+        taCar.setTypeId(CommConstant.TYPE_CAR_NORMAL);
+        taCar.setStatus(StatusUtils.Normal);
+        taCar.setCreateDate(LocalDateTime.now());
+
+        int row = taCarMapper.insert(taCar);
+        if (row < 1) {
+            log.error("插入车辆信息出错!");
+            return null;
+        }
+
+        return taCar;
+    }
+
+    @Override
+    public boolean setCarType(String id, String typeId) {
+        UpdateWrapper<TaCar> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("type_id", typeId);
+        updateWrapper.eq("plate_number", id);
+
+        return taCarMapper.update(new TaCar(), updateWrapper) > 0;
+    }
+}

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.service.*;
 import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
@@ -61,6 +58,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     SysUserMapper sysUserMapper;
 
+    @Autowired
+    ISysParamService iSysParamService;
+
     @Autowired
     MiniApp miniApp;
 
@@ -77,7 +77,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Override
     public void judgeNewCust(TaPerson taPerson) throws Exception {
         // 首先判定这个人 2 小时内是否来访过
-        LocalDateTime dt = LocalDateTime.now().minusHours(2);
+        Float interval = iSysParamService.getCustomerVisitInterval();
+        LocalDateTime dt = LocalDateTime.now().minusMinutes(interval.intValue());
         List<TaMainUsherRecord> lastList = taMainUsherRecordMapper.getLastList(taPerson.getRealId(), dt);
         if (null != lastList && lastList.size() > 0) return;
 
@@ -87,11 +88,12 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
         // 如果是新人过来
         if (null == taCustomer) {
-            taCustomer = newCustomerByPerson(taPerson);
+//            taCustomer = newCustomerByPerson(taPerson);
         }
 
         // 新增前台记录
-        iTaMainUsherRecordService.newRecordByDevice(taCustomer, taPerson);
+//        iTaMainUsherRecordService.newRecordByDeviceDeprecated(taCustomer, taPerson);
+        iTaMainUsherRecordService.newRecordByDevice(taPerson, taCustomer);
         return;
     }
 
@@ -122,14 +124,16 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
         String name = StringUtils.ifNull(taCarRecord.getCustomerName(), null != appointment ? appointment.getPersonName() : null);
         String phone = null != appointment ? appointment.getPhone() : null;
+        Integer consultantId = null != appointment ? appointment.getCreateUser() : null;
 
         taCustomer.setCreateDate(LocalDateTime.now());
         taCustomer.setStatus(StatusUtils.Normal);
         taCustomer.setCustomerName(name);
         taCustomer.setPhone(phone);
-        taCustomer.setAvatar(taCarRecord.getLicenseImage());
+        taCustomer.setAvatar(taCarRecord.getDriverImage());
         taCustomer.setCarModel(taCarRecord.getCarModel());
         taCustomer.setPlateNumber(taCarRecord.getPlateNumber());
+        taCustomer.setConsultantId(consultantId);
 
         TaPerson taPerson = iTaPersonService.newPersonByFront(taCustomer);
         taCustomer.setCustomerId(taPerson.getRealId());
@@ -230,17 +234,22 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
         List<TaVisitorAppointment> appointments = iTaVisitorAppointmentService.getAppointmentsBy(filters);
         if (null != appointments && appointments.size() > 0) {
+            result.put("source", "appointment");
             result.put("appointment", 1);
             result.put("name", appointments.get(0).getPersonName());
             result.put("consultantId", appointments.get(0).getCreateUser());
+            result.put("sex", appointments.get(0).getSex());
+            result.put("plateNumber", appointments.get(0).getPlatNumber());
         }
 
         List<TaCustomer> custs = taCustomerMapper.getSomeCustMayBe(null, filters.get("phone").toString());
-        if (null != custs || custs.size() > 0) {
+        if (null != custs && custs.size() > 0) {
+            result.put("source", "customer");
             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());
+            result.put("plateNumber", custs.get(0).getPlateNumber());
         }
 
         return result;

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

@@ -67,6 +67,7 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         taFirstUsherRecord.setPlateNumber(taCarRecord.getPlateNumber());
         taFirstUsherRecord.setVisiteDate(LocalDateTime.now());
         taFirstUsherRecord.setPersonName(taCarRecord.getCustomerName());
+        taFirstUsherRecord.setPersonNum(taCarRecord.getPersonNum());
 
         taFirstUsherRecordMapper.insert(taFirstUsherRecord);
 

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

@@ -19,6 +19,7 @@ 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.service.ITaPersonService;
 import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.MiniApp;
 import com.huiju.welcome.utils.StatusUtils;
@@ -58,6 +59,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Autowired
     ITaCustomerService iTaCustomerService;
 
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     @Autowired
     MiniApp miniApp;
 
@@ -79,7 +83,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public boolean newRecordByDevice(TaCustomer taCustomer, TaPerson taPerson) {
+    public boolean newRecordByDeviceDeprecated(TaCustomer taCustomer, TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
         taMainUsherRecord.setStatus(StatusUtils.Ready);
         taMainUsherRecord.setPersonId(taPerson.getRealId());
@@ -232,10 +236,14 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         taMainUsherRecord.setStatus(StatusUtils.Normal);
 
-        int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
-
         // 是否更新了置业
-        TaCustomer taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+        TaCustomer taCustomer = null;
+        if (null == taMainUsherRecord.getCustomerId()) {
+            taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord);
+        } else {
+            taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+        }
+
         Integer originConsultant = taCustomer.getConsultantId();
 
         // 是否需要更新客户信息
@@ -251,6 +259,11 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             iTaCustomerService.updateById(taCustomer);
         }
 
+        int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
+
+        // 更新人员信息
+        iTaPersonService.updateByMainUsher(taMainUsherRecord);
+
         // 如果原来置业为空
         if (null == originConsultant || originConsultant < 1) {
             iTaCustomerService.updateConsultant(taCustomer, consultantId);
@@ -275,19 +288,19 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             SysUser proxyUser = sysUserMapper.selectById(consultantId);
 
             // 通知原置业, 客户被临时置业接待
-            List<Object> dt1 = new ArrayList<Object>(){{
-                add(taCustomer.getCustomerName());
-                add(taCustomer.getPhone());
-                add("您有新客户来访, 已被安排给 " + proxyUser.getUsername() + " 接待!");
-            }};
+            List<Object> dt1 = new ArrayList<Object>();
+            dt1.add(taCustomer.getCustomerName());
+            dt1.add(taCustomer.getPhone());
+            dt1.add("您有新客户来访, 已被安排给 " + proxyUser.getUsername() + " 接待!");
+
             miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
 
             // 通知临时置业
-            List<Object> dt2 = new ArrayList<Object>(){{
-                add(taCustomer.getCustomerName());
-                add(taCustomer.getPhone());
-                add(rcUser.getUsername() + " 有新客户来访, 请协助接待一下!");
-            }};
+            List<Object> dt2 = new ArrayList<Object>();
+            dt2.add(taCustomer.getCustomerName());
+            dt2.add(taCustomer.getPhone());
+            dt2.add(rcUser.getUsername() + " 有新客户来访, 请协助接待一下!");
+
             miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
         }
 
@@ -303,4 +316,41 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         return row > 0;
     }
+
+    @Override
+    public boolean newRecordByDevice(TaPerson taPerson, TaCustomer taCustomer) {
+        TaMainUsherRecord taMainUsherRecord = null;
+        if (null != taCustomer) {
+            taMainUsherRecord = newRecordByCust(taCustomer);
+        } else {
+            taMainUsherRecord = newRecordByPerson(taPerson);
+        }
+
+        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, SerializerFeature.WriteMapNullValue));
+            WebSocketServer.sendInfo(act.toJSON(), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {e.printStackTrace();}
+
+        return row > 0;
+    }
+
+    private TaMainUsherRecord newRecordByPerson(TaPerson taPerson) {
+        TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
+        taMainUsherRecord.setPersonName(taPerson.getName());
+        taMainUsherRecord.setAvatar(taPerson.getAvatar());
+        taMainUsherRecord.setPhone(taPerson.getPhone());
+        taMainUsherRecord.setVisiteDate(LocalDateTime.now());
+
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            taMainUsherRecord.setStatus(StatusUtils.Ready);
+        } else {
+            taMainUsherRecord.setStatus(StatusUtils.Normal);
+        }
+
+        return taMainUsherRecord;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaMessageRecordMapper;
 import com.huiju.welcome.model.TaMessageRecord;
+import com.huiju.welcome.service.ISysParamService;
 import com.huiju.welcome.service.ITaMessageRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,11 +18,15 @@ public class TaMessageRecordImpl extends ServiceImpl<TaMessageRecordMapper, TaMe
     @Autowired
     TaMessageRecordMapper taMessageRecordMapper;
 
+    @Autowired
+    ISysParamService iSysParamService;
+
     @Override
     public boolean saveMessageOrNot(String toUser, String tplId, String page, List<Object> data, boolean save) {
         String content = JSONObject.toJSONString(data);
+        Float interval = iSysParamService.getTplMessageInterval();
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime twoHourAgo = now.minusHours(2);
+        LocalDateTime twoHourAgo = now.minusMinutes(interval.intValue());
 
         List<TaMessageRecord> lastMessages = taMessageRecordMapper.getLastSameMessages(toUser, page, content, twoHourAgo);
         if (null != lastMessages && lastMessages.size() > 0) return false;

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

@@ -303,6 +303,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
         updateWrapper.set("phone", taCustomer.getPhone());
         updateWrapper.set("name", taCustomer.getCustomerName());
+        updateWrapper.set("type_id", CommConstant.TYPE_VIP_PERSON);
         updateWrapper.eq("real_id", taCustomer.getCustomerId()).or().eq("person_id", taCustomer.getCustomerId());
 
         int row = taPersonMapper.update(new TaPerson(), updateWrapper);
@@ -334,7 +335,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         person.setStatus(StatusUtils.Normal);
         person.setLastVisiteDate(taSnapshotPerson.getCreateDate());
         person.setLastVisiteDevice(taSnapshotPerson.getDeviceId());
-        person.setSex(taSnapshotPerson.getSex().toString());
+
+        Integer sex = taSnapshotPerson.getSex();
+        person.setSex(null == sex || sex == 0 ? null : String.valueOf(sex));
 
         int row = taPersonMapper.insert(person);
         if (row < 1) {
@@ -409,6 +412,28 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return true;
     }
 
+    @Override
+    public boolean updateByMainUsher(TaMainUsherRecord taMainUsherRecord) {
+        // 默认客户与人员ID是一致的
+        UpdateWrapper<TaPerson> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("phone", taMainUsherRecord.getPhone());
+        updateWrapper.set("name", taMainUsherRecord.getPersonName());
+        updateWrapper.set("type_id", CommConstant.TYPE_VIP_PERSON);
+        updateWrapper.eq("real_id", taMainUsherRecord.getPersonId()).or().eq("person_id", taMainUsherRecord.getPersonId());
+
+        int row = taPersonMapper.update(new TaPerson(), updateWrapper);
+        return row > 0;
+    }
+
+    @Override
+    public TaPerson getByIdOrReal(Integer personId) {
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId).or().eq("real_id", personId);
+        queryWrapper.last("limit 1");
+
+        return taPersonMapper.selectOne(queryWrapper);
+    }
+
     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/TaVisitorAppointmentServiceImpl.java

@@ -2,6 +2,7 @@ package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
@@ -66,6 +67,17 @@ public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppoin
         return taVisitorAppointmentMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId) {
+        IPage<TaVisitorAppointment> page = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaVisitorAppointment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("create_user", personId);
+        queryWrapper.gt("status", StatusUtils.Delete);
+        queryWrapper.orderByDesc("create_date");
+
+        return taVisitorAppointmentMapper.selectPage(page, 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

@@ -18,10 +18,8 @@ import com.aliyuncs.http.HttpResponse;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import com.google.gson.JsonObject;
 import com.huiju.welcome.config.AliProperties;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import com.tencentcloudapi.iai.v20180301.models.GetPersonBaseInfoResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,8 +47,7 @@ public class AliFaceUtils {
     DefaultProfile profile;
     DefaultAcsClient client;
     IAcsClient recognitionClient;
-    
-    
+
     @Autowired
     public AliFaceUtils(AliProperties p) throws ClientException {
         profile = DefaultProfile.getProfile(AliProperties.face.getRegionId(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
@@ -66,7 +63,6 @@ public class AliFaceUtils {
      * @throws UnsupportedEncodingException
      */
     public JSONObject getPersonBaseInfo(String personId) throws Exception {
-        JSONObject result = new JSONObject();
         GetPersonRequest getPersonRequest = new GetPersonRequest();
         getPersonRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
         getPersonRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
@@ -112,14 +108,13 @@ public class AliFaceUtils {
     }
     
     /**
-     * 穿件人员
+     * 创建人员
      * @param personId
      * @param personName
      * @throws TencentCloudSDKException
      * @throws UnsupportedEncodingException
      */
     public JSONObject createPerson(String personId, String personName) throws Exception {
-        JSONObject result = new JSONObject();
         // 已经存在的人员, 不重复创建
         try {
             if (null != getPersonBaseInfo(personId)){
@@ -128,6 +123,7 @@ public class AliFaceUtils {
         } catch (Exception e) {
            throw e;
         }
+
         AddPersonRequest addPersonRequest = new AddPersonRequest();
         // 指定api返回格式
         addPersonRequest.setAcceptFormat(FormatType.JSON);
@@ -177,7 +173,14 @@ public class AliFaceUtils {
             throw e;
         }
     }
-    
+
+    /**
+     * 创建人员
+     * @param personId
+     * @param url
+     * @return
+     * @throws Exception
+     */
     public JSONObject createFace(String personId, String url) throws Exception {
         JSONObject result = new JSONObject();
         try {
@@ -235,7 +238,13 @@ public class AliFaceUtils {
         }
         return result;
     }
-    
+
+    /**
+     * 人脸查询
+     * @param url
+     * @return
+     * @throws Exception
+     */
     public JSONObject searchFace(String url) throws Exception {
         ImageSyncScanRequest imageSyncScanRequest = new ImageSyncScanRequest();
         imageSyncScanRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式

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

@@ -10,4 +10,9 @@ public class CommConstant {
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
 
     public final static Integer TYPE_NEW_PERSON = 1;
+    public final static Integer TYPE_VIP_PERSON = 2;
+    public final static Integer TYPE_INNER_PERSON = 3;
+
+    public final static String TYPE_CAR_NORMAL = "normal";
+    public final static String TYPE_CAR_INNER = "inner";
 }

src/main/resources/mapper/TaCarMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.TaCarMapper">
+</mapper>