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

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/AsjQuery.java

+package com.founder.commonutils.viewEntity;
+
+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;
+
+/**
+ * @author Godffy
+ * @create 2021-03-03 20:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="AsjQuery对象", description="案事件基本传输信息")
+public class AsjQuery {
+
+    @ApiModelProperty(value = "案事件编号")
+    private String asjbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "刑事警情类别代码")
+    private String xsjqlbdm;
+
+    @ApiModelProperty(value = "案发开始时间:2019-01-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date begin;//注意，这里使用的是String类型，前端传过来的数据无需进行类型转换
+
+    @ApiModelProperty(value = "案发结束时间:2019-12-01 10:10:10")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date end;
+
+
+}

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/CbxszAndXlaj.java

+package com.founder.commonutils.viewEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by yangyang on 2020/05/31
+ * 封装请求的参数
+ */
+@ApiModel
+public class CbxszAndXlaj {
+	@ApiModelProperty("案事件编号")
+	private String asjbh;
+	@ApiModelProperty("串并类型代码")
+	private String cblx;
+	@ApiModelProperty("串并类型描述")
+	private String cblx_str;
+	@ApiModelProperty("案件名称")
+	private String ajmc;
+	@ApiModelProperty("简要案情")
+	private String jyaq;
+	@ApiModelProperty("案发时间")
+	private String asjfssj_asjfskssj;
+	@ApiModelProperty("侦查终结")
+	private String zcjdmc;
+	@ApiModelProperty("主案")
+	private String ajzlbmc;
+	@ApiModelProperty("类案")
+	private String ajxzlbmc;
+	@ApiModelProperty("次类案")
+	private String xalbdmbcmsmc;
+	@ApiModelProperty("经度")
+	private String x;
+	@ApiModelProperty("纬度")
+	private String y;
+
+	public String getAsjbh() {
+		return asjbh;
+	}
+
+	public void setAsjbh(String asjbh) {
+		this.asjbh = asjbh;
+	}
+
+	public String getCblx() {
+		return cblx;
+	}
+
+	public void setCblx(String cblx) {
+		this.cblx = cblx;
+	}
+
+	public String getCblx_str() {
+		return cblx_str;
+	}
+
+	public void setCblx_str(String cblx_str) {
+		this.cblx_str = cblx_str;
+	}
+
+	public String getAjmc() {
+		return ajmc;
+	}
+
+	public void setAjmc(String ajmc) {
+		this.ajmc = ajmc;
+	}
+
+	public String getJyaq() {
+		return jyaq;
+	}
+
+	public void setJyaq(String jyaq) {
+		this.jyaq = jyaq;
+	}
+
+	public String getAsjfssj_asjfskssj() {
+		return asjfssj_asjfskssj;
+	}
+
+	public void setAsjfssj_asjfskssj(String asjfssj_asjfskssj) {
+		this.asjfssj_asjfskssj = asjfssj_asjfskssj;
+	}
+
+	public String getZcjdmc() {
+		return zcjdmc;
+	}
+
+	public void setZcjdmc(String zcjdmc) {
+		this.zcjdmc = zcjdmc;
+	}
+
+	public String getAjzlbmc() {
+		return ajzlbmc;
+	}
+
+	public void setAjzlbmc(String ajzlbmc) {
+		this.ajzlbmc = ajzlbmc;
+	}
+
+	public String getAjxzlbmc() {
+		return ajxzlbmc;
+	}
+
+	public void setAjxzlbmc(String ajxzlbmc) {
+		this.ajxzlbmc = ajxzlbmc;
+	}
+
+	public String getXalbdmbcmsmc() {
+		return xalbdmbcmsmc;
+	}
+
+	public void setXalbdmbcmsmc(String xalbdmbcmsmc) {
+		this.xalbdmbcmsmc = xalbdmbcmsmc;
+	}
+
+	public String getX() {
+		return x;
+	}
+
+	public void setX(String x) {
+		this.x = x;
+	}
+
+	public String getY() {
+		return y;
+	}
+
+	public void setY(String y) {
+		this.y = y;
+	}
+
+	@Override
+	public String toString() {
+		return "CbxszAndXlaj{" +
+				"asjbh='" + asjbh + '\'' +
+				", cblx='" + cblx + '\'' +
+				", cblx_str='" + cblx_str + '\'' +
+				", ajmc='" + ajmc + '\'' +
+				", jyaq='" + jyaq + '\'' +
+				", asjfssj_asjfskssj='" + asjfssj_asjfskssj + '\'' +
+				", zcjdmc='" + zcjdmc + '\'' +
+				", ajzlbmc='" + ajzlbmc + '\'' +
+				", ajxzlbmc='" + ajxzlbmc + '\'' +
+				", xalbdmbcmsmc='" + xalbdmbcmsmc + '\'' +
+				", x='" + x + '\'' +
+				", y='" + y + '\'' +
+				'}';
+	}
+}

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/TbXwAsjbz.java

+package com.founder.commonutils.viewEntity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 标注实体
+ * </p>
+ *
+ * @author yangyang java
+ * @since 2021-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TB_ST_ASJBZ")
+@ApiModel(value="TbXwAsjbz对象", description="标注")
+public class TbXwAsjbz implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案事件编号")
+    @TableId(value = "ASJBH")
+    private String asjbh;
+
+    @ApiModelProperty(value = "主类别代码")
+    @TableField("AJZLB")
+    private String ajzlb;
+
+    @ApiModelProperty(value = "类案类别代码")
+    @TableField("AJXZLB")
+    private String ajxzlb;
+
+    @ApiModelProperty(value = "次案类别代码")
+    @TableField("XALBDMBCMS")
+    private String xalbdmbcms;
+
+    @ApiModelProperty(value = "主类别名称")
+    @TableField(exist = false)
+    private String xszalxdmStr;
+
+    @ApiModelProperty(value = "类案类别名称")
+    @TableField(exist = false)
+    private String xslalxdmStr;
+
+    @ApiModelProperty(value = "次案类别名称")
+    @TableField(exist = false)
+    private String xalbdmbcmsStr;
+}