Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java

@@ -1,5 +1,13 @@
package com.panzhihua.service_grid.service.impl;

import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,16 +19,17 @@
import com.panzhihua.common.model.vos.grid.LatLngVO;
import com.panzhihua.common.utlis.LngLatUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.EventGridDataMapper;
import com.panzhihua.service_grid.dao.EventGridMemberGpsLogMapper;
import com.panzhihua.service_grid.dao.EventGridMemberRelationMapper;
import com.panzhihua.service_grid.dao.EventGridMemberWarnLogMapper;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO;
import com.panzhihua.service_grid.model.dos.EventGridMemberWarnLogDO;
import com.panzhihua.service_grid.service.EventGridMemberWarnLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -29,7 +38,8 @@
 */
@Slf4j
@Service
public class EventGridMemberWarnLogServiceImpl extends ServiceImpl<EventGridMemberWarnLogMapper, EventGridMemberWarnLogDO> implements EventGridMemberWarnLogService {
public class EventGridMemberWarnLogServiceImpl extends
    ServiceImpl<EventGridMemberWarnLogMapper, EventGridMemberWarnLogDO> implements EventGridMemberWarnLogService {

    @Resource
    private EventGridMemberWarnLogMapper eventGridMemberWarnLogMapper;
@@ -39,8 +49,10 @@
    private EventGridDataMapper eventGridDataMapper;
    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;

    /**
     * 新增网格员定时上报地理预警记录
     * 
     * @param eventGridMemberWarnLogAddDTO
     * @return 新增结果
     */
@@ -56,6 +68,7 @@

    /**
     * 修改网格员定时上报地理预警记录
     * 
     * @param eventGridMemberWarnLogEditDTO
     * @return 维护结果
     */
@@ -71,6 +84,7 @@

    /**
     * 分页查找网格员定时上报地理预警记录
     * 
     * @param pageEventGridMemberWarnLogDTO
     * @return 维护结果
     */
@@ -87,6 +101,7 @@

    /**
     * 删除网格员定时上报地理预警记录
     * 
     * @param EventGridMemberWarnLogDeleteDTO
     * @return 平台用户信息
     */
@@ -96,7 +111,9 @@

    /**
     * 查询网格员定时上报地理预警记录详细信息
     * @param id 网格员定时上报地理预警记录 id
     * 
     * @param id
     *            网格员定时上报地理预警记录 id
     * @return 查找结果
     */
    public R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(Long id){
@@ -111,30 +128,35 @@

    /**
     * 后台获取网格员预警记录
     * @param gridMemberWainDTO 请求参数
     * 
     * @param gridMemberWainDTO
     *            请求参数
     * @return  预警记录
     */
    @Override
    public R gridMemberWorkWarning(EventGridMemberWainDTO gridMemberWainDTO){
        return R.ok(this.baseMapper.gridMemberWorkWarning(new Page(gridMemberWainDTO.getPageNum(),gridMemberWainDTO.getPageSize()),gridMemberWainDTO));
        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));
        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));
        List<EventGridMemberGpsLogDO> memberGpsLogDOS =
            eventGridMemberGpsLogMapper.selectList(new QueryWrapper<EventGridMemberGpsLogDO>().lambda()
                .eq(EventGridMemberGpsLogDO::getPositionStation, EventGridMemberGpsLogDO.positionStation.no));
        if(!memberGpsLogDOS.isEmpty()){
            memberGpsLogDOS.forEach(memberGpsLog ->{
                if(StringUtils.isNotEmpty(memberGpsLog.getLngLat())){
@@ -151,8 +173,9 @@
                            List<LatLngVO> latLngList = LngLatUtils.getLatLngFromText(gridData.getData());
                            if(LngLatUtils.isInPolygon(latLngList,lng,lat)) {//匹配通过
                                //判断当前网格员与此网格是否有关系
                                Integer count = eventGridMemberRelationMapper.selectCount(new QueryWrapper<EventGridMemberRelationDO>()
                                        .lambda().eq(EventGridMemberRelationDO::getGridMemberId,memberGpsLog.getGridMemberId())
                                Integer count = eventGridMemberRelationMapper
                                    .selectCount(new QueryWrapper<EventGridMemberRelationDO>().lambda()
                                        .eq(EventGridMemberRelationDO::getGridMemberId, memberGpsLog.getGridMemberId())
                                        .eq(EventGridMemberRelationDO::getGridId,memberGpsLog.getGridId()));
                                if(count > 0){
                                    isOk = false;