bug

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

@@ -60,9 +60,6 @@ public class CameraServiceImpl implements ICameraService {
     @Autowired
     ITaCustomerService iTaCustomerService;
     
-    @Value("${unface.device}")
-    private String unfaceDevice;
-    
     @Autowired
     private TaCustomerMapMapper taCustomerMapMapper;
     
@@ -199,8 +196,19 @@ public class CameraServiceImpl implements ICameraService {
         }
 
         //二号岗设备推送
-        if(taSnapshotPerson.getDeviceId().equals(unfaceDevice)){
+        TaDevice taDevice = taDeviceService.getById(taSnapshotPerson.getDeviceId());
+        if(taDevice.getAfr().equals(CommConstant.DEVICE_AFR_UNFACE)){
             sendMessageToConsult(taPerson);
+    
+            // 预写到访日志
+            visitingLogService.newLogByDevice(taSnapshotPerson, taPerson);
+    
+            // 判断是否客户来访
+            try {
+                iTaCustomerService.judgeNewCust(taPerson);
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
         }else{
             // 推送消息
             taPersonService.send2Front(taPerson);
@@ -209,16 +217,6 @@ public class CameraServiceImpl implements ICameraService {
         // 保存抓拍日志
         taSnapshotPersonService.save(taSnapshotPerson);
 
-        // 预写到访日志
-        visitingLogService.newLogByDevice(taSnapshotPerson, taPerson);
-
-        // 判断是否客户来访
-        try {
-            iTaCustomerService.judgeNewCust(taPerson);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
-
         return true;
     }
     
@@ -242,10 +240,9 @@ public class CameraServiceImpl implements ICameraService {
                     e.printStackTrace();
                 }
             }
-        }else {
-            //推送人脸到二号岗
-            sendMessageToMainusher(taPerson);
         }
+        //推送人脸到二号岗
+        sendMessageToMainusher(taPerson);
     }
     
     /**

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

@@ -15,6 +15,7 @@ import com.huiju.welcome.model.*;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
@@ -67,6 +68,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Autowired
     MiniApp miniApp;
+    
+    @Autowired
+    ICameraService cameraService;
 
     @Override
     public boolean updateNormal(List<TaMainUsherRecord> records) {
@@ -244,9 +248,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Override
     public boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
         Integer consultantId = taMainUsherRecord.getConsultantId();
-        if (null == consultantId || consultantId < 1) {
-            throw new Exception("置业顾问不能为空");
-        }
+        //if (null == consultantId || consultantId < 1) {
+        //    throw new Exception("置业顾问不能为空");
+        //}
 
         if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
             throw new Exception("客户电话不能为空");
@@ -270,19 +274,21 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             }
         }
     
-        if (null == taCustomer && null == taMainUsherRecord.getCustomerId()) {
-            taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, false);
-        }
+        //if (null == taCustomer && null == taMainUsherRecord.getCustomerId()) {
+        //    taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, false);
+        //}
         
         if (null == taCustomer){
             // 新增客户
-            iTaCustomerService.newCustByMainUsher(taMainUsherRecord, true);
+            TaCustomer taCustomerNew = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, true);
     
+            taMainUsherRecord.setVisiteDate(LocalDateTime.now());
+            taMainUsherRecord.setCustomerId(taCustomerNew.getCustomerId());
             return taMainUsherRecordMapper.insert(taMainUsherRecord) > 0;
         }else {
     
             TaMainUsherRecord taMainUsherRecordToday = getTodayRecord(taCustomer.getCustomerId());
-    
+            
             if (null == taMainUsherRecordToday) {
                 int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
                 if (row < 1) {
@@ -329,9 +335,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Override
     public boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
         Integer consultantId = taMainUsherRecord.getConsultantId();
-        if (null == consultantId || consultantId < 1) {
-            throw new Exception("置业顾问不能为空");
-        }
+        //if (null == consultantId || consultantId < 1) {
+        //    throw new Exception("置业顾问不能为空");
+        //}
 
         if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
             throw new Exception("客户电话不能为空");
@@ -399,7 +405,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         // 如果原来置业为空
         if (null == originConsultant || originConsultant < 1) {
             iTaCustomerService.updateConsultant(taCustomer, consultantId);
-        } else if (!consultantId.equals(originConsultant)) {
+        } else if (null != consultantId && !consultantId.equals(originConsultant)) {
             // 如果临时替换跟踪置业
             // 那么需要给原始置业, 以及临时置业各自发一条消息
             String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + String.valueOf(taCustomer.getCustomerId());
@@ -435,6 +441,11 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
             miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
         }
+    
+        //通知吧台来人了
+        cameraService.sendMessageToBar(taCustomer,taMainUsherRecord.getPersonNum());
+        //推送置业经理
+        cameraService.sendMessageToConsultManager(taCustomer);
 
         return row > 0;
     }

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

@@ -18,6 +18,8 @@ public class CommConstant {
     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 DEVICE_AFR_UNFACE = "0";
 
     public final static String TYPE_CAR_NORMAL = "normal";
     public final static String TYPE_CAR_INNER = "inner";

src/main/resources/application.yml

@@ -94,8 +94,4 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: AI智慧案场
-
-# 二号岗设备不具备人脸比对功能
-unface:
-  device: 216
+    sign: AI智慧案场