fzzy-igdss.git - Gitblit

Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

jiazx0107

9 天以前 9322f02c16d4a999fd4e9df96e200c9cf0fddf30

Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

已添加2个文件

已修改1个文件

	fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java	79 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,42 @@
package com.fzzy.igds.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;

@Data
@Entity
@Table(name = "d_patrol")
@TableName("d_patrol")
@EqualsAndHashCode(callSuper = false)
public class Patrol extends BizBaseEntity implements Serializable {

    /**
     *
     */
    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
    @TableField("id")
    private String id;

    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT 'æå±åºåº'")
    @TableField("dept_id")
    private String deptId;

    @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT 'çæ¬¡ç¼å·'")
    @TableField("batch_id")
    private String batchId;

    @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
    @TableField("user_name")
    private String userName;
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,39 @@
package com.fzzy.igds.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;

@Data
@Entity
@Table(name = "d_patrol_conf")
@TableName("d_patrol_conf")
@EqualsAndHashCode(callSuper = false)
public class PatrolConf extends BizBaseEntity implements Serializable {

    /**
     *
     */
    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT 'çæ¬¡ç¼å·'")
    @TableField("batch_id")
    private String batchId;

    @Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT 'çæ¬¡åç§°'")
    @TableField("batch_name")
    private String batchName;

    @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
    @TableField("user_name")
    private String userName;

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java

@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -21,56 +22,52 @@
@EqualsAndHashCode(callSuper = false)
public class PatrolRecord extends BizBaseEntity implements Serializable {

    /**
     *
     */
    private static final long serialVersionUID = 1L;
    /**
     *
     */
    private static final long serialVersionUID = 1L;

    public static String SORT_PROP = "createTime";
    public static String SORT_PROP = "createTime";

    @Id
    @Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
    @TableField("id")
    private String id;
    @Id
    @Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
    @TableField("id")
    private String id;

    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT 'æå±åºåº'")
    @TableField("dept_id")
    private String deptId;
    @Column(name = "patrol_id", columnDefinition = "varchar(40) COMMENT 'å·¡é»ä¸»è¡¨id'")
    @TableField("patrol_id")
    private String patrolId;

    @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
    @TableField("user_name")
    private String userName;
    @Column(name = "point_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»ç¹'")
    @TableField("point_name")
    private String pointName;

    @Column(name = "point_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»ç¹'")
    @TableField("point_name")
    private String pointName;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "create_time", columnDefinition = "datetime COMMENT 'å·¡é»æ¶é´'")
    @TableField("create_time")
    private Date createTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "create_time", columnDefinition = "datetime COMMENT 'å·¡é»æ¶é´'")
    @TableField("create_time")
    private Date createTime;
    @Column(name = "longitude", columnDefinition = "decimal(20,6) COMMENT 'ç»åº¦'")
    @TableField("longitude")
    private String longitude;

    @Column(name = "longitude", columnDefinition = "decimal(20,6) COMMENT 'ç»åº¦'")
    @TableField("longitude")
    private String longitude;
    @Column(name = "latitude", columnDefinition = "decimal(20,6) COMMENT 'çº¬åº¦'")
    @TableField("latitude")
    private String latitude;

