merge

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

 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.CommConstant;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
 
     /**
      * 保存对象
-     * @param taCustomer 实体对象
+     * @param
      * @return
      */
     @RequestMapping(value="/miniapp/customer",method= RequestMethod.POST)
 
     /**
      * 修改对象
-     * @param taCustomer 实体对象
+     * @param
      * @return
      */
     @RequestMapping(value="/miniapp/customer/{id}",method= RequestMethod.PUT)
         }
         return responseBean;
     }
+    
+    /**
+     * 分页查询已归属人员和未归属人员
+     * @param pageNumber
+     * @param pageSize
+     * @param state   attribution 已归属  unattribution 未归属
+     * @return
+     */
+    @RequestMapping(value="/miniapp/customer/visitor/{state}",method= RequestMethod.GET)
+    public ResponseBean visitorCustomerList(@RequestParam(defaultValue = "1") int pageNumber,
+                                            @RequestParam(defaultValue = "10") int pageSize,
+                                            @PathVariable String state,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userId = JWTUtils.getSubject(request);
+            SysUser user = iSysUserService.getById(iTaWechatUserService.getById(userId).getPersonId());
+            if (null != user && !user.getUserIdentity().equals(CommConstant.IDENTITY_CONSULTANT_MANAGER)){
+                responseBean.addError("你不是置业经理");
+                return responseBean;
+            }
+            //已归属和未归属人员列表 分页
+            if (state.equals(CommConstant.CUSTOMER_ATTRIBUTION)) {
+                IPage<TaCustomer> result = iTaCustomerService.getAttributionList(pageNumber, pageSize);
+                responseBean.addSuccess(result);
+            }else if (state.equals(CommConstant.CUSTOMER_UNATTRIBUTION)){
+                IPage<TaCustomer> result = iTaCustomerService.getUnattributionList(pageNumber, pageSize);
+                responseBean.addSuccess(result);
+            }
+            
+        }catch (Exception e){
+            logger.error("taCustomerList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分配置业客户
+     * @param paramStr   consultantId 置业顾问id  realtyConsultant 置业顾问姓名
+     *
+     * @return
+     */
+    @RequestMapping(value="/miniapp/customer/assign/{id}",method= RequestMethod.PUT)
+    public ResponseBean updateCustomer(@RequestBody String paramStr, @PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("保存内容格式非法或者为空", HttpStatus.SC_BAD_REQUEST);
+        }
+    
+        String userId = JWTUtils.getSubject(request);
+        SysUser user = iSysUserService.getById(iTaWechatUserService.getById(userId).getPersonId());
+        if (null != user && !user.getUserIdentity().equals(CommConstant.IDENTITY_CONSULTANT_MANAGER)){
+            responseBean.addError("你不是置业经理");
+            return responseBean;
+        }
+        
+        TaCustomer taCustomer = JSONObject.parseObject(paramStr, TaCustomer.class);
+        taCustomer.setCustomerId(id);
+        
+        try {
+            if (iTaCustomerService.updateById(taCustomer)){
+                responseBean.addSuccess("分配成功");
+            }
+        }catch (Exception e){
+            logger.error("taCustomerUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
 }

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

         ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
         return result;
     }
-
+    
+    @ApiOperation(value = "访客预约信息",notes = "访客预约信息")
+    @RequestMapping(value="/miniapp/visitorAppointmentList",method= RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "platNumber", value = "车牌"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "personName", value = "预约人姓名"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "预约人电话")})
+    public ResponseBean minappVisitorAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
+                                               @RequestParam(defaultValue = "10") int pageSize,
+                                               @RequestParam(value = "platNumber",required = false) String platNumber,
+                                               @RequestParam(value = "personName",required = false) String personName,
+                                               @RequestParam(value = "phone",required = false) String phone){
+        IPage<TaVisitorAppointment> pg = new Page<>(pageNum, pageSize);
+        ResponseBean result = taVisitorAppointmentService.miniappVisitorAppointmentList(pg,platNumber,personName,phone);
+        return result;
+    }
+    
     @ApiOperation(value = "访客预约信息",notes = "访客预约信息")
     @RequestMapping(value="/miniapp/appointment",method= RequestMethod.GET)
     public ResponseBean myAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
         IPage<TaVisitorAppointment> result = taVisitorAppointmentService.getMyAppointmentList(pageNum, pageSize, user.getPersonId(), nameOrPhone);
         return ResponseBean.success(result);
     }
