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/model/dos/EventGridMemberGpsLogDO.java

@@ -1,14 +1,11 @@
package com.panzhihua.service_grid.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * 网格员定时上报地理信息实体类
@@ -17,7 +14,7 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Data
@TableName("event_grid_member_gps_log")
public class EventGridMemberGpsLogDO implements Serializable {
@@ -25,56 +22,56 @@
    private static final long serialVersionUID = 1L;

    /**
     * 主键ID   列: id
     * 主键ID 列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 网格所属街道   列: grid_street_id
     * 网格所属街道 列: grid_street_id
     */
    private Long gridStreetId;
    /**
     * 网格所属社区ID   列: grid_community_id
     * 网格所属社区ID 列: grid_community_id
     */
    private Long gridCommunityId;
    /**
     * 网格ID   列: grid_id
     * 网格ID 列: grid_id
     */
    private Long gridId;
    /**
     * 网格名称   列: grid_name
     * 网格名称 列: grid_name
     */
    private String gridName;
    /**
     * 网格员ID   列: grid_member_id
     * 网格员ID 列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 精度维度信息，逗号分割   列: lng_lat
     * 精度维度信息，逗号分割 列: lng_lat
     */
    private String lngLat;
    /**
     * 位置信息状态（1、为判定2、正常3、是不正常）   列: position_station
     * 位置信息状态（1、为判定2、正常3、是不正常） 列: position_station
     */
    private Integer positionStation;
    /**
     * 创建人   列: create_by
     * 创建人 列: create_by
     */
    private Long createBy;
    /**
     * 创建时间   列: create_at
     * 创建时间 列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 定位地址信息   列：position_address
     * 定位地址信息 列：position_address
     */
    private String positionAddress;

    /**
     * 位置信息状态（1、为判定2、正常3、是不正常）
     */
    public interface positionStation{
    public interface positionStation {
        int no = 1;
        int normal = 2;
        int abnormal = 3;