From f9c24ba3d5eba45afef222dcd72b6383893efc76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 07 一月 2025 17:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 368 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 309 insertions(+), 59 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 09ca01d..a3da3de 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
@@ -17,9 +17,12 @@
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.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -28,11 +31,11 @@
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瀹炵幇
@@ -43,6 +46,8 @@
@Slf4j
public class HkSyncPushServiceImpl extends HkSyncBaseServiceImpl {
+ @Autowired
+ private InoutDayCountMapper inoutDayCountMapper;
@Autowired
private InterfaceLogMapper interfaceLogMapper;
@Autowired
@@ -83,6 +88,13 @@
private PlatformLogMapper platformLogMapper;
@Autowired
private PlatformWarnEventServiceImpl platformWarnEventService;
+
+
+
+
+
+
+
/**
* 娴峰悍闂ㄧ浜嬩欢鎺ㄩ��
* @param param
@@ -102,13 +114,14 @@
List<DeviceEvent> list = new ArrayList<>();
List<Integer> delRetentionLis = new ArrayList<>();
List<Retention> retentionList = 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);
//灏佽闂ㄧ浜嬩欢淇℃伅琛ㄥ璞�
list.add(getDeviceEventModelByRequest(request));
}
@@ -126,8 +139,10 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
+ dealInoutDayCountBiz(inoutDayCount);
log.info("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========鎴愬姛=======");
}catch (Exception e) {
+ e.printStackTrace();
log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
}finally {
saveInterfaceLog(param,"/business/hksync/push/acs",result,false);//涓嶈鏃ュ織
@@ -136,27 +151,89 @@
}
+ 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) {
//娴峰悍浜哄憳缂栫爜
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(d!=null && !(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::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" ));
+ if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
+ if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
- retentionList.add(getRetentionModelByRequest(member,request));
+ inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
+ }else{
+ inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);//绂诲満浜烘
+ }
+ }
+ if(member !=null){
+ if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
+ delRetentionLis.add(member.getId());
+ if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
+ //濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
+ retentionList.add(getRetentionModelByRequest(member,request));
+ if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ inoutDayCount.setInSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getInSelfMemberNum())+1);//鍐呴儴浜哄憳鍏ュ満浜烘
+ }else{
+ inoutDayCount.setInOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getInOtherMemberNum())+1);//鐩稿叧鏂瑰叆鍦轰汉娆�
+ }
+ }else{
+ if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
+ inoutDayCount.setOutSelfMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutSelfMemberNum())+1);//鍐呴儴浜哄憳鍑哄満浜烘
+ }else{
+ inoutDayCount.setOutOtherMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutOtherMemberNum())+1);//鐩稿叧鏂瑰嚭鍦轰汉娆�
+ }
+ }
}
}
}
@@ -267,7 +344,6 @@
retention.setMemberId(member.getId());
retention.setDeviceName(request.getSrcName());
retention.setDeviceIndex(request.getSrcIndex());
-
return retention;
}
@@ -345,6 +421,7 @@
List<VisitEvent> list = new ArrayList<>();
List<Integer> delRetentionLis = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
+ InoutDayCount inoutDayCount = new InoutDayCount();
for(EventVisitIccmInfoRequest request : events){
if(request.getData() ==null || request.getData().getVisitorInvoices() ==null){
continue;
@@ -353,7 +430,7 @@
continue;
}
//娴峰悍璁垮璁板綍缂栫爜
- dealVisitDataByRequstIccm(request,delRetentionLis,retentionList);
+ dealVisitDataByRequstIccm(request,delRetentionLis,retentionList,inoutDayCount);
list.add(getVisitEventModelByRequestIccm(request,request.getData().getVisitorInformationList().get(0)));
}
if(list.size()>0){
@@ -370,19 +447,19 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
+ 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 ) {
+ private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList, InoutDayCount inoutDayCount) {
EventVisitIccmDataRequest model = request.getData();
EventVisitIccmInvoiceParamRequest data = request.getData().getVisitorInvoices();
@@ -394,8 +471,6 @@
queryWrapper.last("limit 1");
Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
if(visits !=null){
- //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
- delRetentionLis.add(visits.getMemberId());
if(dataSyncConfig.getOrgUserDataOrigin() == DataSyncConfig.origin.hk){
//濡傛灉鏄紛鍒╁ぇ灞忛」鐩紝涓嶅仛澶勭悊
return;
@@ -404,36 +479,59 @@
updateVistis.setId(visits.getId());
if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_IN.getKey()) {
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
- retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
+// retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
//鏉ヨ鏃堕棿
- updateVistis.setStatus(Constants.VisitStatus.signin);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ 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()) {
+ }else if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()) {
//濡傛灉鏄瀹㈢绂讳簨浠�
- updateVistis.setStatus(Constants.VisitStatus.signout);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
- updateVistis.setOutType(Constants.ZERO);
- updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
+ 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("璁垮姝ｅ父绛剧");
+ }
}else{
+ //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+ delRetentionLis.add(visits.getMemberId());
//濡傛灉鏄瀹㈤�氳
+ 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);
+ }
+ if(request.getData()!=null&&request.getData().getParamValues()!=null &&
+ !StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+ inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
+ }
}
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.getISO8601DateByStr(happentTime));
+ 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());
@@ -449,9 +547,6 @@
retention.setImgurl(visits.getImgurl());
retention.setPhone(visits.getPhone());
retention.setMemberId(visits.getMemberId());
-// retention.setDeviceName(request.getSrcName());
-// retention.setDeviceIndex(request.getSrcIndex());
-
return retention;
}
private VisitEvent getVisitEventModelByRequestIccm(EventVisitIccmInfoRequest request,EventVisitIccmDetailParamRequest detail) {
@@ -478,7 +573,8 @@
event.setStartTime(request.getData().getVisitorInvoices().getBeginTime());
event.setSrcType(request.getSrcType());
event.setSrcParentIndex(request.getSrcParentIndex());
- event.setSrcName(request.getSrcName());
+ event.setSrcName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+ request.getData().getParamValues().getSrcName():request.getSrcName());
event.setSrcIndex(request.getSrcIndex());
event.setSex(detail.getSex());
event.setPurpose(request.getData().getVisitorInvoices().getVisitReason());
@@ -490,6 +586,7 @@
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();
@@ -644,12 +741,13 @@
List<CarEvent> list = new ArrayList<>();
List<Retention> retentionList = new ArrayList<>();
List<String> delRetentionList = new ArrayList<>();
+ InoutDayCount inoutDayCount = new InoutDayCount();
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,inoutDayCount));
}
if(list.size()>0){
//鎻掑叆闂ㄧ璁板綍
@@ -665,9 +763,10 @@
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(retentionList);
}
+ dealInoutDayCountBiz(inoutDayCount);
log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
}catch (Exception e){
-
+ e.printStackTrace();
log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========澶辫触=======锛歕n"+e.getMessage());
}
saveInterfaceLog(param,"/business/hksync/push/parks",result,false);
@@ -679,7 +778,7 @@
* @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,InoutDayCount inoutDayCount ) {
CarEvent event = new CarEvent();
event.setIsdeleted(Constants.ZERO);
event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
@@ -732,12 +831,94 @@
event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
}
if(StringUtils.isNotBlank(event.getPlateNos())){
+ Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
+ .selectAll(Cars.class )
+ .selectAs(Company::getType,Cars::getCompanyType)
+ .leftJoin(Company.class,Company::getId,Cars::getGroupId)
+ .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());
+ if(Constants.equalsInteger(carModel.getType(),Constants.ONE)){
+ event.setCarType(Constants.RetentionCarType.selfTruck);
+ }else {
+ if(Constants.equalsInteger(carModel.getCompanyType(),Constants.ONE)){
+ event.setCarType(Constants.RetentionCarType.internal);//鍐呴儴杞﹁締
+ }else{
+ event.setCarType(Constants.RetentionCarType.relation);//鐩稿叧鏂硅溅杈�
+ }
+ }
+ }
+ PlatformJob carTypeJob = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda()
+ .eq(PlatformJob::getCarCodeFront,event.getPlateNos())
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .orderByAsc(PlatformJob::getCreateDate)
+ .last(" limit 1"));
+ if(carTypeJob!=null){
+ //浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+ if(Constants.equalsInteger(carTypeJob.getType(),Constants.FOUR)){
+ event.setCarType(Constants.RetentionCarType.cityComTruck);//甯傚叕鍙歌溅杈�
+ }else if(Constants.equalsInteger(carTypeJob.getType(),Constants.TWO)
+ || Constants.equalsInteger(carTypeJob.getType(),Constants.THREE)){
+ event.setCarType(Constants.RetentionCarType.outTruck);//澶栧崗杞�
+ }else{
+ event.setCarType(Constants.RetentionCarType.selfTruck);//鑷湁杞�
+ }
+ }
+
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());
+ //鑷湁杞� 鏌ヨ褰撳墠鏄惁鏈夊緟绛惧埌鐨勪换鍔�
+ 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.WORKING.getKey(),
+ Constants.PlatformJobStatus.TRANSFERING.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)){
+ 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);
+ }
+ }
+ };
}else{
Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
@@ -749,26 +930,32 @@
if(visits!=null){
//鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
event.setMemberId(visits.getMemberId());
+ event.setCarType(Constants.RetentionCarType.visitor);
}
}
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
- retentionList.add(getRetentionModelByParkRequest(request));
+ retentionList.add(getRetentionModelByParkRequest(request,event));
+ inoutDayCount.setInCarNum(Constants.formatIntegerNum(inoutDayCount.getInCarNum())+1);
}else if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_OUT.getKey()){
//濡傛灉鏄嚭鍦烘斁琛�
delRetentionList.add(event.getPlateNos());
+ inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
}
}
return event;
}
- private Retention getRetentionModelByParkRequest(EventParkInfoRequest request) {
+ private Retention getRetentionModelByParkRequest(EventParkInfoRequest request,CarEvent event) {
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.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
return retention;
@@ -887,11 +1074,12 @@
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::getCarCodeFront,status.getPlateNo() )//鍓嶈溅鐗屽彿
// .eq(!StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeBack,status.getPlateNo() )//鍚庤溅鐗屽彿
- .eq(PlatformJob::getPlatformId,Constants.ZERO )
- .eq(PlatformJob::getIsdeleted,model.getPlatformId() )
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO )
+ .eq(PlatformJob::getPlatformId,model.getPlatformId() )
.orderByDesc(PlatformJob::getCallDate)
.last("limit 1 "));
if(job == null){
@@ -917,21 +1105,43 @@
//濡傛灉鏄鍦ㄤ綔涓氱殑鐘舵�侊紝鏍囪浣滀笟宸插畬鎴�
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(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;//鍏朵粬鐘舵�佷笉澶勭悊锛岃烦杩�
}
@@ -951,6 +1161,37 @@
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) {
@@ -1060,40 +1301,48 @@
return;
}
String content =Constants.PlatformLedContent.WRONG_IN.getInfo();
- content = content.replace("${param}",model.getPlatformName());
- content = content.replace("${param2}",model.getCarCodeFront());
+ 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.isNotBlank(device.getHkId())){
+ if(StringUtils.isBlank(device.getHkId())){
continue;
}
- if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+ /*if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄疞ED
- PlatformBroadcastLog log = dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1);
+ 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.ZERO)){
+ }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);
+ 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);
}
}
- public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames) {
- PlatformBroadcastLog log = new PlatformBroadcastLog();
- String content1 =Constants.PlatformBroadcastContent.WRONG_IN.getInfo();
- content1 = content1.replace("${param}",model.getCarCodeFront());
+ /**
+ * 骞挎挱閫氱煡
+ * @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());
@@ -1117,12 +1366,12 @@
log.setHkInfo("璇锋眰鎴愬姛");
log.setHkStatus(Constants.TWO);
}
- log.setDeviceType(Constants.ONE);
+ log.setDeviceType(Constants.ZERO);
log.setName("鍙戦�佸箍鎾挱鎶ュ唴瀹�");
return log;
}
- public static PlatformBroadcastLog dealLedContentBiz(String hkNo,String hkName, String content,int speed,int color) {
+ 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);
@@ -1132,6 +1381,7 @@
log.setRemark(hkName);
log.setInfo(content);
log.setNum(Constants.ONE);
+ log.setObjId(platformId.toString());
TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
--
Gitblit v1.9.3