From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1509 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,430 insertions(+), 79 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index a68cbb0..525300d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -3,39 +3,44 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.config.DataSyncConfig;
-import com.doumee.config.SpringContextUtil;
 import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.*;
 import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
 import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
 import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkInfoRequest;
-import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitDataRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitInfoRequest;
-import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.haikang.model.param.request.event.parks.*;
+import com.doumee.core.haikang.model.param.request.event.visit.*;
+import com.doumee.core.haikang.service.HKService;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DESUtil;
 import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
 import com.doumee.dao.business.join.VisitsJoinMapper;
 import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.model.SystemUser;
-import com.doumee.service.business.DeviceEventService;
-import com.doumee.service.business.InterfaceLogService;
-import com.doumee.service.business.MemberService;
-import com.github.yulichang.interfaces.MPJBaseJoin;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
+import com.doumee.service.business.VisitsService;
+import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
+import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.TmsOrderInfoRequest;
+import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 璁垮鏉冮檺缁勪俊鎭〃Service瀹炵幇
@@ -46,6 +51,8 @@
 @Slf4j
 public class HkSyncPushServiceImpl extends HkSyncBaseServiceImpl {
 
+    @Autowired
+    private InoutDayCountMapper inoutDayCountMapper;
     @Autowired
     private InterfaceLogMapper interfaceLogMapper;
     @Autowired
@@ -63,11 +70,44 @@
     @Autowired
     private CarEventMapper carEventMapper;
     @Autowired
+    private CategoryMapper categoryMapper;
+    @Autowired
     private VisitEventMapper visitEventMapper;
     @Autowired
     private VisitsJoinMapper visitsMapper;
     @Autowired
     private RetentionMapper retentionMapper;
+    @Autowired
+    private InoutRecordMapper inoutRecordMapper;
+    @Autowired
+    private PlatformMapper platformMapper;
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
+    private PlatformDeviceMapper platformDeviceMapper;
+    @Autowired
+    private PlatformBroadcastLogMapper platformBroadcastLogMapper;
+    @Autowired
+    private PlatformJobMapper platformJobMapper;
+    @Autowired
+    private TmsService tmsService;
+    @Autowired
+    private VisitsService visitsService;
+    @Autowired
+    private PlatformWmsDetailMapper platformWmsDetailMapper;
+    @Autowired
+    private PlatformEventMapper platformEventMapper;
+    @Autowired
+    private PlatformLogMapper platformLogMapper;
+    @Autowired
+    private PlatformWarnEventServiceImpl platformWarnEventService;
+
+
+
+
+
+
+
     /**
      * 娴峰悍闂ㄧ浜嬩欢鎺ㄩ��
      * @param param
@@ -87,32 +127,40 @@
             List<DeviceEvent> list = new ArrayList<>();
             List<Integer> delRetentionLis = new ArrayList<>();
             List<Retention> retentionList = new ArrayList<>();
+            List<InoutRecord> inoutRecordList = new ArrayList<>();
+            InoutDayCount inoutDayCount = new InoutDayCount();
             for(EventAcsInfoRequest request : events){
                 EventDeviceDataRequest model = request.getData();
                 if(model ==null){
                     continue;
                 }
                 //鏍规嵁鎺ㄩ�佷汉鍛樼紪鐮侊紝澶勭悊鍦ㄥ満銆佺鍦轰汉鍛樻暟鎹褰�
-                dealMemberDataByRequest(request,delRetentionLis,retentionList);
+                dealMemberDataByRequest(request,delRetentionLis,retentionList,inoutDayCount,inoutRecordList);
                 //灏佽闂ㄧ浜嬩欢淇℃伅琛ㄥ璞�
                 list.add(getDeviceEventModelByRequest(request));
             }
             if(list.size()>0){
                 //鎻掑叆闂ㄧ璁板綍
-                deviceEventMapper.insertBatchSomeColumn(list);
+                deviceEventMapper.insert(list);
             }
             if(delRetentionLis.size()>0){
                 //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
                 retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
-                        .eq(Retention::getType,Constants.memberType.internal)
+//                        .eq(Retention::getType,Constants.memberType.internal)
                         .in(Retention::getMemberId,delRetentionLis));
             }
             if(retentionList.size()>0){
                 //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
-                retentionMapper.insertBatchSomeColumn(retentionList);
+                retentionMapper.insert(retentionList);
             }
-            log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
+            if(inoutRecordList.size()>0){
+                //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
+                inoutRecordMapper.insert(inoutRecordList);
+            }
+            dealInoutDayCountBiz(inoutDayCount);
+            log.info("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
         }catch (Exception e) {
+            e.printStackTrace();
             log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
         }finally {
             saveInterfaceLog(param,"/business/hksync/push/acs",result,false);//涓嶈鏃ュ織
@@ -121,27 +169,120 @@
 
     }
 
+    private void dealInoutDayCountBiz(InoutDayCount param) {
+        if(param == null){
+            param = new InoutDayCount();
+        }
+        param.setTimeInfo(Utils.Date.getStart(new Date()));
+        InoutDayCount model = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>().lambda()
+                .eq(InoutDayCount::getTimeInfo,param.getTimeInfo())
+                .eq(InoutDayCount::getIsdeleted,Constants.ZERO)
+                .last("limit 1"));
+        log.error("============================inoutDayCountMapper:"+JSONObject.toJSONString(param));
+        if(model == null){
+            param.setIsdeleted(Constants.ZERO);
+            param.setCreateDate(new Date());
+            param.setEditDate(new Date());
+            inoutDayCountMapper.insert(param);
+        }else{
+            inoutDayCountMapper.update(null,new UpdateWrapper<InoutDayCount>().lambda()
+                    .eq(InoutDayCount::getId,model.getId() )
+                    .set(InoutDayCount::getEditDate,new Date() )
+                    .setSql(param.getInCarNum()!=null,"IN_CAR_NUM = ifnull(IN_CAR_NUM,0)+"+param.getInCarNum() )
+                    .setSql(param.getOutCarNum()!=null,"OUT_CAR_NUM = ifnull(OUT_CAR_NUM,0)+"+param.getOutCarNum() )
+                    .setSql(param.getInMemberNum()!=null,"IN_MEMBER_NUM = ifnull(IN_MEMBER_NUM,0)+"+param.getInMemberNum() )
+                    .setSql(param.getOutMemberNum()!=null,"OUT_MEMBER_NUM = ifnull(OUT_MEMBER_NUM,0)+"+param.getOutMemberNum() )
+                    .setSql(param.getInVisitorNum()!=null,"IN_VISITOR_NUM = ifnull(IN_VISITOR_NUM,0)+"+param.getInVisitorNum() )
+                    .setSql(param.getOutVisitorNum()!=null,"OUT_VISITOR_NUM = ifnull(OUT_VISITOR_NUM,0)+"+param.getOutVisitorNum() )
+                    .setSql(param.getSigninVisitorNum()!=null,"SIGNIN_VISITOR_NUM = ifnull(SIGNIN_VISITOR_NUM,0)+"+param.getSigninVisitorNum() )
+                    .setSql(param.getLeaveVisitorNum()!=null,"LEAVE_VISITOR_NUM = ifnull(LEAVE_VISITOR_NUM,0)+"+param.getLeaveVisitorNum() )
+                    .setSql(param.getInOtherMemberNum()!=null,"IN_OTHER_MEMBER_NUM = ifnull(IN_OTHER_MEMBER_NUM,0)+"+param.getInOtherMemberNum() )
+                    .setSql(param.getOutOtherMemberNum()!=null,"OUT_OTHER_MEMBER_NUM = ifnull(OUT_OTHER_MEMBER_NUM,0)+"+param.getOutOtherMemberNum() )
+                    .setSql(param.getInSelfMemberNum()!=null,"IN_SELF_MEMBER_NUM = ifnull(IN_SELF_MEMBER_NUM,0)+"+param.getInSelfMemberNum() )
+                    .setSql(param.getOutSelfMemberNum()!=null,"OUT_SELF_MEMBER_NUM = ifnull(OUT_SELF_MEMBER_NUM,0)+"+param.getOutSelfMemberNum() )
+            );
+        }
+    }
+
     /**
      * 鏍规嵁鎺ㄩ�佷汉鍛樼紪鐮侊紝澶勭悊鍦ㄥ満銆佺鍦轰汉鍛樻暟鎹褰�
      * @param request
      * @param delRetentionLis
      * @param retentionList
      */
-    private void dealMemberDataByRequest(EventAcsInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList) {
+    private void dealMemberDataByRequest(EventAcsInfoRequest request
+            , List<Integer> delRetentionLis
+            , List<Retention> retentionList
+            ,InoutDayCount inoutDayCount
+            ,List<InoutRecord> inoutRecordList) {
         //娴峰悍浜哄憳缂栫爜
         String userNo = request.getData().getExtEventPersonNo();
         if(StringUtils.isNotBlank(userNo)){
-            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,userNo).last("limit 1"));
-            if(member !=null){
-                //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
-                Device d = deviceMapper.selectOne(new QueryWrapper<Device>().lambda()
-                        .eq(Device::getDoorId,request.getSrcIndex())
-                        .eq(Device::getIsdeleted,Constants.ZERO)
-                        .last("limit 1" ));
-                delRetentionLis.add(member.getId());
-                if(!(Constants.equalsInteger(d.getIsEntrance(),Constants.ONE) && Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE)){
+            Member member = memberMapper.selectJoinOne(Member.class,new MPJLambdaWrapper<Member>()
+                    .selectAll(Member.class)
+                    .selectAs(Company::getCompanyNamePath,Member::getCompanyNamePath)
+                    .selectAs(Company::getType,Member::getCompanyType)
+                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+                    .eq(Member::getHkId,userNo)
+                    .eq(Member::getIsdeleted,Constants.ZERO)
+                    .last("limit 1"));
+            //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+            Device d = deviceMapper.selectOne(new QueryWrapper<Device>().lambda()
+                    .eq(Device::getDoorId,request.getSrcIndex())
+                    .eq(Device::getIsdeleted,Constants.ZERO)
+                    .last("limit 1" ));
+            InoutRecord record = new InoutRecord();
+            record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+            record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
+            record.setType(Constants.ONE);//浜哄憳
+            record.setDeviceName(request.getSrcName());
+            record.setMemberType(Constants.RetentionMemberType.fk);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
+            record.setIsdeleted(Constants.ZERO);
+            record.setHkEventId(request.getEventId());
+            record.setHkId(userNo);
+            if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
+                if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
                     //濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
-                    retentionList.add(getRetentionModelByRequest(member,request));
+                    record.setInOrOut(Constants.ZERO);
+                    inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
+                }else{
+                    //濡傛灉鏄嚭闂�
+                    record.setInOrOut(Constants.ONE);
+                    inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);//绂诲満浜烘
+                }
+            }
+            if(member !=null){
+                record.setMemberId(member.getId());
+                record.setMemberName(member.getName());
+                record.setMemberPhone(member.getPhone());
+                record.setObjId(member.getId());
+                record.setObjType(Constants.ONE);
+                record.setCompanyId(member.getCompanyId());
+                record.setCompanyName(member.getCompanyNamePath());
+                if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
+                    delRetentionLis.add(member.getId());
+                    if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
+                        //濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+                        if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+                            record.setMemberType(Constants.RetentionMemberType.internalMember);
+                            inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
+                        }else{
+                            record.setMemberType(Constants.RetentionMemberType.relMember);
+                            inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
+                        }
+                        retentionList.add(getRetentionModelByRequest(member,request,record.getMemberType()));
+                    }else{
+                        if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+                            record.setMemberType(Constants.RetentionMemberType.internalMember);
+                            inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);//鍐呴儴浜哄憳鍑哄満浜烘
+                        }else{
+                            record.setMemberType(Constants.RetentionMemberType.relMember);
+                            inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
+                        }
+                    }
+                    if(record.getMemberType()!=null){
+                        inoutRecordList.add(record);
+                    }
                 }
             }
         }
