Merge branch 'test' into 'test_bak'

罗元桥

2021-10-14 5679a332454c15af07bc8cd0ab938f496c41b5bf

Merge branch 'test' into 'test_bak'

Test

See merge request root/zhihuishequ!241

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/GridMemberTrajectoryVo.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.vos.screen;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author lyq
 * @date 2021/6/16 14:45
 */
@Data
@ApiModel("网格员运动轨迹返回参数")
public class GridMemberTrajectoryVo {

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("网格员名字")
    private String name;

    @ApiModelProperty("网格员运动轨迹经纬度列表")
    private List<String> lngLatList;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1345,4 +1345,12 @@
     */
    @PostMapping("/eventvisitingtasks/timedTaskVisitingJobHandler")
    R timedTaskVisitingJobHandler();

    /**
     * 查询社区网格员运动轨迹
     * @param communityId   社区id
     * @return  社区网格员运动轨迹
     */
    @GetMapping("/screen/member/trajectory")
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java

@@ -172,6 +172,16 @@
        return R.ok(result.getString("data"));
    }

    @ApiOperation(value = "获取社区网格员移动轨迹接口@lyq", response = EventGridMemberVO.class)
    @GetMapping("/grids/member/trajectory")
    public R getGridsMemberTrajectory() {
        Long communityId = this.getCommunityId();
        if (communityId == null) {
            return R.fail(401, "请先登录");
        }
        return gridService.getGridsMemberTrajectory(communityId);
    }





 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java

@@ -2,6 +2,8 @@

import javax.annotation.Resource;

import com.panzhihua.service_grid.dao.EventGridMemberRelationMapper;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
@@ -26,6 +28,8 @@

    @Resource
    private EventService eventService;
    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;

    /**
     * 事件大屏查询事件列表
@@ -75,4 +79,14 @@
        return eventService.civilVillageStatistics(villageId);
    }

    /**
     * 查询社区网格员运动轨迹
     * @param communityId   社区id
     * @return  社区网格员运动轨迹
     */
    @GetMapping("/member/trajectory")
    public R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId){
        return eventGridMemberRelationService.getGridsMemberTrajectory(communityId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.vos.screen.GridMemberTrajectoryVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -79,4 +80,18 @@
    List<EventStatisticsMemberAdminVO>
        gridMemberStatisticsAll(@Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO);

    /**
     * 查询该社区的网格员列表
     * @param communityId   社区id
     * @return  网格员列表
     */
    List<GridMemberTrajectoryVo> getGridsMemberList(@Param("communityId") Long communityId);

    /**
     * 查询网格员当天运动轨迹
     * @param userId    用户id
     * @return  网格员当天运动轨迹
     */
    List<String> getGridsMemberTrajectory(@Param("userId") Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java

@@ -82,4 +82,11 @@

    R getMapGridsListsByApp(Long userId);

    /**
     * 查询社区网格员运动轨迹
     * @param communityId   社区id
     * @return  社区网格员运动轨迹
     */
    R getGridsMemberTrajectory(Long communityId);

}

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

@@ -5,6 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.screen.GridMemberTrajectoryVo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -194,4 +195,19 @@
        return R.ok(resultList);
    }

    /**
     * 查询社区网格员运动轨迹
     * @param communityId   社区id
     * @return  社区网格员运动轨迹
     */
    @Override
    public R getGridsMemberTrajectory(Long communityId){
        //查询社区所有网格员
        List<GridMemberTrajectoryVo> memberTrajectoryList = eventGridMemberRelationMapper.getGridsMemberList(communityId);
        memberTrajectoryList.forEach(member -> {
            member.setLngLatList(eventGridMemberRelationMapper.getGridsMemberTrajectory(member.getUserId()));
        });
        return R.ok(memberTrajectoryList);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -630,4 +630,21 @@
        ORDER BY su.create_at desc
    </select>

    <select id="getGridsMemberList" resultType="com.panzhihua.common.model.vos.screen.GridMemberTrajectoryVo">
        SELECT
            egmr.grid_member_id as userId,
            su.`name`
        FROM
            event_grid_member_relation AS egmr
            left join event_grid_data as egd on egd.id = egmr.grid_id
            INNER JOIN sys_user AS su ON su.user_id = egmr.grid_member_id

            where egd.grid_community_id = #{communityId}
    </select>

    <select id="getGridsMemberTrajectory" resultType="String">
        select lng_lat from event_grid_member_gps_log
        where grid_member_id = #{userId} and create_at > DATE_SUB(DATE_FORMAT(CURDATE(),'%Y-%m-%d 09:00:00'),INTERVAL 0 DAY)
    </select>

</mapper>