From c7e5d4db02fb3eeedafb3b292a88a0c946ea7cfa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 九月 2024 16:15:18 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 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 9cbfcec..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("銆愭捣搴锋湀鍙板伐浣滅姸鎬佷簨浠舵帹閫併��========鎴愬姛=======");
@@ -890,8 +885,8 @@
                         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())){
+                            //濡傛灉鏄溅杈嗙寮�,涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
+                         /*   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)){
@@ -905,7 +900,7 @@
                             }
                             //濡傛灉鏄鍦ㄤ綔涓氱殑鐘舵�侊紝鏍囪浣滀笟宸插畬鎴�
                             update.setStatus(Constants.PlatformJobStatus.DONE.getKey());//浣滀笟宸插畬鎴�
-                            update.setDoneDate(update.getEditDate());
+                            update.setDoneDate(update.getEditDate());*/
                         }else  if(StringUtils.equals(status.getMotionStatus(),"enter")){
                             //濡傛灉鏄溅杈嗚繘鍏�
                             if(job ==null || !Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
@@ -919,7 +914,8 @@
                         }else{
                             continue;//鍏朵粬鐘舵�佷笉澶勭悊锛岃烦杩�
                         }
-                        dealPlatformJobLogBiz(update,status);//璁板綍浣滀笟鏃ュ織
+                        //鏆傛椂涓嶅仛鐩稿叧鑷姩瀹屾垚浣滀笟涓氬姟澶勭悊
+//                        dealPlatformJobLogBiz(update,status);//璁板綍浣滀笟鏃ュ織
                     }
                     break;//鍙鐞嗙涓�涓暟鎹姸鎬�
                 }

--
Gitblit v1.9.3