@@ -231,7 +372,7 @@
      * @param request
      * @return
      */
-    private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request) {
+    private Retention getRetentionModelByRequest(Member member, EventAcsInfoRequest request,int memberType) {
         Retention retention = new Retention();
         retention.setIsdeleted(Constants.ZERO);
         retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -241,7 +382,7 @@
         retention.setIdcardDecode(member.getIdcardDecode());
         retention.setName(member.getName());
         retention.setBirthday(member.getBirthday());
-        retention.setType(member.getType());
+        retention.setType(memberType);
         retention.setCompanyId(member.getCompanyId());
         retention.setCompanyName(member.getCompanyName());
         retention.setEventCode(request.getData().getExtEventCode()+"");
@@ -252,7 +393,6 @@
         retention.setMemberId(member.getId());
         retention.setDeviceName(request.getSrcName());
         retention.setDeviceIndex(request.getSrcIndex());
-
         return retention;
     }
 
@@ -289,7 +429,7 @@
             }
             if(list.size()>0){
                 //鎻掑叆闂ㄧ璁板綍
-                visitEventMapper.insertBatchSomeColumn(list);
+                visitEventMapper.insert(list);
             }
             if(delRetentionLis.size()>0){
                 //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
@@ -299,9 +439,9 @@
             }
             if(retentionList.size()>0){
                 //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
-                retentionMapper.insertBatchSomeColumn(retentionList);
+                retentionMapper.insert(retentionList);
             }
-            log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
+            log.info("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
         }catch (Exception e){
 
             log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========澶辫触=======锛歕n"+e.getMessage());
@@ -311,6 +451,288 @@
 
     }
 
+    /**
+     * 娴峰悍璁垮浜嬩欢鎺ㄩ��
+     * @param param
+     * @param response
+     * @return
+     */
+    @Override
+    public String     dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response){
+        log.info("銆愭捣搴疯瀹簨浠舵帹閫併��==========寮�濮�=======锛歕n"+JSONObject.toJSONString(param));
+        String result = null;
+        try {
+            if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+                return null;
+            }
+            //闂ㄧ浜嬩欢闆嗗悎
+            List<EventVisitIccmInfoRequest> events  = param.getParams().getEvents();
+            List<VisitEvent> list = new ArrayList<>();
+            List<Integer> delRetentionLis = new ArrayList<>();
+            List<Retention> retentionList = new ArrayList<>();
+            List<InoutRecord> inoutRecordList = new ArrayList<>();
+            InoutDayCount inoutDayCount = new InoutDayCount();
+            for(EventVisitIccmInfoRequest request : events){
+                if(request.getData() ==null || request.getData().getVisitorInvoices() ==null){
+                    continue;
+                }
+                if(request.getData().getVisitorInformationList() == null || request.getData().getVisitorInformationList().size() ==0){
+                    continue;
+                }
+                //娴峰悍璁垮璁板綍缂栫爜
+                dealVisitDataByRequstIccm(request,delRetentionLis,retentionList,inoutDayCount,inoutRecordList);
+                list.add(getVisitEventModelByRequestIccm(request,request.getData().getVisitorInformationList().get(0)));
+            }
+            if(list.size()>0){
+                //鎻掑叆闂ㄧ璁板綍
+                visitEventMapper.insert(list);
+            }
+            if(delRetentionLis.size()>0){
+                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
+                retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+                        .eq(Retention::getType,Constants.memberType.visitor)
+                        .in(Retention::getMemberId,delRetentionLis));
+            }
+            if(retentionList.size()>0){
+                //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
+                retentionMapper.insert(retentionList);
+            }
+            if(inoutRecordList.size()>0){
+                //鎵归噺鎻掑叆浜哄憳鍑哄叆璁板綍
+                inoutRecordMapper.insert(inoutRecordList);
+            }
+            dealInoutDayCountBiz(inoutDayCount);
+            log.info("銆愭捣搴疯瀹簨浠舵帹閫併��========鎴愬姛=======");
+        }catch (Exception e){
+            log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========澶辫触=======锛歕n"+e.getMessage());
+        }
+        saveInterfaceLog(param,"/business/hksync/push/visitIccm",result,true);
+        return  null;
+    }
+
+    /**
+     *  鏍规嵁璁垮鎺ㄩ�佽瀹㈣褰曠紪鐮侊紝澶勭悊璁垮璁板綍銆佸湪鍦轰汉鍛樼瓑淇℃伅
+     */
+    private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request
+            , List<Integer> delRetentionLis
+            , List<Retention> retentionList
+            ,  InoutDayCount inoutDayCount
+            ,List<InoutRecord> inoutRecordList) {
+        EventVisitIccmDataRequest model = request.getData();
+        EventVisitIccmInvoiceParamRequest data =  request.getData().getVisitorInvoices();
+        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(Visits.class);
+        queryWrapper.selectAs(Member::getType,Visits::getMemberType);
+        queryWrapper.eq(Visits::getHkId,model.getVisitorInvoices().getInvoicesNo() );//璁垮鍗曞彿
+        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getMemberId );
+        queryWrapper.last("limit 1");
+        Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
+        if(visits !=null){
+            if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){
+                //濡傛灉鏄紛鍒╁ぇ灞忛」鐩紝涓嶅仛澶勭悊
+                return;
+            }
+            Visits updateVistis = new Visits();
+            updateVistis.setId(visits.getId());
+            if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_IN.getKey()) {
+                //濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+                //retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
+                //鏉ヨ鏃堕棿
+                if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
+                    inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1);
+                    updateVistis.setStatus(Constants.VisitStatus.signin);
+                    updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+                    updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+                }
+                //鏇存柊鏈�鏂版潵璁挎椂闂�
+                Member member = new Member();
+                member.setLastVisitDate(updateVistis.getInDate());
+                member.setId(visits.getMemberId());
+                memberMapper.updateById(member);
+            }else if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey())  {
+                //濡傛灉鏄瀹㈢绂讳簨浠�
+                if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)){
+                    inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+                    updateVistis.setStatus(Constants.VisitStatus.signout);
+                    updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+                    updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+                    updateVistis.setOutType(Constants.ZERO);
+                    updateVistis.setOutInfo("璁垮姝e父绛剧");
+                }
+                delRetentionLis.add(visits.getMemberId());
+            }else  if(!(request.getData().getParamValues()!=null
+                        && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
+                        && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex()))){
+                //鍙鐞嗚瀹㈤棬绂侀�氳閫氳锛�
+                //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+                delRetentionLis.add(visits.getMemberId());
+                InoutRecord record = new InoutRecord();
+                record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+                        request.getData().getParamValues().getSrcName():request.getSrcName());
+                record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+                record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
+                record.setType(Constants.ONE);//浜哄憳
+                record.setMemberType(Constants.RetentionMemberType.fk);
+                record.setIsdeleted(Constants.ZERO);
+                record.setMemberName(visits.getName());
+                record.setObjId(visits.getId());
+                record.setMemberId(visits.getMemberId());
+                record.setObjType(Constants.TWO);
+                record.setMemberPhone(visits.getPhone());
+                record.setCompanyName(visits.getCompanyName());
+                record.setInOrOut(Constants.ZERO);
+                record.setHkEventId(request.getEventId());
+                record.setHkId(visits.getHkId());
+                record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+                        request.getData().getParamValues().getSrcName():request.getSrcName());
+                //濡傛灉鏄瀹㈤�氳
+                if(request.getData()!=null
+                        &&request.getData().getParamValues()!=null
+                        &&StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+                    //濡傛灉鏄瀹㈣繘鍏ワ紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+                    Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
+                    r.setCarNo(request.getData().getParamValues().getPlateNos());
+                    r.setAccessType(request.getData().getParamValues().getAccessType());
+                    r.setDeviceName(request.getData().getParamValues().getSrcName());
+                    r.setDeviceIndex(request.getData().getParamValues().getSrcIndex());
+                    retentionList.add(r);
+                    inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
+                    record.setInOrOut(Constants.ZERO);//杩涘叆鍥尯
+                }
+                if(request.getData()!=null&&request.getData().getParamValues()!=null &&
+                        !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+                    inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+                    record.setInOrOut(Constants.ONE);//绂诲洯
+                }
+                if( request.getData().getParamValues()!=null
+                        && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
+                        && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())) {
+                    //濡傛灉鏄仠杞﹀満浜嬩欢锛岃褰曡溅杈嗙被鍨�
+                    Category category = null;
+                    record.setCarCode(request.getData().getParamValues().getPlateNos());
+                    if (StringUtils.isNotBlank(record.getCarCode())) {
+                        category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
+                                .selectAll(Category.class)
+                                .select("t4.name", Category::getParentName)
+                                .leftJoin("category t4 on t.parent_id=t4.id")
+                                .eq(Category::getIsdeleted, Constants.ZERO)
+                                .eq(Category::getBizType, Constants.RetentionCarType.fkCar)
+                                .last("limit 1"));
+                        if (category == null) {
+                            category = new Category();
+                            category.setName("璁垮杞﹁締");
+                        }
+                        category.setParentName(StringUtils.defaultString(category.getParentName(), "璁垮杞﹁締"));
+                    }
+                    record.setCarBizType(Constants.RetentionCarType.fkCar);
+                    record.setCategoryId(category.getId());
+                    record.setDeviceName(request.getData().getParamValues().getGateName());
+                    record.setCategoryName(category.getName());
+                    record.setCategoryParentId(category.getParentId());
+                    record.setCategoryParentName(category.getParentName());
+                    if (Constants.equalsInteger(record.getInOrOut(), Constants.ONE)) {
+                        record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
+                        try {
+                            //璁垮鐢宠鑷姩绛剧
+                            visitsService.visitLevelForCarOut(visits);
+                        } catch (Exception e) {
+                            log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�===========" + e.getMessage());
+                        }
+                    }
+                }
+                inoutRecordList.add(record);//杩涘嚭璁板綍
+            }
+            updateVistis.setEditDate(new Date());
+            //鏇存柊璁垮鏉ヨ鎴栬�呯绂绘椂闂翠俊鎭�
+            visitsMapper.updateById(updateVistis) ;
+        }
+    }
+    private Retention getRetentionModelByVisitRequest(Visits visits, String happentTime,String srcType) {
+        Retention retention = new Retention();
+        retention.setIsdeleted(Constants.ZERO);
+        retention.setCreateDate(DateUtil.getISO8601DateByStr2(happentTime));
+        retention.setCreateDate(retention.getCreateDate() == null?new Date():retention.getCreateDate());
+        retention.setClasses(visits.getClasses());
+        retention.setCode(visits.getCode());
+        retention.setIdcardNo(visits.getIdcardNo());
+        retention.setIdcardDecode(visits.getIdcardDecode());
+        retention.setName(visits.getName());
+        retention.setBirthday(visits.getBirthday());
+        retention.setType(visits.getMemberType());
+        retention.setCompanyId(visits.getCompanyId());
+        retention.setCompanyName(visits.getCompanyName());
+        retention.setEventCode(srcType);
+        retention.setEventDate(retention.getCreateDate());
+        retention.setFaceImg(visits.getFaceImg());
+        retention.setImgurl(visits.getImgurl());
+        retention.setPhone(visits.getPhone());
+        retention.setMemberId(visits.getMemberId());
+        return retention;
+    }
+    private VisitEvent getVisitEventModelByRequestIccm(EventVisitIccmInfoRequest request,EventVisitIccmDetailParamRequest detail) {
+        if(request.getData().getTargetPerson() ==null){
+            request.getData().setTargetPerson(new EventVisitIccmTargetParamRequest());
+        }
+        if(request.getData().getVisitorInvoices() == null){
+            request.getData().setVisitorInvoices(new EventVisitIccmInvoiceParamRequest());
+        }
+        VisitEvent event = new VisitEvent();
+        event.setIsdeleted(Constants.ZERO);
+        event.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+        if(event.getCreateDate() == null){
+            event.setCreateDate(new Date());
+        }
+        if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())  {
+            //濡傛灉鏄瀹㈤�氳浜嬩欢,杩涘叆杩涘嚭浜嬩欢
+            if(request.getData()!=null&&request.getData().getParamValues()!=null &&
+                    StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+                event.setInOrOut("0");//杩�
+            }else{
+                event.setInOrOut("1");//鍑�
+            }
+        }
+        event.setVisitorWorkUint(detail.getUnit());
+        event.setVisitorId(detail.getVisitorId());
+        event.setVisitorCode(detail.getAppointmentCode());
+        event.setTimeout(request.getTimeout());
+        event.setSvrIndexCode(request.getSrcIndex());
+        event.setHappenTime(request.getHappenTime());
+        event.setStatus(request.getStatus());
+        event.setEndTime(request.getData().getVisitorInvoices().getFinishTime());
+        event.setStartTime(request.getData().getVisitorInvoices().getBeginTime());
+        event.setSrcType(request.getSrcType());
+        event.setSrcParentIndex(request.getSrcParentIndex());
+        event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+                request.getData().getParamValues().getSrcName():request.getSrcName());
+        if(StringUtils.isBlank(event.getSrcName())){
+            event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+                    request.getData().getParamValues().getGateName()+ request.getData().getParamValues().getParkIndex():request.getSrcName());
+        }
+        event.setSrcIndex(request.getSrcIndex());
+        event.setSex(detail.getSex());
+        event.setPurpose(request.getData().getVisitorInvoices().getVisitReason());
+        event.setPhone(detail.getPhone());
+        event.setBeVisitedPersonId(request.getData().getVisitorInvoices().getVisitTargetId());
+        event.setBeVisitedPersonName(request.getData().getTargetPerson().getName());
+        event.setBeVisitedPersonOrg(request.getData().getTargetPerson().getOrgPathName());
+        event.setBeVisitedPersonOrgId(request.getData().getTargetPerson().getName());
+        event.setPhotoUrl(getHkImgUrl(detail.getFacePic()));
+        event.setPersonName(detail.getVisitorName());
+        event.setCarNo(detail.getPlateNo());
+        event.setRemark(JSONObject.toJSONString(request));
+        event.setInvoicesNo(request.getData().getVisitorInvoices().getInvoicesNo());//璁垮鍗曞彿
+        event.setIdType(detail.getCertType());
+        String idnum = detail.getCertNo();
+        if(StringUtils.isNotBlank(idnum)){
+            //韬唤璇佸彿瀛樺偍瀵嗘枃
+            event.setIdNo(DESUtil.encrypt(Constants.EDS_PWD,idnum));//韬唤璇佸彿鍔犲瘑
+            //鑴辨晱鎵嬫満鍙锋樉绀簄
+            event.setIdcardDecode(Constants.getTuominStr(idnum));
+        }
+        event.setEventType(request.getEventType());
+        event.setEventId(request.getEventId());
+        return event;
+    }
     /**
      *  鏍规嵁璁垮鎺ㄩ�佽瀹㈣褰曠紪鐮侊紝澶勭悊璁垮璁板綍銆佸湪鍦轰汉鍛樼瓑淇℃伅
      */