-
+    
+    @ApiOperation(value = "今日访客预约列表",notes = "今日访客预约列表")
+    @RequestMapping(value="/miniapp/today/appointments",method= RequestMethod.GET)
+    public ResponseBean todayAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
+                                          @RequestParam(defaultValue = "10") int pageSize) {
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentService.getTodayAppointmentList(pageNum, pageSize);
+        return ResponseBean.success(result);
+    }
 }

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

 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
      * @return
      */
     void fireUser(@Param("userId") Integer userId);
+	
+	List<SysUser> selectConsultManagerList(@Param("identityConsultantManager") String identityConsultantManager);
 }

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

     List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber, @Param("phone") String phone);
 
     IPage<TaCustomer> getCustomerListOfFront(IPage<TaCustomer> page,@Param("consultantId") Integer consultantId,@Param("nameOrPhone") String nameOrPhone);
+    
+    IPage<TaCustomer> getAttributionList(IPage<TaCustomer> page);
+    
+    IPage<TaCustomer> getUnattributionList(IPage<TaCustomer> page);
 }

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

 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 
     IPage<TaVisitorAppointment> visitorAppointmentList(IPage pg, @Param("platNumber") String platNumber, @Param("personName")String personName, @Param("phone")String phone);
 
     IPage<TaVisitorAppointment> getMyAppointmentList(IPage<TaVisitorAppointment> page,@Param("createUser") Integer personId, @Param("nameOrPhone") String nameOrPhone);
+	
+	IPage<TaVisitorAppointment> getTodayAppointmentList(IPage<TaVisitorAppointment> page);
+	
+	IPage<TaVisitorAppointment> miniappVisitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber, String personName, String phone);
 }

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

      */
     @TableField(exist = false)
     private Integer transferId;
+    
+    /**
+     * 到访时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime visiteDate;
 }

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

 package com.huiju.welcome.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
     String remark;
 
     Integer createUser;
+    
+    /**
+     * 置业顾问姓名
+     */
+    @TableField(exist = false)
+    private String username;
 }

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

 package com.huiju.welcome.service;
 
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
     String dispatchPerson(TaPerson taPerson, TaDevice ...devices);
 
     boolean newPersonByDevice(TaSnapshotPerson taSnapshotPerson);
+    
+    void sendMessageToBar(TaCustomer taCustomer,Integer personNum);
+    
+    void sendMessageToConsultManager(TaCustomer taCustomer);
 }

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

     boolean updateConsultant(TaCustomer taCustomer, Integer consultantId);
 
     TaCustomer newCustByMainUsher(TaMainUsherRecord taMainUsherRecord, boolean notify) throws Exception;
+    
+    TaCustomer newCustByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, boolean notify) throws Exception;
 
     Map<String, Object> getHistoryRecBy(Map<String,Object> filters);
 
     IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhone);
 
     List<CustomerExcel> getCustomersEqualCustomerPage(String customerName, String phone, String platNumber, Integer agentUserId);
+	
+	IPage<TaCustomer> getAttributionList(int pageNumber, int pageSize);
+    
+    IPage<TaCustomer> getUnattributionList(int pageNumber, int pageSize);
 }

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

     boolean removeRecordByFront(Integer id);
 
     boolean addCar2WhiteList(Integer id);
+	
+	void notifyCar(TaFirstUsherRecord taFirstUsherRecord);
 }

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

     TaPerson newPersonByFront(TaCustomer taCustomer);
 
     TaPerson newPersonByUsher(TaMainUsherRecord taMainUsherRecord);
+    
+    TaPerson newPersonByFirstUsher(TaFirstUsherRecord taFirstUsherRecord);
 
     boolean updateByCustomer(TaCustomer taCustomer);
 

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

     List<TaVisitorAppointment> getAppointmentsByPlateNumber(String plateNumber);
 
     IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId, String nameOrPhone);
