From 55427247b31582f5b6eda25dc811c48d3f9809e8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 17:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 80cc345..2d8259e 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +17,7 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
/**
* @auther lyq
@@ -28,6 +30,10 @@
@Resource
private EventGridMemberWarnLogMapper eventGridMemberWarnLogMapper;
+ @Resource
+ private EventGridMemberGpsLogMapper eventGridMemberGpsLogMapper;
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
/**
* 新增网格员定时上报地理预警记录
* @param eventGridMemberWarnLogAddDTO
@@ -108,4 +114,38 @@
return R.ok(this.baseMapper.gridMemberWorkWarning(new Page(gridMemberWainDTO.getPageNum(),gridMemberWainDTO.getPageSize()),gridMemberWainDTO));
}
+ /**
+ * 定时任务扫描网格员工作状态
+ * @return 定时任务扫描结果
+ */
+ @Override
+ public R timedTaskGridMember(){
+
+ //查询所有网格数据
+ List<EventGridDataDO> gridDataDOList = eventGridDataMapper.selectList(new QueryWrapper<EventGridDataDO>()
+ .lambda().eq(EventGridDataDO::getType,EventGridDataDO.type.sq));
+ if(gridDataDOList.isEmpty()){
+ return R.fail("未查询到网格数据");
+ }
+
+ List<EventGridMemberGpsLogDO> memberGpsLogDOS = eventGridMemberGpsLogMapper.selectList(new QueryWrapper<EventGridMemberGpsLogDO>()
+ .lambda().eq(EventGridMemberGpsLogDO::getPositionStation,EventGridMemberGpsLogDO.positionStation.no));
+ if(!memberGpsLogDOS.isEmpty()){
+
+ memberGpsLogDOS.forEach(memberGpsLog -> {
+ //取出经纬度信息
+
+
+
+
+ });
+ }
+
+
+
+
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1