    @Column(name = "latitude", columnDefinition = "decimal(20,6) COMMENT 'çº¬åº¦'")
    @TableField("latitude")
    private String latitude;
    /**
     * --------é¸ç°å¾ä¿¡æ¯--------
     **/
    @Column(name = "img_id", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
    @TableField("img_id")
    private String imgId;

    /**
     * --------é¸ç°å¾ä¿¡æ¯--------
     **/
    @Column(name = "img_id", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
    @TableField("img_id")
    private String imgId;
    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
    @TableField("file_name")
    private String imgName;

    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
    @TableField("file_name")
    private String imgName;

    //å·¡æ´ç§çå¨è·¯å¾
    @Transient
    private String imgPath;
    //å·¡æ´ç§çå¨è·¯å¾
    @Transient
    private String imgPath;

}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,42 @@
			package com.fzzy.igds.domain;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.persistence.Column;
			import javax.persistence.Entity;
			import javax.persistence.Id;
			import javax.persistence.Table;
			import java.io.Serializable;

			@Data
			@Entity
			@Table(name = "d_patrol")
			@TableName("d_patrol")
			@EqualsAndHashCode(callSuper = false)
			public class Patrol extends BizBaseEntity implements Serializable {

			/**
			*
			*/
			private static final long serialVersionUID = 1L;

			@Id
			@Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
			@TableField("id")
			private String id;

			@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT 'æå±åºåº'")
			@TableField("dept_id")
			private String deptId;

			@Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT 'çæ¬¡ç¼å·'")
			@TableField("batch_id")
			private String batchId;

			@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
			@TableField("user_name")
			private String userName;
			}

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,39 @@
			package com.fzzy.igds.domain;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.persistence.Column;
			import javax.persistence.Entity;
			import javax.persistence.Id;
			import javax.persistence.Table;
			import java.io.Serializable;

			@Data
			@Entity
			@Table(name = "d_patrol_conf")
			@TableName("d_patrol_conf")
			@EqualsAndHashCode(callSuper = false)
			public class PatrolConf extends BizBaseEntity implements Serializable {

			/**
			*
			*/
			private static final long serialVersionUID = 1L;

			@Id
			@Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT 'çæ¬¡ç¼å·'")
			@TableField("batch_id")
			private String batchId;

			@Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT 'çæ¬¡åç§°'")
			@TableField("batch_name")
			private String batchName;

			@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
			@TableField("user_name")
			private String userName;

			}

			@@ -5,6 +5,7 @@
			import com.fasterxml.jackson.annotation.JsonFormat;
			import lombok.Data;
			import lombok.EqualsAndHashCode;

			import javax.persistence.*;
			import java.io.Serializable;
			import java.util.Date;
			@@ -21,56 +22,52 @@
			@EqualsAndHashCode(callSuper = false)
			public class PatrolRecord extends BizBaseEntity implements Serializable {

			/**
			*
			*/
			private static final long serialVersionUID = 1L;
			/**
			*
			*/
			private static final long serialVersionUID = 1L;

			public static String SORT_PROP = "createTime";
			public static String SORT_PROP = "createTime";

			@Id
			@Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
			@TableField("id")
			private String id;
			@Id
			@Column(name = "id", columnDefinition = "varchar(40) COMMENT 'ä¸»é®'")
			@TableField("id")
			private String id;

			@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT 'æå±åºåº'")
			@TableField("dept_id")
			private String deptId;
			@Column(name = "patrol_id", columnDefinition = "varchar(40) COMMENT 'å·¡é»ä¸»è¡¨id'")
			@TableField("patrol_id")
			private String patrolId;

			@Column(name = "user_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»äºº'")
			@TableField("user_name")
			private String userName;
			@Column(name = "point_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»ç¹'")
			@TableField("point_name")
			private String pointName;

			@Column(name = "point_name", columnDefinition = "varchar(40) COMMENT 'å·¡é»ç¹'")
			@TableField("point_name")
			private String pointName;
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@Column(name = "create_time", columnDefinition = "datetime COMMENT 'å·¡é»æ¶é´'")
			@TableField("create_time")
			private Date createTime;

			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@Column(name = "create_time", columnDefinition = "datetime COMMENT 'å·¡é»æ¶é´'")
			@TableField("create_time")
			private Date createTime;
			@Column(name = "longitude", columnDefinition = "decimal(20,6) COMMENT 'ç»åº¦'")
			@TableField("longitude")
			private String longitude;

			@Column(name = "longitude", columnDefinition = "decimal(20,6) COMMENT 'ç»åº¦'")
			@TableField("longitude")
			private String longitude;
			@Column(name = "latitude", columnDefinition = "decimal(20,6) COMMENT 'çº¬åº¦'")
			@TableField("latitude")
			private String latitude;

			@Column(name = "latitude", columnDefinition = "decimal(20,6) COMMENT 'çº¬åº¦'")
			@TableField("latitude")
			private String latitude;
			/**
			* --------é¸ç°å¾ä¿¡æ¯--------
			**/
			@Column(name = "img_id", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
			@TableField("img_id")
			private String imgId;

			/**
			* --------é¸ç°å¾ä¿¡æ¯--------
			**/
			@Column(name = "img_id", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
			@TableField("img_id")
			private String imgId;
			@Column(name = "file_name", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
			@TableField("file_name")
			private String imgName;

			@Column(name = "file_name", columnDefinition = "varchar(50) COMMENT 'å·¡æ´ç§ç'")
			@TableField("file_name")
			private String imgName;

			//å·¡æ´ç§çå¨è·¯å¾
			@Transient
			private String imgPath;
			//å·¡æ´ç§çå¨è·¯å¾
			@Transient
			private String imgPath;

			}