+	
+	IPage<TaVisitorAppointment> getTodayAppointmentList(int pageNum, int pageSize);
+	
+	ResponseBean miniappVisitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber, String personName, String phone);
 }

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

 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.welcome.common.Action;
 import com.huiju.welcome.common.WebSocketServer;
+import com.huiju.welcome.mapper.SysUserMapper;
+import com.huiju.welcome.mapper.TaCustomerMapMapper;
+import com.huiju.welcome.mapper.TaCustomerMapper;
+import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.model.TaCustomer;
+import com.huiju.welcome.model.TaCustomerMap;
 import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
     @Autowired
     ITaCustomerService iTaCustomerService;
+    
+    @Value("${unface.device}")
+    private String unfaceDevice;
+    
+    @Autowired
+    private TaCustomerMapMapper taCustomerMapMapper;
+    
+    @Autowired
+    private TaCustomerMapper taCustomerMapper;
+    
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    
+    @Autowired
+    MiniApp miniApp;
 
     @Override
     public String dispatchPerson(TaPerson taPerson, TaDevice... devices) {
             }
 
             // 如果是工作人员则忽略
-            if (null != taPerson && null != taPerson.getTypeId() && taPerson.getTypeId() == CommConstant.TYPE_INNER_PERSON) {
+            if (null != taPerson && null != taPerson.getTypeId() && taPerson.getTypeId().equals(CommConstant.TYPE_INNER_PERSON)) {
                 taSnapshotPerson.setMatchPerson(taPerson.getRealId());
                 taSnapshotPersonService.save(taSnapshotPerson);
                 return true;
             dispatchPerson(taPerson);
         }
 
-        // 推送消息
-        taPersonService.send2Front(taPerson);
+        //二号岗设备推送
+        if(taSnapshotPerson.getDeviceId().equals(unfaceDevice)){
+            sendMessageToConsult(taPerson);
+        }else{
+            // 推送消息
+            taPersonService.send2Front(taPerson);
+        }
 
         // 保存抓拍日志
         taSnapshotPersonService.save(taSnapshotPerson);
 
         return true;
     }
