自定义发布任务

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdyFgbxdDto.java

@@ -0,0 +1,26 @@
+package com.mosty.base.model.dto.yjzl;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgbxdDto 对象", description = "指令新增或修改Dto")
+public class TbZdyFgbxdDto {
+
+    @ApiModelProperty(value = "必巡点名称")
+    private String bxdMc;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdyFgrwDkDto.java

@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.yjzl;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgrwDkDto 对象", description = "自定义打卡Dto")
+public class TbZdyFgrwDkDto {
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+
+    @ApiModelProperty(value = "方格任务点位id")
+    private String bxdid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "打卡秃瓢")
+    private String dktp;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdyFgrwDto.java

@@ -0,0 +1,48 @@
+package com.mosty.base.model.dto.yjzl;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgrwDto 对象", description = "指令新增或修改Dto")
+public class TbZdyFgrwDto {
+
+    private static final long serialVersionUID = 7150960017357765314L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务名称")
+    private String fgRwmc;
+
+    @ApiModelProperty(value = "方格ID")
+    private Long fgId;
+
+    @ApiModelProperty(value = "下发日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "间隔时间")
+    private Integer dkjgsj;
+
+    @ApiModelProperty(value = "下发部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "方格点位集合")
+    private List<TbZdyFgbxdDto> dtoList;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/ZdxlFgdwBddDto.java

@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ZdxlFgdwBddDto 对象", description = "DTO")
+public class ZdxlFgdwBddDto {
+
+    @ApiModelProperty(value = "点位名称")
+    private String bddMc;
+
+    @ApiModelProperty(value = "必到点地址")
+    private String bddDz;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/ZdyxlFgxlrwDto.java

@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.yjzl;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ZdyxlFgxlrwDto 对象", description = "DTO")
+public class ZdyxlFgxlrwDto {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "任务标题")
+    private String fgRwbt;
+
+    @ApiModelProperty(value = "间隔时间")
+    private Integer dkjgsj;
+
+    @ApiModelProperty(value = "方格id")
+    private Long fgdwId;
+
+    @ApiModelProperty(value = "任务点位集合")
+    private List<ZdxlFgdwBddDto> bddDtos;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgxlrw.java

@@ -42,7 +42,7 @@ public class TbZdxlFgxlrw extends BaseEntity implements Serializable, Cloneable
     @Excel(name = "主键ID", sort = 1)
     private String id;
 
-    @ApiModelProperty(value = "任务类型 D_BZ_RWBLX 1日常 2自定义")
+    @ApiModelProperty(value = "任务类型 D_BZ_RWBLX 1日常 2自定义 3下发")
     @TableField(value = "rwlx")
     private String rwlx;
 
@@ -143,6 +143,11 @@ public class TbZdxlFgxlrw extends BaseEntity implements Serializable, Cloneable
     @Excel(name = "任务状态", sort = 12)
     private String rwZt;
 
+
+    @ApiModelProperty(value = "任务状态 D_BZ_QWRWZT")
+    @TableField(value = "rw_lq_zt")
+    @Excel(name = "任务领取状态", sort = 12)
+    private String rwLqZt;
     /**
      * 巡逻规划时长（分钟）
      */

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdyFgbxd.java

@@ -0,0 +1,39 @@
+package com.mosty.base.model.entity.yjzl.zddw;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zdy_fgbxd")
+@ApiModel(value = "TbZdyFgbxd 对象", description = "巡逻方格点位")
+public class TbZdyFgbxd extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -3070789069218466360L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+
+    @ApiModelProperty(value = "必巡点名称")
+    private String bxdMc;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdyFgrw.java

@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.yjzl.zddw;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zdy_fgrw")
+@ApiModel(value = "TbZdyFgrw 对象", description = "巡逻方格任务")
+public class TbZdyFgrw extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -7955617972336621848L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务名称")
+    private String fgRwmc;
+
+    @ApiModelProperty(value = "方格ID")
+    private Long fgId;
+
+    @ApiModelProperty(value = "方格名称")
+    private String fgmc;
+
+    @ApiModelProperty(value = "下发日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "间隔时间")
+    private Integer dkjgsj;
+
+    @ApiModelProperty(value = "下发部门")
+    private String xfbm;
+
+    @ApiModelProperty(value = "下发部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdyFgrwlq.java

@@ -0,0 +1,67 @@
+package com.mosty.base.model.entity.yjzl.zddw;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zdy_fgrwlq")
+@ApiModel(value = "TbZdyFgrwlq 对象", description = "巡逻方格任务领取")
+public class TbZdyFgrwlq extends BaseEntity implements Serializable, Cloneable {
+
+
+    private static final long serialVersionUID = 5509241958377936616L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+
+    @ApiModelProperty(value = "方格任务状态D_BZ_QWRWZT 01领取 02已领取 03已完成")
+    private String fgrwzt;
+
+    @ApiModelProperty(value = "任务领取日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private String rwlqrq;
+
+    @ApiModelProperty(value = "方格任务领取人")
+    private String fgrwlqr;
+
+    @ApiModelProperty(value = "方格任务领取人id")
+    private String fgrwlqrid;
+
+    @ApiModelProperty(value = "方格任务领取人身份证号")
+    private String fgrwlqrsfzh;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdyFgrwlqdk.java

@@ -0,0 +1,76 @@
+package com.mosty.base.model.entity.yjzl.zddw;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zdy_fgrwlqdk")
+@ApiModel(value = "TbZdyFgrwlqdk 对象", description = "巡逻方格点位领取打卡")
+public class TbZdyFgrwlqdk extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -2528967262660632723L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+
+    @ApiModelProperty(value = "方格点位id")
+    private String fgbxdid;
+
+    @ApiModelProperty(value = "打卡人id")
+    private String dkrid;
+
+    @ApiModelProperty(value = "打卡人")
+    private String dkr;
+
+    @ApiModelProperty(value = "打卡人身份证号")
+    private String darsfzh;
+
+    @ApiModelProperty(value = "打卡秃瓢")
+    private String dktp;
+
+    @ApiModelProperty(value = "打卡时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dksj;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java

@@ -1,7 +1,9 @@
 package com.mosty.base.model.query.yjzl;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mosty.base.model.BasePage;
+import com.mosty.common.base.entity.log.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,6 +66,9 @@ public class TbZdxlFgxlrwQuery extends BasePage {
     @ApiModelProperty(value = "任务状态 D_ZDXL_FGXLRW_RWZT")
     private String rwZt;
 
+    @ApiModelProperty(value = "任务状态 D_BZ_QWRWZT")
+    private String rwLqZt;
+
     @ApiModelProperty(value = "任务标题")
     private String fgRwbt;
 

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdyFgrwQuery.java

@@ -0,0 +1,35 @@
+package com.mosty.base.model.query.yjzl;
+
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgrwQuery 对象", description = "任务查询对象")
+public class TbZdyFgrwQuery extends BasePage {
+
+
+    @ApiModelProperty(value = "app任务类型 01当日任务 02历史任务")
+    private String appRwlx;
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+
+    @ApiModelProperty(value = "下发部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "方格任务名称")
+    private String fgRwmc;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "任务领取人id")
+    private String fgrwlqrid;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdyFgrwlqQuery.java

@@ -0,0 +1,18 @@
+package com.mosty.base.model.query.yjzl;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgrwlqQuery 对象", description = "任务领取对象")
+public class TbZdyFgrwlqQuery {
+
+    @ApiModelProperty(value = "方格任务id")
+    private String fgrwid;
+}

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwVO.java

@@ -97,4 +97,7 @@ public class TbZdxlFgxlrwVO extends TbZdxlFgxlrw {
     @ApiModelProperty(value = "巡防报备勤务警力信息")
     private TbQwJl xfbbQwJl;
 
+    @ApiModelProperty(value = "任务状态 D_BZ_QWRWZT")
+    private String rwLqZt;
+
 }

feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdyFgrwVO.java

@@ -0,0 +1,88 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
+import com.mosty.base.model.entity.yjzl.zddw.TbZdyFgbxd;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZdyFgrwVO 对象", description = "任务返回对象")
+public class TbZdyFgrwVO {
+
+    private static final long serialVersionUID = -6023904098274500513L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "方格任务名称")
+    private String fgRwmc;
+
+    @ApiModelProperty(value = "方格ID")
+    private Long fgId;
+
+    @ApiModelProperty(value = "方格名称")
+    private String fgmc;
+
+    @ApiModelProperty(value = "方格信息")
+    private TbZdxlFgdwVO fgxx;
+
+    @ApiModelProperty(value = "下发日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "间隔时间")
+    private Integer dkjgsj;
+
+    @ApiModelProperty(value = "下发部门")
+    private String xfbm;
+
+    @ApiModelProperty(value = "下发部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "方格任务状态 01领取 02已领取 03已完成")
+    private String fgrwzt;
+
+    @ApiModelProperty(value = "方格任务领取人")
+    private String fgrwlqr;
+
+    @ApiModelProperty(value = "方格任务领取人id")
+    private String fgrwlqrid;
+
+    @ApiModelProperty(value = "方格任务领取人身份证号")
+    private String fgrwlqrsfzh;
+
+    @ApiModelProperty(value = "点位")
+    private List<TbZdyFgbxd> bxds;
+
+}