@@ -387,6 +809,7 @@
         event.setPhotoUrl(getHkImgUrl(request.getData().getPhotoUrl()));
         event.setPersonName(request.getData().getPersonName());
         event.setCarNo(request.getData().getCarNo());
+        event.setInvoicesNo(request.getData().getVisitorId());
         event.setCaptureUrl(request.getData().getCaptureUrl());
         if(StringUtils.isNotBlank(request.getData().getCaptureUrl())){
             event.setCaptureUrl(HKConstants.IMG_INDEX+request.getData().getCaptureUrl());
@@ -429,7 +852,6 @@
         retention.setMemberId(visits.getMemberId());
 //        retention.setDeviceName(request.getSrcName());
 //        retention.setDeviceIndex(request.getSrcIndex());
-
         return retention;
     }
 
@@ -444,7 +866,9 @@
         String result = null;
         log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========寮�濮�=========锛歕n"+JSONObject.toJSONString(param));
         try {
-            if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+            if(param == null
+                    || param.getParams() == null
+                    || param.getParams().getEvents()==null){
                 return null;
             }
             //闂ㄧ浜嬩欢闆嗗悎
@@ -452,30 +876,62 @@
             List<CarEvent> list = new ArrayList<>();
             List<Retention> retentionList = new ArrayList<>();
             List<String> delRetentionList = new ArrayList<>();
+            List<Retention> delMemberRetentionList = new ArrayList<>();
+            InoutDayCount inoutDayCount = new InoutDayCount();
+            List<InoutRecord> inoutRecordList = new ArrayList<>();
             for(EventParkInfoRequest request : events){
                 if(request.getData() ==null ||StringUtils.isBlank(request.getData().getPlateNo())){
                     continue;
                 }
                 //灏佽浜嬩欢淇℃伅琛ㄥ璞�
-                list.add(getParkEventModelByRequest(request,delRetentionList,retentionList));
+                list.add(getParkEventModelByRequest(request,delRetentionList,retentionList,delMemberRetentionList,inoutDayCount,inoutRecordList));
             }
             if(list.size()>0){
                 //鎻掑叆闂ㄧ璁板綍
-                carEventMapper.insertBatchSomeColumn(list);
+                carEventMapper.insert(list);
             }
             if(delRetentionList.size()>0){
-                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳锛�
+                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満杞﹁締浜哄憳(鍐呴儴浜哄憳锛�
                 retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                         .eq(Retention::getType,Constants.THREE)
                         .in(Retention::getCarNo,delRetentionList));
             }
+            if(delMemberRetentionList.size()>0){
+                //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鍐呴儴浜哄憳銆佺浉鍏虫柟鍜岃瀹級
+                List<Integer> memberList = new ArrayList<>();
+                for(Retention m :delMemberRetentionList){
+                    if(m.getMemberId()!=null){
+                        //璺熼殢杞﹁締鍏ュ満鐨刴ember瀛樺湪鐨勬暟鎹珛鍦�
+                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+                                .in(Retention::getType,Constants.RetentionMemberType.internalMember
+                                        ,Constants.RetentionMemberType.relMember
+                                        ,Constants.RetentionMemberType.fk
+                                        ,Constants.RetentionMemberType.driver)
+                                .eq(Retention::getMemberId,m.getMemberId()));
+                    }else  if(m.getCarNo()!=null){
+                        //璺熼殢杞﹁締鍏ュ満鐨勭敤鎴蜂俊鎭�
+                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
+                                .in(Retention::getType,Constants.RetentionMemberType.internalMember
+                                        ,Constants.RetentionMemberType.relMember
+                                        ,Constants.RetentionMemberType.fk
+                                        ,Constants.RetentionMemberType.driver)
+                                .eq(Retention::getCarNo,m.getCarNo()));
+                    }
+                }
+
+            }
             if(retentionList.size()>0){
                 //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
-                retentionMapper.insertBatchSomeColumn(retentionList);
+                retentionMapper.insert(retentionList);
             }