-}
+    
+    /**
+     * 二号岗亭推送消息给置业经理，如果是老客户还需要推送给这个客户的置业顾问。同时都要推送给吧台。
+     * @param taPerson
+     */
+    private void sendMessageToConsult(TaPerson taPerson) {
+        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(taPerson.getPersonId());
+        if (null != taCustomerMap){
+            TaCustomer taCustomer = taCustomerMapper.selectById(taCustomerMap.getCustomerId());
+            if (null != taCustomer){
+                try {
+                    //推送置业顾问
+                    iTaCustomerService.notifyConsultant(taCustomer);
+                    //推送置业经理
+                    sendMessageToConsultManager(taCustomer);
+                    //推送吧台
+                    sendMessageToBar(taCustomer,null);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }else {
+            //推送人脸到二号岗
+            sendMessageToMainusher(taPerson);
+        }
+    }
+    
+    /**
+     * 推送人脸数据到二号岗
+     * @param taPerson
+     */
+    private void sendMessageToMainusher(TaPerson taPerson) {
+        try {
+            WebSocketServer.sendInfo(JSONObject.toJSONString(taPerson), CommConstant.WECHAT_CLIENT_MAINUSHER, null);
+        } catch (Exception e) {}
+    }
+    
+    /**
+     * 推送消息去吧台
+     * @param taCustomer
+     */
+    @Override
+    public void sendMessageToBar(TaCustomer taCustomer,Integer personNum) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("customerId",taCustomer.getCustomerId());
+        map.put("customerName",taCustomer.getCustomerName());
+        map.put("consultantName",taCustomer.getRealtyConsultant());
+        map.put("avatar",taCustomer.getAvatar());
+        map.put("visitorNum",personNum);
+        map.put("visitorTime",LocalDateTime.now());
+        map.put("type",CommConstant.IDENTITY_BARUSHER);
+        try {
+            WebSocketServer.sendInfo(JSONObject.toJSONString(map), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {}
+    }
+    
+    @Override
+    public void sendMessageToConsultManager(TaCustomer taCustomer) {
+        //获取所有的置业经理信息并推送消息
+        List<SysUser> sysUserList = sysUserMapper.selectConsultManagerList(CommConstant.IDENTITY_CONSULTANT_MANAGER);
+        sysUserList.stream().forEach(e -> {
+            String tpl = miniApp.getTpls().getVisitor();
+            String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + taCustomer.getCustomerId();
+            String openid = e.getOpenid();
+            if (null == openid) {
+                return;
+            }
+            List<Object> data = new ArrayList<Object>(){{
+                add(taCustomer.getCustomerName());
+                add(taCustomer.getPhone());
+                add("您有客户来访, 请及时接待!");
+            }};
+    
+            miniApp.sendTPLMessage(tpl, openid, page, data);
+        });
+    }
+}

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

 
         // 生成保安迎宾记录, 并通知小程序
         TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.newRecordByDevice(taCarRecord);
-        iTaFirstUsherRecordService.notifyMiniapp(taFirstUsherRecord);
+        iTaFirstUsherRecordService.notifyCar(taFirstUsherRecord);
 
         // 如果客户有固定置业, 推送消息给置业
         if (null != taCustomer && null != taCustomer.getConsultantId()) {

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

     @Autowired
     MiniApp miniApp;
 
+    @Autowired
+    ICameraService cameraService;
+
     @Override
     public List<TaPerson> getGroup(Integer customerId) {
         return taCustomerMapMapper.getGroup(customerId);
             personId = taPerson.getRealId();
             taMainUsherRecord.setPersonId(personId);
         }
-
+        
         Integer custId = taMainUsherRecord.getCustomerId();
         TaCustomer cust;
         if (null == custId) {
             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("生成置业客户映射失败");
             }
         }
-
+        
         // 发消息给置业
         if (null != cust.getConsultantId() && notify) {
             notifyConsultant(cust);
         }
-
+    
+        if (notify){
+            //通知吧台来人了
+            cameraService.sendMessageToBar(cust,taMainUsherRecord.getPersonNum());
+            //推送置业经理
+            cameraService.sendMessageToConsultManager(cust);
+        }
+        
         return cust;
     }
-
+    
+    @Override
+    public TaCustomer newCustByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, boolean notify) throws Exception {
+        Integer personId = taFirstUsherRecord.getPersonId();
+        if (null == personId) {
+            TaPerson taPerson = iTaPersonService.newPersonByFirstUsher(taFirstUsherRecord);
+            personId = taPerson.getRealId();
+            taFirstUsherRecord.setPersonId(personId);
+        }
+        
+        TaCustomer cust = copyDataFromFirstUsher(taFirstUsherRecord);
+        if (!insertCustomer(cust)) {
+            throw new Exception("新增客户信息失败");
+        }
+        
+        TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
+        if (null == taCustomerMap) {
+            TaCustomerMap custMap = new TaCustomerMap();
+            custMap.setCustomerId(cust.getCustomerId());
+            custMap.setPersonId(taFirstUsherRecord.getPersonId());
+            
+            int row = taCustomerMapMapper.insert(custMap);
+            if (row <= 0) {
+                throw new Exception("生成置业客户映射失败");
+            }
+        }
+        
+        // 发消息给置业
+        if (null != cust.getConsultantId() && notify) {
+            notifyConsultant(cust);
+        }
+        if (notify){
+            //通知吧台来人了
+            cameraService.sendMessageToBar(cust,taFirstUsherRecord.getPersonNum());
+            //推送置业经理
+            cameraService.sendMessageToConsultManager(cust);
+        }
+        
+        return cust;
+    }
+    
+    private TaCustomer copyDataFromFirstUsher(TaFirstUsherRecord taFirstUsherRecord) {
+        TaCustomer taCustomer = new TaCustomer();
+        taCustomer.setCustomerId(taFirstUsherRecord.getPersonId());       // 默认客户ID与人员ID一致
+        taCustomer.setCustomerName(taFirstUsherRecord.getPersonName());
+        taCustomer.setPhone(taFirstUsherRecord.getPhone());
+        taCustomer.setPlateNumber(taFirstUsherRecord.getPlateNumber());
+        taCustomer.setCarModel(taFirstUsherRecord.getCarModel());
+        taCustomer.setChannel(taFirstUsherRecord.getChannel());
+        taCustomer.setPurpose(taFirstUsherRecord.getPurpose());
+        taCustomer.setStatus(StatusUtils.Normal);
+        taCustomer.setCreateDate(LocalDateTime.now());
+    
+        return taCustomer;
+    }
+    
     @Override
     public Map<String, Object> getHistoryRecBy(Map<String, Object> filters) {
         String phone = filters.get("phone").toString();
         return null;
     }
 
