From 8d3317f0281a693f8b9b5cdb15a1e72642407c0f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 14 九月 2024 13:54:14 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 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 c7b56b4..c312ebc 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
@@ -155,7 +155,7 @@
.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)){
+ if(d!=null && !(Constants.equalsInteger(d.getIsEntrance(),Constants.ONE) && Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE)){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
retentionList.add(getRetentionModelByRequest(member,request));
}
@@ -806,12 +806,11 @@
List<EventPlatformInfoRequest> events = param.getParams().getEvents();
List<Platform> list = new ArrayList<>();
for(EventPlatformInfoRequest request : events){
- List<EventPlatformDataRequest> dataList = request.getData();
- if(dataList ==null || dataList.size()==0){
+ EventPlatformDataRequest data = request.getData();
+ if(data ==null ){
continue;
}
Integer workStatus = 0;
- for(EventPlatformDataRequest data : dataList){
if( data.getHPWorkingStatus() ==null || data.getHPWorkingStatus().size() ==0){
continue;//濡備綍鎺ㄩ�佺姸鎬侀泦鍚堜负绌猴紝涓嶅鐞嗚烦杩�
}
@@ -821,15 +820,11 @@
.last("limit 1"));
if(model ==null){
continue;//鐩戞帶鐐规湭鍚屾锛岃烦杩囧鐞�
-
}
//鍚勮溅閬撹溅杈嗙姸鎬�
for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){
-
}
- break;//鍙鐞嗙涓�涓暟鎹姸鎬�
- }
}
result = "鎴愬姛";
log.error("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
--
Gitblit v1.9.3