-            log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
+            if(inoutRecordList.size()>0){
+                //鍐嶆彃鍏ユ渶鏂扮殑浜鸿溅鍑哄叆鏄庣粏
+                inoutRecordMapper.insert(inoutRecordList);
+            }
+            dealInoutDayCountBiz(inoutDayCount);
+            log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
         }catch (Exception e){
-
+            e.printStackTrace();
             log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========澶辫触=======锛歕n"+e.getMessage());
         }
         saveInterfaceLog(param,"/business/hksync/push/parks",result,false);
@@ -487,7 +943,359 @@
      * @param request
      * @return
      */
-    private CarEvent getParkEventModelByRequest(EventParkInfoRequest request, List<String> delRetentionList , List<Retention> retentionList ) {
+    private CarEvent getParkEventModelByRequest(EventParkInfoRequest request
+            , List<String> delRetentionList
+            , List<Retention> retentionList
+            , List<Retention> delMemberRetentionList
+            , InoutDayCount inoutDayCount
+            , List<InoutRecord> inoutRecordList) {
+        CarEvent event =initCarEventModelByRequest(request);
+        if(StringUtils.isNotBlank(event.getPlateNos())){
+            //鏍囪杞﹁締杩涘嚭璁板綍
+            List<Category> categoryList = categoryMapper.selectJoinList(Category.class, new MPJLambdaWrapper<Category>()
+                    .selectAll(Category.class)
+                    .select("t4.name",Category::getParentName)
+                    .leftJoin("category t4 on t.parent_id=t4.id")
+                    .eq(Category::getIsdeleted,Constants.ZERO)
+                    .isNotNull(Category::getBizType));//鏌ヨ鎵�鏈夊甫鏈変笟鍔$被鍨嬬殑杞﹁締鍒嗙被缂栫爜
+            List<Visits> visitsList = null;
+            InoutRecord carrecord = new InoutRecord();
+            carrecord.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+            carrecord.setTimeInfo(Utils.Date.getStart(carrecord.getCreateDate()));
+            carrecord.setType(Constants.ZERO);//杞﹁締
+            carrecord.setIsdeleted(Constants.ZERO);
+            carrecord.setObjType(Constants.ZERO);
+            carrecord.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());//鍋滆溅鍦哄拰鍑哄叆鍙�
+            carrecord.setHkEventId(request.getEventId());
+            carrecord.setCarCode(event.getPlateNos());
+            Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
+                    .selectAll(Cars.class )
+                    .selectAs(Company::getType,Cars::getCompanyType)
+                    .selectAs(Member::getName,Cars::getMemberName)
+                    .selectAs(Member::getIdcardDecode,Cars::getIdcardDecode)
+                    .selectAs(Member::getCode,Cars::getMemberCode)
+                    .selectAs(Member::getFaceImg,Cars::getFaceImg)
+                    .selectAs(Member::getIdcardNo,Cars::getIdcardNo)
+                    .selectAs(Member::getName,Cars::getMemberName)
+                    .selectAs(Member::getPhone,Cars::getMemberPhone)
+                    .selectAs(Company::getCompanyNamePath,Cars::getCompanyName)
+                    .selectAs(Category::getBizType,Cars::getBizType)
+                    .selectAs(Category::getName,Cars::getCateName)
+                    .select("t4.id",Cars::getCatePId)
+                    .select("t4.name",Cars::getCatePName)
+                    .leftJoin(Company.class,Company::getId,Cars::getGroupId)
+                    .leftJoin(Member.class,Member::getId,Cars::getMemberId)
+                    .leftJoin(Category.class,Category::getId,Cars::getCateId)
+                    .leftJoin("category t4 on t3.parent_id=t4.id")
+                    .eq(Cars::getCode,event.getPlateNos())
+                    .eq(Cars::getIsdeleted,Constants.ZERO)
+                    .last(" limit 1"));
+            if(carModel!=null){
+                //0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
+                event.setMemberId(carModel.getMemberId());
+                event.setCompanyId(carModel.getGroupId());
+                //-----------------20250429鏀归��----start---------------
+                event.setCarType(carModel.getBizType()==null?Constants.RetentionCarType.self : carModel.getBizType());//杞﹁締涓氬姟绫诲瀷
+                carrecord.setObjType(Constants.FOUR);
+                carrecord.setMemberName(carModel.getMemberName());//鍙告満
+                carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
+                carrecord.setObjId(carModel.getId());
+                carrecord.setMemberId(carModel.getMemberId());
+                carrecord.setObjType(Constants.ZERO);
+                carrecord.setFaceImg(carModel.getFaceImg());
+                carrecord.setIdcardDecode(carModel.getIdcardDecode());
+                carrecord.setIdcardNo(carModel.getIdcardNo());
+                carrecord.setMemberCode(carModel.getMemberCode());
+                carrecord.setCompanyId(carModel.getGroupId());
+                carrecord.setCompanyName(carModel.getCompanyName());
+                carrecord.setCategoryId(carModel.getCateId());
+                carrecord.setCategoryName(carModel.getCateName());
+                carrecord.setCategoryParentId(carModel.getCatePId());
+                carrecord.setCategoryParentName(StringUtils.defaultString(carModel.getCatePName(),carModel.getCateName()));
+                carrecord.setType( Constants.RetentionMemberType.car);//鍙槸杞﹁締鐨勮褰�
+                if(carModel.getMemberId()!=null){
+                    if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
+                        //鍐呴儴缁勭粐
+                        carrecord.setMemberType(Constants.RetentionMemberType.internalMember);
+                    }else{
+                        //鐩稿叧鏂圭粍缁�
+                        carrecord.setMemberType( Constants.RetentionMemberType.relMember);
+                    }
+                }
+//              carrecord.setMemberPhone(carTypeJob.getDrivierPhone());
+                //-----------------20250429鏀归��----end---------------
+            }
+            if(event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other)){//濡傛灉涓鸿瘑鍒埌杞﹀瀷
+                PlatformJob carTypeJob = platformJobMapper.selectJoinOne(PlatformJob.class,
+                        new MPJLambdaWrapper<PlatformJob>(). selectAll(PlatformJob.class)
+                                .selectAs(PlatformGroup::getType,PlatformJob::getGroupType)
+                                .leftJoin(PlatformGroup.class,PlatformGroup::getId,PlatformJob::getPlatformGroupId)
+                                .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
+                                .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                                .orderByAsc(PlatformJob::getCreateDate)
+                                .last(" limit 1"));
+                if(carTypeJob!=null ) {
+                    /**
+                     * 濡傛灉闈炲浐瀹氳溅杈嗭紝妫�鏌ユ槸鍚﹁揣杩愯溅杈�
+                     * 璐ц繍杞﹁締浼樺厛绾э細
+                     * 1銆佸畨娉拌嚜鏈夎溅锛氳揣杩愯溅杈�-瀹夋嘲鐗╂祦璐ц繍杞﹁締(鍥哄畾杞﹁締涓婇潰宸插鐞嗭紝姝ゅ涓嶈�冭檻锛�
+                     * 2銆亀ms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締  瀵瑰簲grouptype涓猴細瀹夋嘲鐗╂祦鍗歌揣 2
+                     * 3銆佸畨娉扮殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-鍔犲伐鐑熷嵏璐ц溅杈�  瀵瑰簲grouptype涓�0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�
+                     * 4銆佸競鍏徃鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-甯傚叕鍙稿嵏璐ц溅杈�
+                     */
+                    carrecord.setMemberName(carTypeJob.getDriverName());//鍙告満
+                    carrecord.setMemberPhone(carTypeJob.getDrivierPhone());//鍙告満
+                    carrecord.setObjId(carTypeJob.getId());
+                    carrecord.setMemberId(carTypeJob.getDriverId());//鍙告満缂栫爜
+                    carrecord.setObjType(Constants.FOUR);
+                    carrecord.setCompanyId(carTypeJob.getCompanyId());
+                    carrecord.setCompanyName(carTypeJob.getCompanyNamePath());
+                    carrecord.setType(Constants.RetentionMemberType.car);
+                    if(carTypeJob.getDriverName()!=null || StringUtils.isNotBlank(carTypeJob.getDrivierPhone())){
+                        //璐ц繍鍙告満(濡傛灉鍙告満鎵嬫満鍙锋垨鑰呭鍚嶄笉涓虹┖锛�
+                        carrecord.setMemberType(Constants.RetentionMemberType.driver);
+                    }
+                    Category category  = null;
+                    String tempName = "";
+                    String tempPName = "";
+                    //濡傛灉闈炲浐瀹氳溅杈嗭紝鍒欐煡璇㈡槸鍚﹁揣杩愯溅杈� 浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+                    if(Constants.equalsInteger(carTypeJob.getOrigin(),Constants.ONE)){
+                        //濡傛灉鏄帹閫佺殑wms闈炶嚜鏈夎溅
+                        event.setCarType(Constants.RetentionCarType.wxysCar);//澶栧崗杞�
+                        tempName = "澶栧崗杩愯緭杞﹁締";
+                        tempPName = "璐ц繍杞﹁締";
+                    }else  if(Constants.equalsInteger(carTypeJob.getType(),Constants.FOUR)){
+                        if(Constants.equalsInteger(carTypeJob.getGroupType(),Constants.TWO)){
+                            ///瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈�
+                            tempName = "鍔犲伐鐑熷嵏璐ц溅杈�";
+                            tempPName = "璐ц繍杞﹁締";
+                            event.setCarType(Constants.RetentionCarType.jgyxhCar);//鍔犲伐鐑熷嵏璐ц溅杈�
+                        }else  if(Constants.equalsInteger(carTypeJob.getGroupType(),Constants.TWO)){
+                            //甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�
+                            tempName = "甯傚叕鍙稿嵏璐ц溅杈�";
+                            tempPName = "璐ц繍杞﹁締";
+                            event.setCarType(Constants.RetentionCarType.sgsxhCar);//甯傚叕鍙稿嵏璐ц溅杈�
+                        }
+                    }
+                    category =findCategoryByBizType(event.getCarType(),tempName,tempPName,categoryList);
+                    carrecord.setCategoryId(category.getId());
+                    carrecord.setCategoryName(category.getName());
+                    carrecord.setCategoryParentName(category.getParentName());
+                    carrecord.setCategoryParentId(category.getParentId());
+                }
+            }
+            if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+                //澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
+                dealSelTruckAutoSignBiz(request,event);
+                //濡傛灉鏄叆鍘傛斁琛�
+                delRetentionList.add(event.getPlateNos());
+                Retention dm = new Retention();
+                dm.setMemberId(event.getMemberId());
+                dm.setPhone(carrecord.getMemberPhone());
+                dm.setCarNo(event.getPlateNos());
+                delMemberRetentionList.add(dm);
+                retentionList.add(getRetentionModelByParkRequest(request,event,carrecord));//鍦ㄥ巶杞﹁締淇℃伅
+                inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
+                carrecord.setInOrOut(Constants.ZERO);
+            }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+                //濡傛灉鏄嚭鍦烘斁琛�
+                delRetentionList.add(event.getPlateNos());
+                Retention dm = new Retention();
+                dm.setMemberId(event.getMemberId());
+                dm.setPhone(carrecord.getMemberPhone());
+                dm.setCarNo(event.getPlateNos());
+                delMemberRetentionList.add(dm);
+                inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
+                carrecord.setInOrOut(Constants.ONE);
+            }
+            //杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
+            if( isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
+                //濡傛灉鏈瘑鍒埌杞﹀瀷锛屼笉鏄浐瀹氳溅 涔熶笉鏄揣杩愯溅杈嗭紝鍒欐鏌ユ槸鍚︽槸璁垮杞�
+                visitsList =  visitsMapper.selectList(new QueryWrapper<Visits>().lambda()
+                                .eq(Visits::getCarNos,event.getPlateNos())
+                                .eq(Visits::getIsdeleted,Constants.ZERO )
+                                .in(Visits::getStatus,Constants.VisitStatus.signin)//鏈�杩戜竴涓凡鍒拌揪鎴栬�呭凡绛剧
+                                .isNull(Visits::getParentId)
+                                .orderByDesc(Visits::getId)
+//                        .last("limit 1" )
+                );
+                if(visitsList!=null && visitsList.size()>0){
+                    //鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
+                    event.setMemberId(visitsList.get(0).getMemberId());
+                    event.setCarType(Constants.RetentionCarType.fkCar);
+                    int index =0;
+                    carrecord.setCarBizType(Constants.RetentionCarType.fkCar);
+                    Category category =findCategoryByBizType(Constants.RetentionCarType.fkCar,"璁垮杞﹁締","璁垮杞﹁締",categoryList);
+                    carrecord.setCategoryId(category.getId());
+                    carrecord.setCategoryName(StringUtils.defaultString(category.getName(),"璁垮杞﹁締"));
+                    carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+                    carrecord.setCategoryParentId(category.getParentId());
+                    for(Visits v :visitsList){
+//                        if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
+                            Retention dm = new Retention();
+                            dm.setMemberId(event.getMemberId());
+                            dm.setPhone(carrecord.getMemberPhone());
+                            dm.setCarNo(event.getPlateNos());
+                            delMemberRetentionList.add(dm);
+//                            delMemberRetentionList.add(event.getMemberId());
+                            InoutRecord copyObj = new InoutRecord();
+                            BeanUtils.copyProperties(carrecord,copyObj);
+                            copyObj.setMemberId(v.getMemberId());
+                            copyObj.setMemberName(v.getName());
+                            copyObj.setMemberPhone(v.getPhone());
+                            copyObj.setCompanyName(v.getCompanyName());
+                            copyObj.setType(Constants.ONE);
+                            copyObj.setRemark("璁垮璺熼殢杞﹁締銆�"+carrecord.getCarCode()+"銆戠鍥�");
+                            copyObj.setCarCode(index>0?null:carrecord.getCarCode());
+                            copyObj.setMemberType(Constants.RetentionMemberType.fk);
+                            inoutRecordList.add(copyObj);
+                            index++;
+                            if(Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)){
+                                //濡傛灉鏄溅杈嗗嚭鍥尯 缁熻璁垮杩涘叆鏁�
+                                inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+                                try {
+                                    //璁垮鐢宠鑷姩绛剧
+                                    visitsService.visitLevelForCarOut(v);
+                                    //缁熻绛剧鏁�
+                                    inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+                                }catch (Exception e){
+                                    log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+                                }
+                            }else{
+                                //濡傛灉鏄繘鍏ュ洯鍖猴紝璁垮褰曞叆鍦ㄥ洯浜哄憳璁板綍
+                                retentionList.add(getRetentionModelByRequest(copyObj,request));
+                                //缁熻璁垮鍑鸿鏁�
+                                inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
+                            }
+                        }
+//                    }
+                }
+            }
+            if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
+                //褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
+                dealNotFkCarMemberBiz(event,request,carrecord,retentionList,inoutDayCount,inoutRecordList);
+            }
+        }
+        return event;
+    }
+
+    private boolean isCarInOrOutEvent(EventParkInfoRequest request) {
+        if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey() ||
+                Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
+            return  true;
+        }
+        return  false;
+    }
+
+    private void dealNotFkCarMemberBiz( CarEvent event ,EventParkInfoRequest request, InoutRecord carrecord,List<Retention> retentionList,InoutDayCount inoutDayCount,List<InoutRecord> inoutRecordList) {
+        //褰曞叆闈炶瀹㈢被鍨嬭溅杈嗚繘鍑鸿褰�
+        carrecord.setCarBizType(event.getCarType()==null?Constants.RetentionCarType.other:event.getCarType());
+        if(carrecord.getMemberId()!=null
+                && (Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)
+                ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)
+                ||Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.driver))){
+            if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ZERO)) {
+                //濡傛灉鏄繘鍏�
+                retentionList.add(getRetentionModelByRequest(carrecord,request));
+                if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+                    //濡傛灉鏄浉鍏虫柟浜哄憳锛岀粺璁′粖鏃ョ疮璁℃暟
+                    inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);
+                }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+                    //濡傛灉鏄唴閮ㄤ汉鍛�,缁熻浠婃棩绱鏁�
+                    inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);
+                }
+                //缁熻浠婃棩鍏ュ洯鎬讳汉娆�
+                inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
+            }else if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
+                //濡傛灉鏄嚭鍥尯
+                if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
+                    //濡傛灉鏄浉鍏虫柟锛岀粺璁′粖鏃ョ疮璁℃暟
+                    inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);
+                }else if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.internalMember)){
+                    //濡傛灉鏄唴閮ㄤ汉鍛橈紝缁熻浠婃棩绱鏁�
+                    inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);
+                }
+                //缁熻浠婃棩鍑哄洯鎬讳汉娆�
+                inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
+            }
+        }
+        if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+            carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+            carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+        }
+        inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+    }
+
+    private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
+        if(categoryList!=null){
+            for(Category category :categoryList){
+                if(Constants.equalsInteger(carType,category.getBizType())){
+                    if(StringUtils.isBlank(category.getParentName() )){
+                        category.setParentName(category.getName());
+                    }
+                    return category;
+                }
+            }
+        }
+        Category category  = new Category();
+        category.setName(tempname);
+        category.setParentName(pName);
+        return category;
+    }
+
+    private void dealSelTruckAutoSignBiz(EventParkInfoRequest request, CarEvent event) {
+        ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
+                .eq(ParkBook::getCarCode,event.getPlateNos())
+                .eq(ParkBook::getHkStatus,Constants.ONE )
+                .eq(ParkBook::getIsdeleted,Constants.ZERO )
+                .last("limit 1" ));
+        if(cars!=null){
+            event.setMemberId(cars.getMemberId());
+            //鑷湁杞�  鏌ヨ褰撳墠鏄惁鏈夊緟绛惧埌鐨勪换鍔�
+            if(carsMapper.selectCount(new QueryWrapper<Cars>()
+                    .lambda().eq(Cars::getCode,event.getPlateNos())
+                    .eq(Cars::getType,Constants.ONE)
+                    .eq(Cars::getIsdeleted,Constants.ZERO)
+            )>Constants.ZERO){
+                //鏌ヨ杞﹁締褰撳墠鏄惁瀛樺湪杩涜涓殑浠诲姟
+                if( platformJobMapper.selectCount(new QueryWrapper<PlatformJob>().lambda()
+                        .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
+                        .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                        .in(PlatformJob::getStatus,
+                                Constants.PlatformJobStatus.IN_WAIT.getKey(),
+                                Constants.PlatformJobStatus.CALLED.getKey(),
+                                Constants.PlatformJobStatus.WAIT_CALL.getKey(),
+                                Constants.PlatformJobStatus.WORKING.getKey(),
+                                Constants.PlatformJobStatus.TRANSFERING.getKey(),
+                                Constants.PlatformJobStatus.OVER_NUMBER.getKey(),
+                                Constants.PlatformJobStatus.EXCEPTION.getKey()
+                        )
+                )==Constants.ZERO){//濡傛灉娌¤繘琛屼腑浠诲姟
+                    PlatformJob platformJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+                            .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
+                            .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+                            .in(PlatformJob::getStatus,
+                                    Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),
+                                    Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
+                            )
+                            .orderByAsc(PlatformJob::getCreateDate)
+                            .last(" limit 1")
+                    );
+                    if(Objects.nonNull(platformJob)){
+                        if(Constants.equalsInteger(platformJob.getType(),Constants.ONE)){
+                            //濡傛灉鏄嚜鏈夎溅瑁呰揣鑷姩绛惧埌
+                            jobAutoSignBiz(platformJob);
+                        }else  if(Constants.equalsInteger(platformJob.getType(),Constants.ZERO)){
+                            //濡傛灉鏄嚜鏈夎溅鍗歌揣 鏌ヨTMS鍚堝悓鐘舵�侊紝鍐冲畾鏄惁鑷姩绛惧埌
+                            checkTmsContractStatusBiz(platformJob);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private CarEvent initCarEventModelByRequest(EventParkInfoRequest request) {
         CarEvent event = new CarEvent();
         event.setIsdeleted(Constants.ZERO);
         event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -506,7 +1314,6 @@
         event.setSrcName(request.getSrcName());
         event.setSrcIndex(request.getSrcIndex());
         event.setRoadwayType(request.getData().getRoadwayType());
-        event.setRoadwayName(request.getData().getRoadwayName());
         event.setRoadwayIndex(request.getData().getRoadwayIndex());
         event.setPlateType(request.getData().getPlateType());
         event.setTimeout(request.getTimeout());
@@ -519,13 +1326,14 @@
         event.setInoutType(request.getData().getInoutType());
         event.setHappenTime(request.getHappenTime());
         event.setGateName(request.getData().getGateName());
+        event.setRoadwayName(request.getData().getRoadwayName());
         event.setGateIndex(request.getData().getGateIndex());
         event.setEventType(request.getEventType());
         event.setEventIndex(request.getData().getEventIndex());
         event.setEventCmd(request.getData().getEventCmd());
         event.setCardNo(request.getData().getCardNo());
         event.setCarAttributeName(request.getData().getCarAttributeName());
-
+        event.setCarType(Constants.RetentionCarType.other);//榛樿鏈櫥璁拌溅杈�
         if(request.getData().getInResult()!=null && request.getData().getInResult().getRlsResult() !=null ){
             //鏀捐鏂瑰紡
             event.setReleaseWay(request.getData().getInResult().getRlsResult().getReleaseWay());
@@ -534,52 +1342,92 @@
             event.setReleaseResult(request.getData().getInResult().getRlsResult().getReleaseResult());
             event.setReleaseResultEx(request.getData().getInResult().getRlsResult().getReleaseResultEx());
         }
-
         if(request.getData().getPicUrl()!=null){
             //杞﹁締鍜屽拰杞︾墝鐓х墖
             event.setVehiclePicUrl(getHkImgUrl(request.getData().getPicUrl().getVehiclePicUrl()));
             event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
         }
-        if(StringUtils.isNotBlank(event.getPlateNos())){
-            ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
-                    .eq(ParkBook::getCarCode,event.getPlateNos())
-                            .eq(ParkBook::getIsdeleted,Constants.ZERO )
-                    .last("limit 1" ));
-            if(cars!=null){
-                event.setMemberId(cars.getMemberId());
-            }else{
-                Visits visits =  visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
-                        .eq(Visits::getCarNos,event.getPlateNos())
-                        .eq(Visits::getIsdeleted,Constants.ZERO )
-                        .in(Visits::getStatus,Constants.VisitStatus.signin,Constants.VisitStatus.signout)//鏈�杩戜竴涓凡鍒拌揪鎴栬�呭凡绛剧
-                        .isNull(Visits::getParentId)
-                        .orderByDesc(Visits::getId)
-                        .last("limit 1" ));
-                if(visits!=null){
-                    //鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
-                    event.setMemberId(visits.getMemberId());
-                }
-            }
-            if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
-                //濡傛灉鏄叆鍘傛斁琛�
-                delRetentionList.add(event.getPlateNos());
-                retentionList.add(getRetentionModelByParkRequest(request));
-            }else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
-                //濡傛灉鏄嚭鍦烘斁琛�
-                delRetentionList.add(event.getPlateNos());
+        return event;
+    }
+
+    /**
+     * 锛涘鏋滄槸鍗歌揣浠诲姟锛岄渶瑕侀�氳繃TMS鎻愪緵鐨勨��2.2鍚堝悓鍒楄〃鎺ュ彛鈥濇帴鍙f煡璇㈣溅杈嗗搴旂殑鍚堝悓鐘舵�佹槸鍚︿负鍦ㄩ�旂姸鎬侊紙瀵瑰簲orderStatus鍊间负3/4/5/6锛夛紝
+     * 濡傛灉鏄嚜鍔ㄧ鍒帮紝鍚﹀垯涓嶈嚜鍔ㄧ鍒帮紱濡傛灉涓�涓溅杈嗗搴斿涓悎鍚屽彿锛屽垯鍙栬繍鍗曚笅浠讳竴鍚堝悓鏌ヨ瀵瑰簲鍦ㄩ�斾俊鎭�
+     * @param platformJob
+     */
+    private void checkTmsContractStatusBiz(PlatformJob platformJob) {
+        PlatformWmsDetail detail = platformWmsDetailMapper.selectOne(new QueryWrapper<PlatformWmsDetail>().lambda()
+                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
+                .eq(PlatformWmsDetail::getJobId, platformJob.getId())
+                .isNotNull(PlatformWmsDetail::getContractNum)
+                .last("limit 1")
+        );
+        if(detail!=null && StringUtils.isNotBlank(detail.getContractNum())){
+            TmsOrderInfoRequest param = new TmsOrderInfoRequest();
+            param.setContractNumber(detail.getContractNum());
+            TmsOrderInfoResponse response = tmsService.orderInfo(param);
+            if(response!=null &&( StringUtils.equals(response.getOrderStatus(),"3")  )
+                    ||StringUtils.equals(response.getOrderStatus(),"4")
+                    ||StringUtils.equals(response.getOrderStatus(),"5")
+                    ||StringUtils.equals(response.getOrderStatus(),"6")){
+                //濡傛灉鍚堝悓鍦ㄩ�旓紝鍒欒嚜鍔ㄧ鍒�
+                jobAutoSignBiz(platformJob);
             }
         }
 
-        return event;
-
     }
 
-    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
+    private void jobAutoSignBiz(PlatformJob platformJob) {
+        platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
+        platformJob.setArriveDate(new Date());
+        platformJob.setSingType(Constants.TWO);
+        platformJob.setSignDate(new Date());
+        List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null  "));
+        if(CollectionUtils.isEmpty(signList)){
+            platformJob.setSignNum(Constants.ONE);
+        } else{
+            int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
+            platformJob.setSignNum(maxNumber + Constants.ONE);
+        }
+        platformJobMapper.updateById(platformJob);
+    }
+    private Retention getRetentionModelByRequest(InoutRecord inoutRecord, EventParkInfoRequest request) {
+        Retention retention = new Retention();
+        retention.setIsdeleted(Constants.ZERO);
+        retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
+        retention.setCode(inoutRecord.getMemberCode());
+        retention.setIdcardNo(inoutRecord.getIdcardNo());
+        retention.setIdcardDecode(inoutRecord.getIdcardDecode());
+        retention.setName(inoutRecord.getMemberName());
+        retention.setType(inoutRecord.getMemberType());
+        retention.setCompanyId(inoutRecord.getCompanyId());
+        retention.setCompanyName(inoutRecord.getCompanyName());
+        retention.setEventCode(request.getEventType()+"");
+        retention.setEventDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
+        retention.setFaceImg(inoutRecord.getFaceImg());
+        retention.setPhone(inoutRecord.getMemberPhone());
+        retention.setMemberId(inoutRecord.getMemberId());
+        retention.setDeviceName(request.getSrcName());
+        retention.setDeviceIndex(request.getSrcIndex());
+        retention.setCarNo(inoutRecord.getCarCode());
+        retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
+        retention.setRemark("璺熼殢杞﹁締銆�"+inoutRecord.getCarCode()+"銆戝叆鍥尯");
+        return retention;
+    }
+    private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event ,InoutRecord carrecord ) {
         Retention retention = new Retention();
         retention.setIsdeleted(Constants.ZERO);
         retention.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
         retention.setCarNo(request.getData().getPlateNo());
         retention.setType(Constants.THREE);
+        retention.setMemberId(event.getMemberId());
+        retention.setCarType(event.getCarType());
+        retention.setCompanyId(event.getCompanyId());
+        retention.setCategoryId(carrecord.getCategoryId());
+        retention.setCategoryName(carrecord.getCategoryName());
+        retention.setCategoryParentId(carrecord.getCategoryParentId());
+        retention.setCategoryParentName(carrecord.getCategoryParentName());
+        retention.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());
 //        retention.setDeviceName(request.getSrcName());
 //        retention.setDeviceIndex(request.getSrcIndex());
 