+    @Override
+    public IPage<TaCustomer> getAttributionList(int pageNumber, int pageSize) {
+        IPage<TaCustomer> page = new Page<>(pageNumber, pageSize);
+        return taCustomerMapper.getAttributionList(page);
+    }
+    
+    @Override
+    public IPage<TaCustomer> getUnattributionList(int pageNumber, int pageSize) {
+        IPage<TaCustomer> page = new Page<>(pageNumber, pageSize);
+        return taCustomerMapper.getUnattributionList(page);
+    }
+
     private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {
         TaCustomer taCustomer = new TaCustomer();
         taCustomer.setCustomerId(taPerson.getRealId());

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

 import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
 import com.huiju.welcome.model.*;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaCarService;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaFirstUsherRecordService;
 
     @Autowired
     ITaCarService iTaCarService;
+    
+    @Autowired
+    ICameraService cameraService;
 
     @Override
     public boolean updateNormal(List<TaFirstUsherRecord> records) {
             WebSocketServer.sendInfo(act.toJSON(), CommConstant.WECHAT_CLIENT_MINIAPP, null);
         } catch (Exception e) {}
     }
+    
+    @Override
+    public void notifyCar(TaFirstUsherRecord 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) {}
+    }
 
     @Override
     public boolean newRecordByMiniapp(TaFirstUsherRecord taFirstUsherRecord) {
 
         // 查找客户
         TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(taFirstUsherRecord.getPhone(), taFirstUsherRecord.getPlateNumber());
-        if (null == taCustomer) return true;
+        if (null == taCustomer) {
+            if (!StringUtils.isEmpty(taFirstUsherRecord.getPhone())){
+                try {
+                    taCustomer = iTaCustomerService.newCustByFirstUsher(taFirstUsherRecord,true);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }else {
+                return true;
+            }
+        }
 
         // 更新车型
         if (null != taFirstUsherRecord.getCarModel()) {
                 TaCustomer taCustomer = taCustomerList.get(0);
                 try {
                     iTaCustomerService.notifyConsultant(taCustomer);
+                    //通知吧台来人了
+                    cameraService.sendMessageToBar(taCustomer,taFirstUsherRecord.getPersonNum());
                 } catch (Exception e) {}
             }
         }

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

 
         return taPerson;
     }
+    
+    @Override
+    public TaPerson newPersonByFirstUsher(TaFirstUsherRecord taFirstUsherRecord) {
+        TaPerson taPerson = new TaPerson();
+        taPerson.setPhone(taFirstUsherRecord.getPhone());
+        taPerson.setName(taFirstUsherRecord.getPersonName());
+        taPerson.setStatus(StatusUtils.Normal);
+        taPerson.setCreateDate(LocalDateTime.now());
+        
+        // 直接是VIP
+        taPerson.setTypeId(2);
+        int row = taPersonMapper.insert(taPerson);
+        if (row < 0) return null;
+        
+        taPerson.setRealId(taPerson.getPersonId());
+        taPersonMapper.updateById(taPerson);
+        
+        return taPerson;
+    }
 
     @Override
     public boolean updateByCustomer(TaCustomer taCustomer) {

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

 
         return result;
     }
