From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java
index 626a6d0..2f57abc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java
@@ -179,7 +179,20 @@
eventGridMemberGpsLogMapper.updateById(memberGpsLog);
//修改用户工作状态
this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),workStatus);
- break;
+ }else{
+ memberGpsLog.setPositionStation(EventGridMemberGpsLogDO.positionStation.abnormal);
+
+ //新增网格员预警信息
+ EventGridMemberWarnLogDO memberWarnLogDO = new EventGridMemberWarnLogDO();
+ BeanUtils.copyProperties(memberGpsLog,memberWarnLogDO);
+ memberWarnLogDO.setId(null);
+ memberWarnLogDO.setContent("工作时间未在网格内预警");
+ memberWarnLogDO.setHappenAt(memberGpsLog.getCreateAt());
+ this.baseMapper.insert(memberWarnLogDO);
+
+ eventGridMemberGpsLogMapper.updateById(memberGpsLog);
+ //修改用户工作状态
+ this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),2);
}
}
}
--
Gitblit v1.7.1