@@ -603,5 +1451,508 @@
         interfaceLogMapper.insert(hkMonitoryLogDO);
     }
 
+    /**
+     * 澶勭悊鏈堝彴宸ヤ綔鐘舵�佷簨浠惰闃呭悗鎺ㄩ�佹暟鎹�昏緫閫昏緫
+     * @param param
+     * @param response
+     * @return
+     */
+    @Override
+    public String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response){
+        log.info("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========寮�濮�=========锛歕n"+JSONObject.toJSONString(param));
+        String result = null;
+        try {
+            if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+                return null;
+            }
+            //闂ㄧ浜嬩欢闆嗗悎
+            List<EventPlatformInfoRequest> events  = param.getParams().getEvents();
+            List<Platform> list = new ArrayList<>();
+            for(EventPlatformInfoRequest request : events){
+                EventPlatformDataRequest   data = request.getData();
+                if(data ==null ){
+                    continue;
+                }
+                Integer  workStatus = 0;
+                if( data.getHPWorkingStatus() ==null ||  data.getHPWorkingStatus().size() ==0){
+                    continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
+                }
+                PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
+                        .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
+                        .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+                        .last("limit 1"));
+                if(model ==null){
+                    continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
+                }
+                //鍚勮溅閬撹溅杈嗙姸鎬�
+                for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){
 
+                }
+            }
+            result = "鎴愬姛";
+            log.info("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
+        }catch (Exception e) {
+            result = "澶辫触"+e.getMessage();
+            log.error("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
+        }finally {
+            saveInterfaceLog(param,"/business/hksync/push/platform/workstatus",result,false);//涓嶈鏃ュ織
+        }
+        return  null;
+    }
+    /**
+     * 澶勭悊鏈堝彴杞﹁締鐘舵�佷簨浠惰闃呭悗鎺ㄩ�佹暟鎹�昏緫閫昏緫
+     * @param param
+     * @param response
+     * @return
+     */
+    @Override
+    public  String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response){
+        log.info("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========寮�濮�=========锛歕n"+JSONObject.toJSONString(param));
+        String result = null;
+        try {
+            if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+                return null;
+            }
+            //闂ㄧ浜嬩欢闆嗗悎
+            List<EventPlatformCarsInfoRequest> events  = param.getParams().getEvents();
+            List<PlatformEvent> eventList = new ArrayList<>();
+            for(EventPlatformCarsInfoRequest request : events){
+                if( request.getData() ==null  ){
+                    continue;
+                }
+                Integer  workStatus = 0;
+                EventPlatformCarsDataRequest data = request.getData();
+                if( data.getHPVehicleStatus() ==null  ){
+                    continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
+                }
+                //鍚勮溅閬撹溅杈嗙姸鎬�
+                EventPlatformCarsStatusInfoRequest status = data.getHPVehicleStatus();
+                PlatformEvent event = initPlatformEventModel(request,data,status);
+                if(StringUtils.isBlank(status.getPlateNo())){
+                    eventList.add(event);//灏佽浜嬩欢锛堝凡鏈堝彴閫氶亾涓虹淮搴︼級
+                    continue;//濡傛灉杞﹁締淇℃伅涓虹┖锛屼笉澶勭悊鐩存帴璺宠繃
+                }
+                PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda()
+                        .eq(PlatformDevice::getDeviceId,request.getSrcIndex())
+                        .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+                        .last("limit 1"));
+                if(model ==null){
+                    eventList.add(event);//灏佽浜嬩欢锛堝凡鏈堝彴閫氶亾涓虹淮搴︼級
+                    continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
+                }
+                event.setPlatformId(model.getPlatformId());//鏈堝彴缂栫爜
+                eventList.add(event);//灏佽浜嬩欢锛堝凡鏈堝彴閫氶亾涓虹淮搴︼級
+                //鎴帀绗竴涓鑹叉眽瀛�,鍘绘帀鈥滄寕鈥濆瓧
+                status.setPlateNo(status.getPlateNo().substring(1,status.getPlateNo().length()).replace("鎸�",""));
+                PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class, new MPJLambdaWrapper<PlatformJob>()
+                        .selectAll(PlatformJob.class)
+                        .selectAs(Platform::getName,PlatformJob::getPlatformName)
+                        .selectAs(Platform::getLedContent,PlatformJob::getLedContent)
+                        .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
+//                        .eq(!StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeBack,status.getPlateNo() )//鍚庤溅鐗屽彿
+//                        .eq(StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeFront,status.getPlateNo() )//鍓嶈溅鐗屽彿
+                        .eq(PlatformJob::getIsdeleted,Constants.ZERO )
+                        .eq(PlatformJob::getPlatformId,model.getPlatformId() )
+                        .orderByDesc(PlatformJob::getCallDate)
+                        .last("limit 1 "));
+                if(job == null){
+                    if(StringUtils.equals(status.getMotionStatus(),"enter")){
+                        //濡傛灉鏈堝彴褰撳墠娌′綔涓氾紝鐩存帴鎻愮ず杞﹁締鍋滈敊
+                        Platform platform = platformMapper.selectJoinOne(Platform.class, new MPJLambdaWrapper<Platform>()
+                                .selectAll(Platform.class)
+                                .eq(Platform::getIsdeleted,Constants.ZERO )
+                                .eq(PlatformJob::getId,model.getPlatformId() )
+                                .last("limit 1 "));
+                        if(platform!=null){
+                            dealCarsAndPlatformErrorBiz(platform,status);
+                        }
+                    }
+                    continue;//濡傛灉浣滀笟涓虹┖锛岃烦杩囧鐞�
+                }
+                PlatformJob update = new PlatformJob();
+                update.setId(job.getId());
+                update.setEditDate(new Date());
+                if(StringUtils.equals(status.getMotionStatus(),"leave")){
+                    //濡傛灉鏄溅杈嗙寮�,涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
+                   /* if(job ==null && !Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
+                        continue;//濡傛灉娌℃煡鍒板搴旂殑浣滀笟鎴栬�呬綔涓氬苟闈炰綔涓氫腑锛屼笉鍋氫笟鍔″鐞�
+                    }
+                    if(Constants.equalsInteger(job.getType(), Constants.THREE) || Constants.equalsInteger(job.getType(), Constants.TWO)){
+                        //濡傛灉鏄痺ms鎺ㄩ�佺殑澶栧崗杞﹁締澶栧崗杞﹁締
+                       if(platformWmsDetailMapper.selectCount(new QueryWrapper<PlatformWmsDetail>().lambda()
+                               .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+                               .eq(PlatformWmsDetail::getJobId,job.getId())
+                               .ne(PlatformWmsDetail::getLockStatus,Constants.ONE)) >0){
+                           continue;//濡傛灉澶栧崗浠诲姟浣滀笟锛屽悎鍚屽彿鏈夋湭涓婇攣鐨勬儏鍐碉紝涓嶅仛鑷姩瀹屾垚浣滀笟閫昏緫澶勭悊锛岃烦杩囦笉澶勭悊
+                       }
+                    }
+                    //濡傛灉鏄鍦ㄤ綔涓氱殑鐘舵�侊紝鏍囪浣滀笟宸插畬鎴�
+                    update.setStatus(Constants.PlatformJobStatus.DONE.getKey());//浣滀笟宸插畬鎴�
+                    update.setDoneDate(update.getEditDate());*/
+                    if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey()) ||
+                            Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.TRANSFERING.getKey()) ||
+                            Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) ||
+                            Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+                        if(((StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeFront(),status.getPlateNo()))
+                                ||(!StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeBack(),status.getPlateNo()))
+                        )){
+                            //璇存槑杞﹁締杩涢敊鏈堝彴 鎴栬�呰繕鏈彨鍙风姸鎬侊紝鍙戣捣璀﹀憡
+//                          dealCarsInErrorPlatformBiz(job,status);
+                            if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())  ||
+                                    Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())){
+                                update.setInOut(Constants.ZERO);//杞﹁締宸茬粡绂诲紑
+                                platformJobMapper.updateById(update);
+                            }
+                            dealPlatformContentForLeave(job);
+                        }
+                    }
+                }else  if(StringUtils.equals(status.getMotionStatus(),"enter")){
+                    //濡傛灉鏄溅杈嗚繘鍏�
+                    if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
+                        if(!((StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeFront(),status.getPlateNo()))
+                                ||(!StringUtils.equals(status.getStockStatus(),"front") && StringUtils.equals(job.getCarCodeBack(),status.getPlateNo()))
+                        )){
+                            //璇存槑杞﹁締杩涢敊鏈堝彴 鎴栬�呰繕鏈彨鍙风姸鎬侊紝鍙戣捣璀﹀憡
+                            dealCarsInErrorPlatformBiz(job,status);
+                        }else{
+                            //杞﹁締宸茬粡杩涘叆
+                            update.setInOut(Constants.ONE);//杞﹁締宸茬粡杩涘叆
+                            platformJobMapper.updateById(update);
+                        }
+                    }
+                    /*
+                    if(job.getStartDate() == null){
+                        update.setStartDate(update.getEditDate());
+                    }
+                    update.setStatus(Constants.PlatformJobStatus.WORKING.getKey());//寮�濮嬩綔涓�
+                    */
+                }else{
+                    continue;//鍏朵粬鐘舵�佷笉澶勭悊锛岃烦杩�
+                }
+                //鏆傛椂涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
+//                        dealPlatformJobLogBiz(update,status);//璁板綍浣滀笟鏃ュ織
+            }
+            if(eventList.size()>0){
+                //鐢熸垚浜嬩欢
+                platformEventMapper.insert(eventList);
+            }
+            result = "鎴愬姛";
+            log.info("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
+        }catch (Exception e) {
+            result = "澶辫触"+e.getMessage();
+            log.error("銆愭捣搴锋湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
+        }finally {
+            saveInterfaceLog(param,"/business/hksync/push/platform/workstatus",result,false);//涓嶈鏃ュ織
+        }
+        return  null;
+    }
+
+    /**
+     * 鏈堝彴杞﹁締绂诲紑 璁剧疆鏈堝彴鏂囨涓衡�滅┖闂蹭腑 鏂囨鈥�
+     * @param model
+     */
+    private void dealPlatformContentForLeave(PlatformJob model) {
+        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
+                .eq(PlatformDevice::getType, Constants.ZERO)
+                .eq(PlatformDevice::getPlatformId,model.getPlatformId())
+                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
+        if(deviceList ==null || deviceList.size() == 0){
+            return;
+        }
+        int speed = 13;
+        try {
+            speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+        }catch (Exception e){
+        }
+        String content = StringUtils.defaultString(model.getLedContent(), Constants.PlatformLedContent.IDEL_CONTNET.getInfo());
+        List<PlatformBroadcastLog> logList = new ArrayList<>();
+        for(PlatformDevice device : deviceList){
+            if(StringUtils.isBlank(device.getHkId())){
+                continue;
+            }
+            PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1);
+            logList.add(log);
+        }
+        if(logList.size()>0){
+            platformBroadcastLogMapper.insert(logList);
+        }
+    }
+
+    private PlatformEvent initPlatformEventModel(EventPlatformCarsInfoRequest request, EventPlatformCarsDataRequest data, EventPlatformCarsStatusInfoRequest status) {
+        PlatformEvent model = new PlatformEvent();
+        model.setCreateDate(new Date());
+        model.setIsdeleted(Constants.ZERO);
+        model.setEditDate(model.getCreateDate());
+        model.setEventId(request.getEventId());
+//        model.setRemark(JSONObject.toJSONString(request));
+        model.setEventType(request.getEventType());
+        model.setDataEventType(data.getEventType());
+        model.setHappenTime(request.getHappenTime());
+        model.setSrcIndex(request.getSrcIndex());
+        model.setSrcType(request.getSrcType());
+        model.setStatus(request.getStatus());
+        model.setTimeout(request.getTimeout());
+        model.setDateTime(data.getDateTime());
+        model.setDataType(data.getDataType());
+        model.setSendTime(data.getSendTime());
+        model.setIpAddress(data.getIpAddress());
+        model.setIpv6Address(data.getIpv6Address());
+        model.setPortNo(data.getPortNo());
+        model.setMacAddress(data.getMacAddress());
+        model.setProtocol(data.getProtocol());
+        model.setChannelId(data.getChannelID());
+        model.setChannelName(data.getChannelName());
+        model.setEventState(data.getEventState());
+        model.setActivePostCount(data.getActivePostCount());
+        model.setEventDescription(data.getEventDescription());
+        model.setDeviceId(data.getDeviceID());
+        model.setHpno(status.getHPNo());
+        model.setMotionStatus(status.getMotionStatus());
+        model.setPlateNo(status.getPlateNo());
+        model.setVehicleDoorStatus(status.getVehicleDoorStatus());
+        model.setStockStatus(status.getStockStatus());
+        model.setBackgroundImageContent(status.getBackgroundImage()!=null?status.getBackgroundImage().getResourcesContent():null);
+        model.setPlateScore(status.getPlateScore());
+        model.setPlatePictureContent(status.getPlatePicture()!=null?status.getPlatePicture().getResourcesContent():null);
+        return model;
+    }
+
+    /**
+     * 璁板綍鏈堝彴浣滀笟鏃ュ織
+     * @param job
+     * @param status
+     */
+    @Transactional
+    private void dealPlatformJobLogBiz(PlatformJob job,EventPlatformCarsStatusInfoRequest status) {
+        platformJobMapper.updateById(job);//鏇存柊浣滀笟鐘舵��
+        PlatformLog log = new PlatformLog();
+        log.setIsdeleted(Constants.ZERO);
+        log.setCreateDate(new Date());
+        log.setEditDate(log.getCreateDate());
+        log.setJobId(job.getId());
+        log.setObjId(job.getId()+"");
+        if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
+            //濡傛灉鏄綔涓氬畬鎴�
+            log.setObjType(Constants.PlatformJobLogType.DONE.getKey());
+            log.setTitle(Constants.PlatformJobLogType.DONE.getName());
+            log.setContent(Constants.PlatformJobLogType.DONE.getInfo());
+            //鏌ヨ鏈�鍚庝竴娆″紑濮嬩綔涓氱殑鏃ュ織
+            PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda()
+                    .eq(PlatformLog::getIsdeleted,Constants.ZERO)
+                    .eq(PlatformLog::getObjType,Constants.PlatformJobLogType.WORKING.getKey())
+                    .eq(PlatformLog::getJobId,job.getId())
+                    .orderByDesc(PlatformLog::getCreateDate)
+                    .last(" limit 1"));
+            String v = Long.toString(job.getDoneDate().getTime() - lastBeginPlatform.getCreateDate().getTime() / 1000) ;
+            lastBeginPlatform.setRemark(job.getPlatformId().toString());
+            lastBeginPlatform.setParam3(v);
+            lastBeginPlatform.setParam2(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+            platformLogMapper.updateById(lastBeginPlatform);//鏇存柊涓婁竴娆′綔涓氱殑瀹屾垚鏃堕棿鍜屼綔涓氭椂闀�
+        }else{
+            //濡傛灉鏄綔涓氫腑
+            log.setObjType(Constants.PlatformJobLogType.WORKING.getKey());
+            log.setTitle(Constants.PlatformJobLogType.WORKING.getName());
+            log.setContent(Constants.PlatformJobLogType.WORKING.getInfo());
+            log.setParam1(DateUtil.getDate(log.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
+        }
+        platformLogMapper.insert(log);
+    }
+
+    /**
+     * 澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+     * @param model (鏈堝彴璁惧鍏宠仈淇℃伅锛�
+     * @param status
+     */
+    private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) {
+        //澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+        SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+        savePlatformWarnEventDTO.setPlatformJobId(model.getId());
+        savePlatformWarnEventDTO.setPlatformId(model.getPlatformId());
+        savePlatformWarnEventDTO.setCarCode(model.getCarCodeFront());
+        savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_ERROR.getKey());
+        platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+
+        int speed = 13;
+        try {
+            speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+        }catch (Exception e){
+
+        }
+        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
+                .eq(PlatformDevice::getPlatformId,model.getPlatformId())
+                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
+        if(deviceList ==null || deviceList.size() == 0){
+            return;
+        }
+        String content =Constants.PlatformLedContent.WRONG_IN.getInfo();
+        content = content.replace("${param2}",model.getPlatformName());
+        content = content.replace("${param}",status.getPlateNo());
+        List<String> broadcastList = new ArrayList<>();
+        List<String> ledList = new ArrayList<>();
+        String bNames = "";
+        List<PlatformBroadcastLog> logList = new ArrayList<>();
+        for(PlatformDevice device : deviceList){
+            if(StringUtils.isBlank(device.getHkId())){
+                continue;
+            }
+            /*if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+                //濡傛灉鏄疞ED
+                PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1);
+                logList.add(log);
+                ledList.add(device.getHkId());
+            }else  */if(Constants.equalsInteger(device.getType(),Constants.TWO)){
+                //濡傛灉鏄箍鎾偣
+                bNames += device.getName()+";";
+                broadcastList.add(device.getHkId());
+            }
+        }
+        if(broadcastList.size()>0){
+            PlatformBroadcastLog log = dealBroadcastBiz(model,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo().replace("${param}",status.getPlateNo()));
+            logList.add(log);
+        }
+        if(logList.size()>0){
+            platformBroadcastLogMapper.insert(logList);
+        }
+    }
+    private void dealCarsAndPlatformErrorBiz( Platform model, EventPlatformCarsStatusInfoRequest status) {
+        //澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+        SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+        savePlatformWarnEventDTO.setPlatformJobId(model.getId());
+        savePlatformWarnEventDTO.setPlatformId(model.getId());
+        savePlatformWarnEventDTO.setCarCode(status.getPlateNo());
+        savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_ERROR.getKey());
+        platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
+
+        int speed = 13;
+        try {
+            speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+        }catch (Exception e){
+
+        }
+        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
+                .eq(PlatformDevice::getPlatformId,model.getId())
+                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
+        if(deviceList ==null || deviceList.size() == 0){
+            return;
+        }
+        String content =Constants.PlatformLedContent.WRONG_IN.getInfo();
+        content = content.replace("${param2}",model.getName());
+        content = content.replace("${param}",status.getPlateNo());
+        List<String> broadcastList = new ArrayList<>();
+        List<String> ledList = new ArrayList<>();
+        String bNames = "";
+        List<PlatformBroadcastLog> logList = new ArrayList<>();
+        for(PlatformDevice device : deviceList){
+            if(StringUtils.isBlank(device.getHkId())){
+                continue;
+            }
+            if(Constants.equalsInteger(device.getType(),Constants.TWO)){
+                //濡傛灉鏄箍鎾偣
+                bNames += device.getName()+";";
+                broadcastList.add(device.getHkId());
+            }
+        }
+        if(broadcastList.size()>0){
+            PlatformJob job = new PlatformJob();
+            job.setId(-1);
+            job.setCarCodeFront(status.getPlateNo());
+            job.setPlatformId(model.getId());
+            PlatformBroadcastLog log = dealBroadcastBiz(job,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo().replace("${param}",status.getPlateNo()));
+            logList.add(log);
+        }
+        if(logList.size()>0){
+            platformBroadcastLogMapper.insert(logList);
+        }
+    }
+
+    /**
+     * 骞挎挱閫氱煡
+     * @param model
+     * @param broadcastList
+     * @param bNames
+     * @param content1
+     * @return
+     */
+    public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames , String content1) {
+        PlatformBroadcastLog log = new PlatformBroadcastLog();
+        content1 = content1.replace("${param}",model.getCarCodeFront());
+        log.setObjId(model.getId().toString());
+        log.setCreateDate(new Date());
+        log.setBizType(Constants.ONE);
+        log.setHkDate(new Date());
+        log.setObjType(Constants.ONE);
+        log.setInfo(content1);
+        log.setRemark(bNames);
+        log.setNum(Constants.ONE);
+        log.setIds(String.join(",",broadcastList));
+        CustomBroadcastRequest request = new CustomBroadcastRequest();
+        request.setAudioPointIndexCode(broadcastList);
+        request.setPlayDuration(15);//鍗曚綅绉�
+        request.setBroadCastMode("tts");
+        request.setPriority(1);
+        request.setState(1);//鎾斁/鍋滄鏍囪瘑 1-鎾斁锛�0-鍋滄
+        request.setPlayTtsContent(content1);
+        BaseResponse response =  HKService.customBroadcast(request);
+        if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+            log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
+            log.setHkStatus(Constants.THREE);
+        }else{
+            log.setHkInfo("璇锋眰鎴愬姛");
+            log.setHkStatus(Constants.TWO);
+        }
+        log.setDeviceType(Constants.ZERO);
+        log.setName("鍙戦�佸箍鎾挱鎶ュ唴瀹�");
+        return  log;
+    }
+
+    public static PlatformBroadcastLog dealLedContentBiz(Integer platformId,String hkNo,String hkName, String content,int speed,int color) {
+        PlatformBroadcastLog log = new PlatformBroadcastLog();
+        log.setCreateDate(new Date());
+        log.setBizType(Constants.ONE);
+        log.setHkDate(new Date());
+        log.setObjType(Constants.ONE);
+        log.setIds(hkNo);
+        log.setRemark(hkName);
+        log.setInfo(content);
+        log.setNum(Constants.ONE);
+        log.setObjId(platformId.toString());
+
+        TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
+        TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+        TransparentChannelBodyParamRequest request = new TransparentChannelBodyParamRequest();
+        TransparentChannelBodyRegionRequest regions = new TransparentChannelBodyRegionRequest();
+        head.setAbility("cld");//鍥哄畾鍊�
+        head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
+        head.setDeviceIndexCode(hkNo);
+        body.setMethod("ControlLedGereral");//鍥哄畾鍊�
+        request.setIndexCode(hkNo);
+        request.setOperationType(219);//鍥哄畾鍊�
+        regions.setActionType(32);
+        regions.setContent(content);
+        regions.setRegionNo(1);
+        regions.setRegionType(14);
+        regions.setFontColor(color>0?color:1);
+        regions.setCircleTimes(1);//寰幆娆℃暟
+        regions.setFontSize(32);//
+        regions.setStayTime(1);//鍗曚綅锛燂紵
+        regions.setRegionLeftTopXPos(0);
+        regions.setRegionLeftTopYPos(0);
+        regions.setRegionRightBottomXPos(255);
+        regions.setRegionRightBottomYPos(31);
+        request.setRegions(new ArrayList<>());
+        request.getRegions().add(regions);
+        regions.setSpeed(speed>0?speed:13);
+        body.setParams(request);
+        BaseResponse response =  HKService.transparentchannel(head,body);
+        if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+            log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
+            log.setHkStatus(Constants.THREE);
+        }else{
+            log.setHkInfo("璇锋眰鎴愬姛");
+            log.setHkStatus(Constants.TWO);
+        }
+        log.setDeviceType(Constants.ONE);
+        log.setName("璁剧疆LED灞忔樉鍐呭");
+        return log;
+    }
 }

--
Gitblit v1.9.3