-
+    
+    @Override
+    public IPage<TaVisitorAppointment> getTodayAppointmentList(int pageNum, int pageSize) {
+        IPage<TaVisitorAppointment> page = new Page<>(pageNum, pageSize);
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentMapper.getTodayAppointmentList(page);
+    
+        return result;
+    }
+    
+    @Override
+    public ResponseBean miniappVisitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber, String personName, String phone) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<TaVisitorAppointment> list= taVisitorAppointmentMapper.miniappVisitorAppointmentList(pg,platNumber,personName,phone);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
+    
     @Override
     public ResponseBean visitorAppointmentList(IPage pg, String platNumber, String personName,String phone) {
        ResponseBean responseBean= new ResponseBean();

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

     public final static String IDENTITY_FIRSTUSHER = "first-usher";
     public final static String IDENTITY_MAINUSHER = "main-usher";
     public final static String IDENTITY_BARUSHER = "bar-usher";
+    public final static String IDENTITY_CONSULTANT_MANAGER = "consultant_manager";
 
     public final static String PAGE_MY_CUSTOMER = "pages/client/clientdetail/clientdetail";
 
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
+    public final static String WECHAT_CLIENT_CAR = "car";
+    public final static String WECHAT_CLIENT_BAR = "bar";
+    public final static String WECHAT_CLIENT_MAINUSHER = "mainusher";
 
     public final static Integer TYPE_NEW_PERSON = 1;
     public final static Integer TYPE_VIP_PERSON = 2;
 
     public final static String TYPE_CAR_NORMAL = "normal";
     public final static String TYPE_CAR_INNER = "inner";
+    
+    /**
+     * 已归属
+     */
+    public final static String CUSTOMER_ATTRIBUTION = "attribution";
+    
+    /**
+     * 未归属
+     */
+    public final static String CUSTOMER_UNATTRIBUTION = "unattribution";
 }

src/main/resources/application.yml

 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: welcome
-    password: s190QU2#z%hdU%^FPkY9qjls
-#    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-#    username: root
-#    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    username: welcome
+#    password: s190QU2#z%hdU%^FPkY9qjls
+    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB
     size: 4
     # 短信签名
     sign: AI智慧案场
+
+# 二号岗设备不具备人脸比对功能
+unface:
+  device: 216

src/main/resources/mapper/SysUserMapper.xml

         set status = -1, in_service = 0
         where user_id = #{userId}
     </update>
+
+    <select id="selectConsultManagerList" resultType="com.huiju.welcome.model.SysUser">
+        SELECT
+            s.user_id,
+            w.openid,
+            s.create_date,
+            s.user_identity
+        FROM
+            sys_user s
+            LEFT JOIN ta_wechat_user w ON w.person_id = s.user_id
+        WHERE
+            1 = 1
+            AND s.user_identity = #{identityConsultantManager}
+            AND s.STATUS = 1
+    </select>
 </mapper>

src/main/resources/mapper/TaCustomerMapper.xml

         ORDER BY
             t.create_date DESC
     </select>
+
+    <select id="getAttributionList" resultType="com.huiju.welcome.model.TaCustomer">
+        SELECT
+            c.*,
+            d.visite_date
+        FROM
+            ta_customer c
+            LEFT JOIN ( SELECT * FROM ta_main_usher_record t WHERE t.STATUS > 0 GROUP BY t.customer_id ORDER BY t.visite_date DESC ) d ON c.customer_id = d.customer_id
+        WHERE
+            c.STATUS > 0
+            AND c.consultant_id IS NULL
+        ORDER BY
+            d.visite_date DESC
+    </select>
+
+    <select id="getUnattributionList" resultType="com.huiju.welcome.model.TaCustomer">
+        SELECT
+            c.*,
+            d.visite_date
+        FROM
+            ta_customer c
+            LEFT JOIN ( SELECT * FROM ta_main_usher_record t WHERE t.STATUS > 0 GROUP BY t.customer_id ORDER BY t.visite_date DESC ) d ON c.customer_id = d.customer_id
+        WHERE
+            c.STATUS > 0
+            AND c.consultant_id IS NOT NULL
+        ORDER BY
+            d.visite_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

             t.create_date DESC
     </select>
 
+    <select id="getTodayAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
+        SELECT
+            *
+        FROM
+            ta_visitor_appointment t
+        WHERE
+            t.STATUS > 0
+            AND ( DATE_FORMAT( visit_date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' ) OR visit_date IS NULL )
+        ORDER BY
+            t.create_date DESC
+    </select>
+
+    <select id="miniappVisitorAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
+        SELECT
+            v.*,
+            s.username
+        FROM
+            ta_visitor_appointment v
+            LEFT JOIN sys_user s ON v.create_user = s.user_id
+        order by v.create_date desc
+    </select>
 </mapper>