Skip to content

S
szpt
Commit 83bce181 authored by wangjinjing's avatar wangjinjing
Browse files
Options

Merge branch 'master' of http://192.168.168.218/wcyuee/szpt 

# Conflicts:
#	src/main/java/com/zksy/szpt/domain/dto/SzptGdCsyjhldxDTO.java
#	src/main/java/com/zksy/szpt/domain/dto/SzptGdRyxxDTO.java
#	src/main/java/com/zksy/szpt/domain/dto/SzptGdSbxxDTO.java
#	src/main/java/com/zksy/szpt/domain/dto/SzptGdYjDTO.java
#	src/main/java/com/zksy/szpt/domain/dto/SzptXyzhXyxxDTO.java
#	src/main/java/com/zksy/szpt/domain/dto/XxRwwcqkDTO.java
parents 3136c29c b99950dd
Hide whitespace changes
Inline Side-by-side
Showing with 501 additions and 214 deletions
src/main/java/com/zksy/szpt/config/SwaggerConfig.java
View file @ 83bce181
......@@ -9,6 +9,7 @@ import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
......@@ -38,11 +39,10 @@ public class SwaggerConfig {
pars.add(param3);
pars.add(param4);
ApiInfo apiInfo = new ApiInfoBuilder()
// .title("模块服务接口文档")
// .description("服务接口文档，遵循RESTful API设计规范")
// .contact(new Contact("wcy", "www.baidu.com", "4"))
// .version("1.0")
.build();
.title("模块服务接口文档")
.description("服务接口文档，遵循RESTful API设计规范")
.contact(new Contact("wcyuee", "www.baidu.com", "4"))
.version("1.0").build();
return new Docket(DocumentationType.SWAGGER_2)
......
src/main/java/com/zksy/szpt/domain/dto/AppStoreDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
@ApiModel(value = "AppStoreDTO", description = "应用商店信息")
public class AppStoreDTO {
private Long id;
@ApiModelProperty(value = "应用Key", required = true)
@NotBlank
private String appKey;
@NotBlank
@ApiModelProperty(value = "密钥", required = true)
private String appSecret;
@ApiModelProperty(value = "单位", required = true)
private String deptCode;
public String getDeptCode() {
......
src/main/java/com/zksy/szpt/domain/dto/SzptClockInDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
public class SzptClockInDTO {
/**
*
*id
*/
@ApiModelProperty(value = "id")
private Integer id;
/**
* 场所编号
*/
@ApiModelProperty(value = "场所编号")
private String csid;
/**
* 上班签到
*/
@ApiModelProperty(value = "上班签到")
private String sbqd;
/**
* 下班签退
*/
@ApiModelProperty(value = "下班签退")
private String xbqt;
/**
* 现场情况上报
*/
@ApiModelProperty(value = "现场情况上报")
private String xcqk;
/**
* 上报时间
*/
@ApiModelProperty(value = "上报时间")
private String sbsj;
/**
* 上报人
*/
@ApiModelProperty(value = "上报人")
private String sbr;
/**
* 签到人
*/
@ApiModelProperty(value = "签到人")
private String qdr;
/**
* 签到人联系电话
*/
@ApiModelProperty(value = "签到人联系电话")
private String qdrlxdh;
/**
* 签到打卡地点
*/
@ApiModelProperty(value = "签到打卡地点")
private String qddkdd;
/**
* 签到打卡照片
*/
@ApiModelProperty(value = "签到打卡照片")
private String qddkzp;
/**
* 签退打卡地点
*/
@ApiModelProperty(value = "签退打卡地点")
private String qtdkdd;
/**
* 签退打卡地点
*/
@ApiModelProperty(value = "签退打卡地点")
private String qtdkzp;
/**
* 管控等级
*/
@ApiModelProperty(value = "管控等级")
private String gkdj;
public Integer getId() {
......
src/main/java/com/zksy/szpt/domain/dto/SzptClockInRulesDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
public class SzptClockInRulesDTO {
/**
*
*/
@ApiModelProperty(value = "id")
private Integer id;
/**
* 签到场所名称
*/
@ApiModelProperty(value = "签到场所名称")
private String name;
/**
* 关联场所id
*/
@ApiModelProperty(value = "关联场所id")
private String csid;
/**
* 打卡时间
*/
@ApiModelProperty(value = "打卡时间")
private String chockInTime;
/**
* 签到范围
*/
@ApiModelProperty(value = "签到范围")
private String clockInScope;
/**
* 签到/签退二维码
*/
@ApiModelProperty(value = "签到/签退二维码")
private String qrCode;
/**
* 学校类型
*/
@ApiModelProperty(value = "学校类型")
private String cslx;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String bz;
......
src/main/java/com/zksy/szpt/domain/dto/SzptFwxxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import java.util.Date;
......@@ -9,191 +9,226 @@ public class SzptFwxxDTO {
/**
* 区域ID
*/
@ApiModelProperty(value = "区域ID")
private String qyid;
/**
* 场所ID
*/
@ApiModelProperty(value = "场所ID")
private String csid;
/**
* 房屋简称
*/
@ApiModelProperty(value = "房屋简称")
private String fwjc;
/**
* 居住情况(1059)：01-出租，02-自住，03-借住，04-空置
*/
@ApiModelProperty(value = "居住情况(1059)：01-出租，02-自住，03-借住，04-空置")
private String jzqk;
/**
* 出租用途(1043)：03-出租房，04-经营用房，06-员工宿舍，07-网约房
*/
@ApiModelProperty(value = "出租用途(1043)：03-出租房，04-经营用房，06-员工宿舍，07-网约房")
private String czyt;
/**
* 户型结构(1042)：01-1室，02-2室，03-3室，04-4室，05-5室，06-6室，07-7室，08-8室，09-9室
*/
@ApiModelProperty(value = "户型结构(1042)：01-1室，02-2室，03-3室，04-4室，05-5室，06-6室，07-7室，08-8室，09-9室")
private String hxjg;
/**
* 房型ID
*/
@ApiModelProperty(value = "房型ID")
private String fxid;
/**
* 出租备案(1044)：1-已备案，2-未备案
*/
@ApiModelProperty(value = "出租备案(1044)：1-已备案，2-未备案")
private String czba;
/**
* 出租备案号
*/
@ApiModelProperty(value = "出租备案号")
private String czbah;
/**
* 出租备案起始
*/
@ApiModelProperty(value = "出租备案起始")
private String czbaqs;
/**
* 出租备案截止
*/
@ApiModelProperty(value = "出租备案截止")
private String czbajz;
/**
* 房主姓名
*/
@ApiModelProperty(value = "房主姓名")
private String fzxm;
/**
* 房主身份证号
*/
@ApiModelProperty(value = "房主身份证号")
private String fzsfzh;
/**
* 房主人员id
*/
@ApiModelProperty(value = "房主人员id")
private String fzryid;
/**
* 房主联系电话
*/
@ApiModelProperty(value = "房主联系电话")
private String fzlxdh;
/**
* 房屋楼层
*/
@ApiModelProperty(value = "房屋楼层")
private String fwlc;
/**
* 房屋房间号（数字）
*/
@ApiModelProperty(value = "房屋房间号（数字）")
private String fwfjh;
/**
* 房屋状态(3136)：0-废弃，1-空闲，2-在住，3-保留
*/
@ApiModelProperty(value = "房屋状态(3136)：0-废弃，1-空闲，2-在住，3-保留")
private String fwzt;
/**
* 清洁模式(3137)：0-无，1-默认清洁
*/
@ApiModelProperty(value = "清洁模式(3137)：0-无，1-默认清洁")
private String qjms;
/**
* 清洁状态(3138)：1-净，2-脏
*/
@ApiModelProperty(value = "清洁状态(3138)：1-净，2-脏")
private String qjzt;
/**
* 最近清洁时间
*/
@ApiModelProperty(value = "最近清洁时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date zjqjsj;
/**
* 账单日期
*/
@ApiModelProperty(value = "账单日期")
private String zdrq;
/**
* 账单周期(3161)：1-月付，2-季付，3-半年付，4-年付
*/
@ApiModelProperty(value = "账单周期(3161)：1-月付，2-季付，3-半年付，4-年付")
private String zdzq;
/**
* 房屋参数JSON，扩展用
*/
@ApiModelProperty(value = "房屋参数JSON，扩展用")
private String fwcs;
/**
* 管理人类型(3175)：0-房主本人，1-亲戚，2-朋友，3-二房东，4-运营公司，5-运营子场所
*/
@ApiModelProperty(value = "管理人类型(3175)：0-房主本人，1-亲戚，2-朋友，3-二房东，4-运营公司，5-运营子场所")
private String glrlx;
/**
* 管理人姓名
*/
@ApiModelProperty(value = "管理人姓名")
private String glrxm;
/**
* 管理人身份证号
*/
@ApiModelProperty(value = "管理人身份证号")
private String glrsfzh;
/**
* 管理人人员id
*/
@ApiModelProperty(value = "管理人人员id")
private String glrryid;
/**
* 管理人联系电话
*/
@ApiModelProperty(value = "管理人联系电话")
private String glrlxdh;
/**
* 管理运营公司名称
*/
@ApiModelProperty(value = "管理运营公司名称")
private String glrgsmc;
/**
* 子场所ID
*/
@ApiModelProperty(value = "子场所ID")
private String zcsid;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String bz;
/**
* 访客登记自动审核标志(3001)：0-否1-是
*/
@ApiModelProperty(value = "访客登记自动审核标志(3001)：0-否1-是")
@NotBlank(message = "访客登记自动审核标志(3001)：0-否1-是不能为空")
private String fkdjzdsh;
/**
* 其他房屋用途
*/
@ApiModelProperty(value = "其他房屋用途")
private String qtfwyt;
/**
* 健康码核验时间
*/
@ApiModelProperty(value = "健康码核验时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jkmhysj;
/**
* 数据归属单位代码
*/
private String sjgsdwdm;
/**
* 数据归属单位名称
*/
private String sjgsdwmc;
// /**
// * 数据归属单位代码
// */
// private String sjgsdwdm;
//
//
// /**
// * 数据归属单位名称
// */
// private String sjgsdwmc;
/**
* 房主证件照片
......@@ -480,21 +515,21 @@ public class SzptFwxxDTO {
this.jkmhysj = jkmhysj;
}
public String getSjgsdwmc() {
return sjgsdwmc;
}
public void setSjgsdwmc(String sjgsdwmc) {
this.sjgsdwmc = sjgsdwmc;
}
public String getSjgsdwdm() {
return sjgsdwdm;
}
public void setSjgsdwdm(String sjgsdwdm) {
this.sjgsdwdm = sjgsdwdm;
}
// public String getSjgsdwmc() {
// return sjgsdwmc;
// }
//
// public void setSjgsdwmc(String sjgsdwmc) {
// this.sjgsdwmc = sjgsdwmc;
// }
//
// public String getSjgsdwdm() {
// return sjgsdwdm;
// }
//
// public void setSjgsdwdm(String sjgsdwdm) {
// this.sjgsdwdm = sjgsdwdm;
// }
public String getFzzjzp() {
return fzzjzp;
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdCsyjhldxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import java.util.Date;
public class SzptGdCsyjhldxDTO {
/**
* 流水ID
*/
@ApiModelProperty(value = "流水ID")
@NotBlank(message = "流水ID不能为空")
private String id;
/**
* 场所id
*/
@ApiModelProperty(value = "场所id")
@NotBlank(message = "场所id不能为空")
private String csid;
......@@ -36,16 +34,19 @@ public class SzptGdCsyjhldxDTO {
/**
* 业务ID
*/
@ApiModelProperty(value = "业务ID")
private String ywid;
/**
* 业务描述
*/
@ApiModelProperty(value = "业务描述")
private String ywms;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@NotBlank(message = "备注不能为空")
private String bz;
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdRyxxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import java.util.Date;
public class SzptGdRyxxDTO {
......@@ -16,23 +12,27 @@ public class SzptGdRyxxDTO {
/**
* 人口编码
*/
@ApiModelProperty(value = "人口编码")
@NotBlank(message = "人口编码不能为空")
private String rkbm;
/**
* 场所ID
*/
@ApiModelProperty(value = "场所ID")
@NotBlank(message = "场所ID不能为空")
private String csid;
/**
* 厂家人脸id
*/
@ApiModelProperty(value = "厂家人脸id")
private String cjrlid;
/**
* 姓名
*/
@ApiModelProperty(value = "姓名")
private String xm;
/**
......@@ -44,48 +44,57 @@ public class SzptGdRyxxDTO {
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String lxdh;
/**
* 证件种类
*/
@ApiModelProperty(value = "证件种类")
private String cyzjdm;
/**
* 证件号码
*/
@ApiModelProperty(value = "证件号码")
private String zjhm;
/**
* 年龄
*/
@ApiModelProperty(value = "年龄")
private String nl;
/**
* 图片URL
*/
@ApiModelProperty(value = "图片URL")
private String url;
/**
* 图片MD5
*/
@ApiModelProperty(value = "图片MD5")
private String md5;
/**
* 最近出现天数
*/
@ApiModelProperty(value = "最近出现天数")
@NotNull(message = "最近出现天数不能为空")
private Integer zjcxts;
/**
* 总出现天数
*/
@ApiModelProperty(value = "总出现天数")
@NotNull(message = "总出现天数不能为空")
private Integer zcxts;
/**
* 疑似入场统计最近出现天数
*/
@ApiModelProperty(value = "疑似入场统计最近出现天数")
@NotNull(message = "疑似入场统计最近出现天数不能为空")
private Integer ysrczjts;
......@@ -99,59 +108,70 @@ public class SzptGdRyxxDTO {
/**
* 疑似入场统计总出现天数
*/
@ApiModelProperty(value = "疑似入场统计总出现天数")
@NotNull(message = "疑似入场统计总出现天数不能为空")
private Integer ysrczts;
/**
* 常口标志0、否，1、是
*/
@ApiModelProperty(value = "常口标志0、否，1、是")
@NotBlank(message = "常口标志不能为空")
private String ckbz;
/**
* 流动人口标志0、否，1、是
*/
@ApiModelProperty(value = "流动人口标志0、否，1、是")
@NotBlank(message = "流动人口标志不能为空")
private String lkbz;
/**
* 户籍地地址名称
*/
@ApiModelProperty(value = "户籍地地址名称")
private String hjdzDzmc;
/**
* 户籍地址行政区划代码
*/
@ApiModelProperty(value = "户籍地址行政区划代码")
private String hjdzXzqhdm;
/**
* 户籍地派出所名称
*/
@ApiModelProperty(value = "户籍地派出所名称")
private String hjdzPcsmc;
/**
* 户籍地址派出所代码
*/
@ApiModelProperty(value = "户籍地址派出所代码")
private String hjdzPcsdm;
/**
* 现住地地址名称
*/
@ApiModelProperty(value = "现住地地址名称")
private String xzdDzmc;
/**
* 现住地址行政区划代码
*/
@ApiModelProperty(value = "现住地址行政区划代码")
private String xzdXzqhdm;
/**
* 现住地派出所名称
*/
@ApiModelProperty(value = "现住地派出所名称")
private String xzdPcsmc;
/**
* 现住地派出所代码
*/
@ApiModelProperty(value = "现住地派出所代码")
private String xzdPcsdm;
/**
......@@ -164,46 +184,53 @@ public class SzptGdRyxxDTO {
/**
* 进场时间
*/
@ApiModelProperty(value = "进场时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jcsj;
/**
* 退场时间
*/
@ApiModelProperty(value = "退场时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date tcsj;
/**
* 预计退场时间
*/
@ApiModelProperty(value = "预计退场时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date yjtcsj;
/**
* 最近抓拍时间
*/
@ApiModelProperty(value = "最近抓拍时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date zjzpsj;
/**
* 是否关联已经登记人员 cslb=3001
*/
@ApiModelProperty(value ="疑似入场标志('0':'否',’1‘:'是')" )
@ApiModelProperty(value ="是否关联已经登记人员('0':'否',’1‘:'是')" )
private String sfglry;
/**
* 登记状态, 0-未登记，1-登记
*/
@ApiModelProperty(value = "登记状态, 0-未登记，1-登记")
private Integer djzt;
/**
* 区域ID
*/
@ApiModelProperty(value = "区域ID")
private String qyid;
/**
* 区域名称
*/
@ApiModelProperty(value = "区域名称")
private String qymc;
/**
......@@ -221,28 +248,33 @@ public class SzptGdRyxxDTO {
/**
* 流口比对时间
*/
@ApiModelProperty(value = "流口比对时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lkbdsj;
/**
* 常口比对时间
*/
@ApiModelProperty(value = "常口比对时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ckbdsj;
/**
* 数据来源
*/
@ApiModelProperty(value = "数据来源")
private String datasource;
/**
* 订单编号
*/
@ApiModelProperty(value = "订单编号")
private String orderid;
/**
* 实际入住人数
*/
@ApiModelProperty(value = "实际入住人数")
private String sjrzrs;
public String getRkbm() {
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdSbxxDTO.java
View file @ 83bce181
......@@ -11,46 +11,55 @@ public class SzptGdSbxxDTO {
/**
* 设备序列号
*/
@ApiModelProperty(value = "设备序列号")
private String sbsn;
/**
* 设备名称
*/
@ApiModelProperty(value = "设备名称")
private String sbmc;
/**
* 设备编号
*/
@ApiModelProperty(value = "设备编号")
private String sbbh;
/**
* 设备描述
*/
@ApiModelProperty(value = "设备描述")
private String sbms;
/**
* mac地址
*/
@ApiModelProperty(value = "mac地址")
private String mac;
/**
* ip地址
*/
@ApiModelProperty(value = "ip地址")
private String ip;
/**
* 子网掩码
*/
@ApiModelProperty(value = "子网掩码")
private String netmask;
/**
* 网关
*/
@ApiModelProperty(value = "网关")
private String gw;
/**
* 场所id
*/
@ApiModelProperty(value = "场所id")
private String csid;
/**
......@@ -63,32 +72,38 @@ public class SzptGdSbxxDTO {
/**
* 状态更新时间
*/
@ApiModelProperty(value = "状态更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ztgxsj;
/**
* 厂家
*/
@ApiModelProperty(value = "厂家")
private String cj;
/**
* 型号
*/
@ApiModelProperty(value = "型号")
private String xh;
/**
* 区域ID
*/
@ApiModelProperty(value = "区域ID")
private String qyid;
/**
* 区域名称
*/
@ApiModelProperty(value = "区域名称")
private String qymc;
/**
* 设备参数，json
*/
@ApiModelProperty(value = "设备参数，json")
private String sbcs;
/**
......@@ -106,26 +121,28 @@ public class SzptGdSbxxDTO {
private String zt;
/**
* 数据归属单位代码
*/
@NotBlank(message = "数据归属单位代码不能为空")
private String sjgsdwdm;
/**
* 数据归属单位名称
*/
private String sjgsdwmc;
// /**
// * 数据归属单位代码
// */
// @NotBlank(message = "数据归属单位代码不能为空")
// private String sjgsdwdm;
//
// /**
// * 数据归属单位名称
// */
// private String sjgsdwmc;
/**
* 登记公安机关机构代码
*/
@ApiModelProperty(value = "登记公安机关机构代码")
@NotBlank(message = "登记公安机关机构代码不能为空")
private String createGajgjgdm;
/**
* 登记公安机关名称
*/
@ApiModelProperty(value = "登记公安机关名称")
@NotBlank(message = "登记公安机关名称不能为空")
private String createGajgmc;
......@@ -273,21 +290,21 @@ public class SzptGdSbxxDTO {
this.zt = zt == null ? null : zt.trim();
}
public String getSjgsdwdm() {
return sjgsdwdm;
}
public void setSjgsdwdm(String sjgsdwdm) {
this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
}
public String getSjgsdwmc() {
return sjgsdwmc;
}
public void setSjgsdwmc(String sjgsdwmc) {
this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
}
// public String getSjgsdwdm() {
// return sjgsdwdm;
// }
//
// public void setSjgsdwdm(String sjgsdwdm) {
// this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
// }
//
// public String getSjgsdwmc() {
// return sjgsdwmc;
// }
//
// public void setSjgsdwmc(String sjgsdwmc) {
// this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
// }
public String getCreateGajgjgdm() {
return createGajgjgdm;
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdXxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
......@@ -13,11 +11,14 @@ public class SzptGdXxDTO {
/**
* 场所ID
*/
@ApiModelProperty(value = "场所ID")
@NotBlank(message = "场所ID不能为空")
private String id;
/**
* 场所类型;cslb=3109
*/
@ApiModelProperty(value = "场所类型;cslb=3109")
@NotBlank(message = "场所类型不能为空")
@ApiModelProperty(value = "场所类型('10':'小区','11':'工地','12':'公寓','13':'园区','14':'写字楼','15':'综合体','20':'经营性场所','21':'酒店式公寓','22':'网约房','30':'公司单位','VC':'虚拟场所')")
private String cslx;
......@@ -25,110 +26,131 @@ public class SzptGdXxDTO {
/**
* 场所名称
*/
@ApiModelProperty(value = "场所名称")
@NotBlank(message = "场所名称不能为空")
private String csmc;
/**
* 场所描述
*/
@ApiModelProperty(value = "场所描述")
@NotBlank(message = "场所描述不能为空")
private String csms;
/**
* 联系地址
*/
@ApiModelProperty(value = "联系地址")
private String lxdz;
/**
* 联系人
*/
@ApiModelProperty(value = "联系人")
private String lxr;
/**
* 联系电话
*/
@ApiModelProperty(value = "联系电话")
private String lxdh;
/**
* 施工单位
*/
@ApiModelProperty(value = "施工单位")
private String sgdw;
/**
* 施工许可证
*/
@ApiModelProperty(value = "施工许可证")
private String sgxkz;
/**
* 开工日期
*/
@ApiModelProperty(value = "开工日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date kgrq;
/**
* 预计竣工日期
*/
@ApiModelProperty(value = "预计竣工日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date yjjgrq;
/**
* 经度
*/
@ApiModelProperty(value = "经度")
private String lng;
/**
* 纬度
*/
@ApiModelProperty(value = "纬度")
private String lat;
/**
* 自定义经度
*/
@ApiModelProperty(value = "自定义经度")
private String customlng;
/**
* 自定义纬度
*/
@ApiModelProperty(value = "自定义纬度")
private String customlat;
/**
* 责任人
*/
@ApiModelProperty(value = "责任人")
private String zrrxm;
/**
* 责任人联系电话
*/
@ApiModelProperty(value = "责任人联系电话")
private String zrrlxdh;
/**
* 法人
*/
@ApiModelProperty(value = "法人")
private String frxm;
/**
* 法人联系电话
*/
@ApiModelProperty(value = "法人联系电话")
private String frlxdh;
/**
* 社会信用代码
*/
@ApiModelProperty(value = "社会信用代码")
private String shxydm;
/**
* 注册地址
*/
@ApiModelProperty(value = "注册地址")
private String zcdz;
/**
* 管理员手机号
*/
@ApiModelProperty(value = "管理员手机号")
private String adminzh;
/**
* 是否子场所;cslb=3001
*/
@ApiModelProperty(value = "是否子场所;cslb=3001")
@NotBlank(message = "是否子场所不能为空")
@ApiModelProperty(value ="疑似入场标志('0':'否',’1‘:'是')" )
private String sfzcs;
......@@ -136,23 +158,26 @@ public class SzptGdXxDTO {
/**
* 父场所ID
*/
@ApiModelProperty(value = "父场所ID")
private String fcsid;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String bz;
/**
* 创建时间
*/
// @NotBlank(message = "创建时间不能为空")
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cjsj;
/**
* 场所状态;cslb=3104
*/
@ApiModelProperty(value = "场所状态;cslb=3104")
@NotBlank(message = "场所状态不能为空")
@ApiModelProperty(value = "场所状态('0':'未激活','1':'正常','2':'注销')")
private String zt;
......@@ -160,65 +185,75 @@ public class SzptGdXxDTO {
/**
* 激活时间
*/
@ApiModelProperty(value = "激活时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jhsj;
/**
* 点位坐标
*/
@ApiModelProperty(value = "点位坐标")
private String location;
/**
* 数据来源系统名称
*/
@ApiModelProperty(value = "数据来源系统名称")
private String sjlyXtmc;
/**
* 转历史时间 格式：yyyy-MM-dd HH:mm:ss
*/
@ApiModelProperty(value = "转历史时间 格式：yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date zxsj;
/**
* 社区代码
*/
@ApiModelProperty(value = "社区代码")
private String sqdm;
/**
* 社区名称
*/
@ApiModelProperty(value = "社区名称")
private String sqmc;
/**
* 门店类型(4001)：0-普通住宅，1-酒店式公寓，2-自建房，9-其他
*/
@ApiModelProperty(value = "门店类型(4001)：0-普通住宅，1-酒店式公寓，2-自建房，9-其他")
private String mdlx;
/**
* 门店经营状态(4013)：0-正常，1-歇业
*/
@ApiModelProperty(value = "门店经营状态(4013)：0-正常，1-歇业")
private String mdjyzt;
/**
* 数据归属单位代码
*/
@NotBlank(message = "数据归属单位代码不能为空")
private String sjgsdwdm;
/**
* 数据归属单位名称
*/
private String sjgsdwmc;
// /**
// * 数据归属单位代码
// */
// @NotBlank(message = "数据归属单位代码不能为空")
// private String sjgsdwdm;
//
// /**
// * 数据归属单位名称
// */
// private String sjgsdwmc;
/**
* 登记公安机关机构代码
*/
@ApiModelProperty(value = "登记公安机关机构代码")
@NotBlank(message = "登记公安机关机构代码不能为空")
private String createGajgjgdm;
/**
* 登记公安机关名称
*/
@ApiModelProperty(value = "登记公安机关名称")
@NotBlank(message = "登记公安机关名称不能为空")
private String createGajgmc;
......@@ -502,21 +537,21 @@ public class SzptGdXxDTO {
this.mdjyzt = mdjyzt == null ? null : mdjyzt.trim();
}
public String getSjgsdwdm() {
return sjgsdwdm;
}
public void setSjgsdwdm(String sjgsdwdm) {
this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
}
public String getSjgsdwmc() {
return sjgsdwmc;
}
public void setSjgsdwmc(String sjgsdwmc) {
this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
}
// public String getSjgsdwdm() {
// return sjgsdwdm;
// }
//
// public void setSjgsdwdm(String sjgsdwdm) {
// this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
// }
//
// public String getSjgsdwmc() {
// return sjgsdwmc;
// }
//
// public void setSjgsdwmc(String sjgsdwmc) {
// this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
// }
public String getCreateGajgjgdm() {
return createGajgjgdm;
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdYjDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
public class SzptGdYjDTO {
/**
* 预警ID
*/
@ApiModelProperty(value = "预警ID")
@NotBlank(message = "预警ID不能为空")
private String id;
/**
* 工地ID
*/
@ApiModelProperty(value = "工地ID")
@NotBlank(message = "工地ID不能为空")
private String csid;
/**
* 预警日期
*/
@ApiModelProperty(value = "预警日期")
@NotBlank(message = "预警日期不能为空")
private String yjrq;
......@@ -44,16 +44,19 @@ public class SzptGdYjDTO {
/**
* 预警内容
*/
@ApiModelProperty(value = "预警内容")
private String yjnr;
/**
* 业务ID
*/
@ApiModelProperty(value = "业务ID")
private String ywid;
/**
* 业务参数扩展
*/
@ApiModelProperty(value = "业务参数扩展")
private String ywcs;
/**
......@@ -66,22 +69,26 @@ public class SzptGdYjDTO {
/**
* 处理时间
*/
@ApiModelProperty(value = "处理时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date clsj;
/**
* 处理结果
*/
@ApiModelProperty(value = "处理结果")
private String cljg;
/**
* 处理人id
*/
@ApiModelProperty(value = "处理人id")
private String clrid;
/**
* 处理人姓名
*/
@ApiModelProperty(value = "处理人姓名")
private String clrxm;
......
src/main/java/com/zksy/szpt/domain/dto/SzptQyxxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import java.util.Date;
public class SzptQyxxDTO {
/**
* 区域ID
*/
@ApiModelProperty(value = "区域ID")
@NotBlank(message = "区域ID不能为空")
private String id;
/**
* 场所ID
*/
@ApiModelProperty(value = "场所ID")
@NotBlank(message = "场所ID不能为空")
private String csid;
/**
* 区域名称
*/
@ApiModelProperty(value = "区域名称")
@NotBlank(message = "区域名称不能为空")
private String qymc;
/**
* 区域简称
*/
@ApiModelProperty(value = "区域简称")
@NotBlank(message = "场所ID区域简称不能为空")
private String qyjc;
/**
* 区域全称
*/
@ApiModelProperty(value = "区域全称")
private String qyqc;
/**
* 区域类型[3123]：(11-苑，12-楼幢，13-单元，14-房屋，15-房间)
*/
@ApiModelProperty(value = "区域类型[3123]：(11-苑，12-楼幢，13-单元，14-房屋，15-房间)")
@NotBlank(message = "区域类型不能为空")
private String qylx;
/**
* 层级
*/
@ApiModelProperty(value = "层级")
@NotBlank(message = "层级不能为空")
private String level;
/**
* 上级区域id
*/
@ApiModelProperty(value = "上级区域id")
private String fqyid;
/**
* 显示顺序
*/
@ApiModelProperty(value = "显示顺序")
private String xssx;
/**
* 经度
*/
@ApiModelProperty(value = "经度")
private String lng;
/**
* 纬度
*/
@ApiModelProperty(value = "纬度")
private String lat;
/**
* 自定义经度
*/
@ApiModelProperty(value = "自定义经度")
private String customlng;
/**
* 自定义纬度
*/
@ApiModelProperty(value = "自定义纬度")
private String customlat;
/**
* 状态[3101](1-有效，2-注销)
*/
@ApiModelProperty(value = "状态[3101](1-有效，2-注销)")
@NotBlank(message = "状态不能为空")
private String zt;
/**
* 数据归属单位代码
*/
@NotBlank(message = "数据归属单位代码不能为空")
private String sjgsdwdm;
/**
* 数据归属单位名称
*/
private String sjgsdwmc;
// /**
// * 数据归属单位代码
// */
// @NotBlank(message = "数据归属单位代码不能为空")
// private String sjgsdwdm;
//
// /**
// * 数据归属单位名称
// */
// private String sjgsdwmc;
/**
* 登记公安机关机构代码
*/
@ApiModelProperty(value = "登记公安机关机构代码")
@NotBlank(message = "登记公安机关机构代码不能为空")
private String createGajgjgdm;
/**
* 登记公安机关名称
*/
@ApiModelProperty(value = "登记公安机关名称")
@NotBlank(message = "登记公安机关名称不能为空")
private String createGajgmc;
......@@ -219,21 +234,21 @@ public class SzptQyxxDTO {
this.zt = zt == null ? null : zt.trim();
}
public String getSjgsdwdm() {
return sjgsdwdm;
}
public void setSjgsdwdm(String sjgsdwdm) {
this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
}
public String getSjgsdwmc() {
return sjgsdwmc;
}
public void setSjgsdwmc(String sjgsdwmc) {
this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
}
// public String getSjgsdwdm() {
// return sjgsdwdm;
// }
//
// public void setSjgsdwdm(String sjgsdwdm) {
// this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
// }
//
// public String getSjgsdwmc() {
// return sjgsdwmc;
// }
//
// public void setSjgsdwmc(String sjgsdwmc) {
// this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
// }
public String getCreateGajgjgdm() {
return createGajgjgdm;
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhDkxxDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
public class SzptXyzhDkxxDTO {
/**
*
*打卡历史id
*/
@ApiModelProperty(value = "打卡历史id")
private String dklsid;
/**
*
*校园id
*/
@ApiModelProperty(value = "校园id")
private String xyid;
/**
*
*人员id
*/
@ApiModelProperty(value = "人员id")
private String ryid;
/**
*
*签到时间
*/
@ApiModelProperty(value = "签到时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date qdsj;
/**
*
*签退时间
*/
@ApiModelProperty(value = "签退时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date qtsj;
/**
* 打卡状态 1-正常 0-迟到
*/
@ApiModelProperty(value = "打卡状态 1-正常 0-迟到")
private String zt;
/**
*
*签到地址
*/
@ApiModelProperty(value = "签到地址")
private String qddz;
/**
*
*签退地址
*/
@ApiModelProperty(value = "签退地址")
private String qtdz;
/**
*
*签到x坐标
*/
@ApiModelProperty(value = "签到x坐标")
private String qdxzb;
/**
*
*签到y坐标
*/
@ApiModelProperty(value = "签到y坐标")
private String qdyzb;
/**
*
*签退x坐标
*/
@ApiModelProperty(value = "签退x坐标")
private String qtxzb;
/**
*
*签退y坐标
*/
@ApiModelProperty(value = "签退y坐标")
private String qtyzb;
/**
*
*签到图片
*/
@ApiModelProperty(value = "签到图片")
private String qdtp;
/**
*
*签退图片
*/
@ApiModelProperty(value = "签退图片")
private String qttp;
/**
*
*创建时间
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cjsj;
/**
*
*更新时间
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhKqmbDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
public class SzptXyzhKqmbDTO {
/**
* 模板id
*/
@ApiModelProperty(value = "模板id")
@NotBlank(message = "模板id不能为空")
private String id;
/**
* 模板名称
*/
@ApiModelProperty(value = "模板名称")
@NotBlank(message = "模板名称不能为空")
private String mbmc;
/**
* 状态1为删除
*/
@ApiModelProperty(value = "状态1为删除")
@NotBlank(message = "状态不能为空")
private String zt;
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhMbdhDTO.java
View file @ 83bce181
package com.zksy.szpt.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import java.util.Date;
......@@ -10,85 +11,101 @@ public class SzptXyzhMbdhDTO {
/**
* 模板itemid
*/
@ApiModelProperty(value = "模板itemid")
@NotBlank(message = "模板itemid不能为空")
private String id;
/**
* 模板id
*/
@ApiModelProperty(value = "模板id")
@NotBlank(message = "模板id不能为空")
private String mbid;
/**
* 工作日
*/
@ApiModelProperty(value = "工作日")
@NotBlank(message = "工作日不能为空")
private String day;
/**
*
*上班时间1
*/
@ApiModelProperty(value = "上班时间1")
private String sbsj1;
/**
*
*下班时间1
*/
@ApiModelProperty(value = "下班时间1")
private String xbsj1;
/**
*
*上班时间2
*/
@ApiModelProperty(value = "上班时间2")
private String sbsj2;
/**
*
*下班时间2
*/
@ApiModelProperty(value = "下班时间2")
private String xbsj2;
/**
*
*上班时间3
*/
@ApiModelProperty(value = "上班时间3")
private String sbsj3;
/**
*
*下班时间3
*/
@ApiModelProperty(value = "下班时间3")
private String xbsj3;
/**
* 1-删除
* 状态 1-删除
*/
@ApiModelProperty(value = "状态 1-删除")
private String zt;
/**
*
*创建人id
*/
@ApiModelProperty(value = "创建人id")
private String cjrid;
/**
*
*创建人姓名
*/
@ApiModelProperty(value = "创建人姓名")
private String cjrxm;
/**
*
*创建时间
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cjsj;
/**
*
*更新人id
*/
@ApiModelProperty(value = "更新人id")
private String gxrid;
/**
*
*更新人姓名
*/
@ApiModelProperty(value = "更新人姓名")
private String gxrxm;
/**
*
*更新时间
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhXyxxDTO.java
View file @ 83bce181
......@@ -8,56 +8,66 @@ import java.util.Date;
public class SzptXyzhXyxxDTO {
/**
*
*id
*/
@ApiModelProperty(value = "id")
@NotNull(message = "id不能为空")
private Integer id;
/**
* 学校名称
*/
@ApiModelProperty(value = "学校名称")
private String mc;
/**
* 所属单位名称
*/
@ApiModelProperty(value = "所属单位名称")
private String ssdwmc;
/**
* 所属单位代码
*/
@ApiModelProperty(value = "所属单位代码")
private String ssdwdm;
/**
* 是否重点关注学校;1-是,0-否
*/
@ApiModelProperty(value = "是否重点关注学校;1-是,0-否")
private String zddw;
/**
*
*创建时间
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cjsj;
/**
*
*更新时间
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj;
/**
* 地址
*/
@ApiModelProperty(value = "地址")
private String dz;
/**
* 坐标
*/
@ApiModelProperty(value = "坐标")
private String zb;
/**
* 学校类型(0-幼儿园 1-小学 2-中学 )
*/
@ApiModelProperty(value = "学校类型(0-幼儿园 1-小学 2-中学 )")
private String xxlx;
/**
......@@ -67,13 +77,15 @@ public class SzptXyzhXyxxDTO {
private Integer dakafw;
/**
*
*考勤模板id
*/
@ApiModelProperty(value = "考勤模板id")
private String kqmbid;
/**
*
*二维码
*/
@ApiModelProperty(value = "二维码")
private String qrcode;
public Integer getId() {
......
src/main/java/com/zksy/szpt/domain/dto/XxRwwcqkDTO.java
View file @ 83bce181
......@@ -10,29 +10,33 @@ public class XxRwwcqkDTO {
/**
* 任务ID
*/
@ApiModelProperty(value = "任务ID")
@NotBlank(message = "任务ID不能为空")
private String rwid;
/**
* 义警ID
*/
@ApiModelProperty(value = "义警ID")
@NotBlank(message = "义警ID不能为空")
private String xxyid;
/**
* 姓名
*/
@ApiModelProperty(value = "姓名")
private String xm;
/**
* 联系电话;
*/
@ApiModelProperty(value = "联系电话")
private String lxdh;
/**
* 义警队伍;cslb=3210
*/
@ApiModelProperty(value="义警队伍('0':'50','1':'100','2':'200','3':'300')")
@ApiModelProperty(value="义警队伍('1':'红色卫队','10':'洪桥义警联盟','11':'夹浦义警联盟','12':'小浦义警联盟','13':'水口义警联盟','14':'煤山义警联盟','15':'泗安义警联盟','16':'林城义警联盟','17':'虹星桥义警联盟','18':'和平义警联盟','19':'李家巷义警联盟','2':'绿色卫队','20':'吕山义警联盟','21':'画溪义警联盟','3':'蓝色卫队','4':'白色卫队','5':'橙色卫队','6':'太湖义警联盟','7':'龙山义警联盟','8':'雉城义警联盟','9':'图影义警联盟')")
private String yjdw;
/**
......@@ -52,42 +56,50 @@ public class XxRwwcqkDTO {
/**
* 反馈内容;
*/
@ApiModelProperty(value = "反馈内容")
private String fknr;
/**
* 接收时间
*/
@ApiModelProperty(value = "接收时间")
private Date jssj;
/**
* 反馈时间
*/
@ApiModelProperty(value = "反馈时间")
private Date fksj;
/**
* 审核时间
*/
@ApiModelProperty(value = "审核时间")
private Date shsj;
/**
* 审核人姓名
*/
@ApiModelProperty(value = "审核人姓名")
private String shrxm;
/**
* 审核人id
*/
@ApiModelProperty(value = "审核人id")
@NotBlank(message = "审核人ID不能为空")
private String shrid;
/**
* 审核说明
*/
@ApiModelProperty(value = "审核说明")
private String shsm;
/**
* 运营单位ID
*/
@ApiModelProperty(value = "运营单位ID")
private String mchid;
public String getRwid() {
......
src/main/java/com/zksy/szpt/domain/po/SzptFwxx.java
View file @ 83bce181
......@@ -186,7 +186,7 @@ public class SzptFwxx {
/**
* 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
private String sjgsdwdm;
/**
......
src/main/java/com/zksy/szpt/domain/po/SzptGdSbxx.java
View file @ 83bce181
......@@ -115,7 +115,7 @@ public class SzptGdSbxx {
/**
* 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
private String sjgsdwdm;
/**
......
src/main/java/com/zksy/szpt/domain/po/SzptGdXx.java
View file @ 83bce181
......@@ -191,7 +191,7 @@ public class SzptGdXx {
/**
* 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
private String sjgsdwdm;
/**
......
src/main/java/com/zksy/szpt/domain/po/SzptQyxx.java
View file @ 83bce181
......@@ -85,7 +85,7 @@ public class SzptQyxx {
/**
* 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
@TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
private String sjgsdwdm;
/**
......
src/main/java/com/zksy/szpt/filter/SignatureVerificationFilter.java
View file @ 83bce181
......@@ -80,10 +80,12 @@ public class SignatureVerificationFilter extends OncePerRequestFilter {
String nonce = request.getHeader(SignatureUtil.NONCE);
// 时间戳
String timestampStr = request.getHeader(SignatureUtil.TIMESTAMP);
// 单位
String deptCode = request.getHeader(SignatureUtil.DEPT_CODE);
if (!StringUtils.hasText(appId) || !StringUtils.hasText(sign) || !StringUtils.hasText(nonce) || !StringUtils.hasText(timestampStr)) {
logger.warn("缺少参数appId:{},sign:{},nonce{},timestampStr:{}", appId, sign, nonce, timestampStr);
this.write(response, "请求头缺少参数,appId:" + appId + ",sign:" + sign + ",nonce:" + nonce + ",timestamp:" + timestampStr);
if (!StringUtils.hasText(appId) || !StringUtils.hasText(sign) || !StringUtils.hasText(nonce) || !StringUtils.hasText(timestampStr) || !StringUtils.hasText(deptCode)) {
logger.warn("缺少参数appId:{},sign:{},nonce{},timestampStr:{},deptCode:{}", appId, sign, nonce, timestampStr, deptCode);
this.write(response, "请求头缺少参数,appId:" + appId + ",sign:" + sign + ",nonce:" + nonce + ",timestamp:" + timestampStr + ",deptCode:" + deptCode);
return false;
}
......@@ -114,8 +116,7 @@ public class SignatureVerificationFilter extends OncePerRequestFilter {
// 校验appId
AppStore appStore = this.appStoreService.getAppSecretInfo(appId);
String appSecret = appStore.getAppSecret();
if (!StringUtils.hasText(appSecret)) {
if (appStore == null || appStore.getAppSecret() == null) {
this.write(response, "appId无效：" + appId);
return false;
}
......@@ -125,21 +126,23 @@ public class SignatureVerificationFilter extends OncePerRequestFilter {
Map<String, Object> objectMap = objectMapper.readValue(body, Map.class);
//验证单位
if (objectMap.get("sjgsdwdm") != null && !objectMap.get("sjgsdwdm").toString().startsWith(appStore.getDeptCode().replaceAll("0+$", ""))) {
if (!deptCode.startsWith(appStore.getDeptCode().replaceAll("0+$", ""))) {
write(response, "AppId和传入的单位不匹配,appId:" + appId + ",deptCode:" + objectMap.get("deptCode"));
return false;
}
body = objectMapper.writeValueAsString(objectMap);
logger.info("请求参数appId: {}, nonce: {}, timestampStr: {}, 原始body: {}", appId, nonce, timestampStr, body);
logger.info("请求参数appId: {}, nonce: {}, timestampStr: {}, 原始body: {}, deptCode: {}", appId, nonce, timestampStr, body, deptCode);
String appSecret = appStore.getAppSecret();
body = EncryptUtil.getInstance().AESEncode(body, appSecret);
// logger.info("appSecret{}加密后body: {}", appSecret,body);
// 校验签名appId+nonce+timestampStr+aes(body,secret)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, body);
logger.info("appSecret:{}加密后body: {}", appSecret,body);
// 校验签名appId+nonce+timestampStr+aes(body,secret)+detCode
String data = String.format("%s%s%s%s%s", appId, nonce, timestampStr, body, deptCode);
logger.info("待签名数据:{}", data);
String generatedSignature = DigestUtil.md5Hex(data);
if (!generatedSignature.equals(sign)) {
logger.warn("签名有误,generatedSignature:{},sign:{},appId:{},nonce:{},timestampStr:{}", generatedSignature, sign, appId, nonce, timestampStr);
write(response, "签名有误,sign: " + sign + ",appId: " + appId + ",nonce: " + nonce + ",timestamp: " + timestampStr);
logger.warn("签名有误,generatedSignature:{},sign:{},appId:{},nonce:{},timestampStr:{},deptCode:{}", generatedSignature, sign, appId, nonce, timestampStr, deptCode);
write(response, "签名有误,sign: " + sign + ",appId: " + appId + ",nonce: " + nonce + ",timestamp: " + timestampStr + ",deptCode:" + deptCode);
return false;
}
......@@ -173,7 +176,7 @@ public class SignatureVerificationFilter extends OncePerRequestFilter {
// 增加用户信息
String userId = request.getHeader(SignatureUtil.APPID);
String ip = request.getRemoteAddr();
CurrentUserInfo currentUserInfo = new CurrentUserInfo.CurrentUserInfoBuilder().userId(userId).userName(userId).ip(ip).build();
CurrentUserInfo currentUserInfo = new CurrentUserInfo.CurrentUserInfoBuilder().userId(userId).userName(userId).ip(ip).deptCode(request.getHeader(SignatureUtil.DEPT_CODE)).build();
UserContextHolder.set(currentUserInfo);
}
}
......
src/main/java/com/zksy/szpt/handler/SzptMetaObjectHandler.java
View file @ 83bce181
......@@ -28,6 +28,7 @@ public class SzptMetaObjectHandler implements MetaObjectHandler {
CurrentUserInfo currentUserInfo = UserContextHolder.get();
if (currentUserInfo == null) {
log.error("当前用户信息为空，无法自动填充 create_time, update_time 字段");
return;
}
List<StrictFill> fields = Arrays.asList(
......@@ -35,7 +36,7 @@ public class SzptMetaObjectHandler implements MetaObjectHandler {
StrictFill.of("cjsj", Date.class, new Date()),
StrictFill.of("gxsj", Date.class, new Date()),
StrictFill.of("updateTime", Date.class, new Date()),
// StrictFill.of("sjgsdwdm", String.class, "1"),
StrictFill.of("sjgsdwdm", String.class, currentUserInfo.getDeptCode()),
// StrictFill.of("sjgsdwmc", String.class, "1"),
StrictFill.of("createGajgjgdm", String.class, "1"),
StrictFill.of("createGajgmc", String.class, "1"),
......@@ -59,6 +60,7 @@ public class SzptMetaObjectHandler implements MetaObjectHandler {
CurrentUserInfo currentUserInfo = UserContextHolder.get();
if (currentUserInfo == null) {
log.error("当前用户信息为空，无法自动填充 update_time 字段");
return;
}
List<StrictFill> fields = Arrays.asList(
StrictFill.of("updateTime", Date.class, new Date()),
......
src/main/java/com/zksy/szpt/service/SzptFwxxService.java
View file @ 83bce181
......@@ -7,6 +7,7 @@ import com.zksy.szpt.domain.dto.SzptFwxxDTO;
import com.zksy.szpt.domain.po.SzptFwxx;
import com.zksy.szpt.mapper.SzptFwxxMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -33,7 +34,8 @@ public class SzptFwxxService {
public Integer deleteSzptFwxx(CommonDelDTO commonDelDTO) {
LambdaQueryWrapper<SzptFwxx> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SzptFwxx::getQyid, commonDelDTO.getIds());
wrapper.eq(SzptFwxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
wrapper.eq(SzptFwxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
// wrapper.eq(SzptFwxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
return szptFwxxMapper.delete(wrapper);
}
}
src/main/java/com/zksy/szpt/service/SzptGdSbxxService.java
View file @ 83bce181
......@@ -7,6 +7,7 @@ import com.zksy.szpt.domain.dto.SzptGdSbxxDTO;
import com.zksy.szpt.domain.po.SzptGdSbxx;
import com.zksy.szpt.mapper.SzptGdSbxxMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -32,7 +33,9 @@ public class SzptGdSbxxService {
public Integer deleteSzptGdSbxx(CommonDelDTO commonDelDTO) {
LambdaQueryWrapper<SzptGdSbxx> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SzptGdSbxx::getSbbh, commonDelDTO.getIds());
wrapper.eq(SzptGdSbxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
wrapper.eq(SzptGdSbxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
// wrapper.eq(SzptGdSbxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
return szptGdSbxxMapper.delete(wrapper);
}
}
src/main/java/com/zksy/szpt/service/SzptGdXxService.java
View file @ 83bce181
......@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.SzptGdXxDTO;
import com.zksy.szpt.domain.po.SzptGdSbxx;
import com.zksy.szpt.domain.po.SzptGdXx;
import com.zksy.szpt.mapper.SzptGdXxMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -32,7 +34,8 @@ public class SzptGdXxService {
public Integer deleteSzptGdXx(CommonDelDTO commonDelDTO) {
LambdaQueryWrapper<SzptGdXx> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SzptGdXx::getId, commonDelDTO.getIds());
wrapper.eq(SzptGdXx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
wrapper.eq(SzptGdXx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
// wrapper.eq(SzptGdXx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
return szptGdXxMapper.delete(wrapper);
}
}
src/main/java/com/zksy/szpt/service/SzptQyxxService.java
View file @ 83bce181
......@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zksy.szpt.domain.dto.CommonDelDTO;
import com.zksy.szpt.domain.dto.SzptQyxxDTO;
import com.zksy.szpt.domain.po.SzptGdXx;
import com.zksy.szpt.domain.po.SzptQyxx;
import com.zksy.szpt.mapper.SzptQyxxMapper;
import com.zksy.szpt.util.BeanMapperUtil;
import com.zksy.szpt.util.UserContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -31,6 +33,8 @@ public class SzptQyxxService {
public Integer deleteSzptQyxx(CommonDelDTO commonDelDTO) {
LambdaQueryWrapper<SzptQyxx> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SzptQyxx::getId, commonDelDTO.getIds());
wrapper.eq(SzptQyxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
// wrapper.eq(SzptQyxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
return szptQyxxMapper.delete(wrapper);
}
}
src/main/java/com/zksy/szpt/util/EncryptUtil.java
View file @ 83bce181
......@@ -5,6 +5,7 @@ import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
......@@ -138,10 +139,31 @@ public class EncryptUtil {
/**
* 使用AES加密算法经行加密（可逆）
*
* @param res 需要加密的密文
* @param data 需要加密的密文
* @param password 秘钥
*/
public String AESEncode(String data, String password) {
byte[] key = password.getBytes();//16字节密钥
byte[] iv = "1234567890123456" .getBytes();//iv
SecretKey secretKey = new SecretKeySpec(key, "AES");
try {
IvParameterSpec ivSpec = new IvParameterSpec(iv);
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");//加密算法/模式/填充方式
cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec);
byte[] encrypted = cipher.doFinal(data.getBytes());//密文字节数组
return Base64.encode(encrypted);
} catch (Exception e) {
return null;
}
}
/**
* 使用AES加密算法经行加密（可逆）
*
* @param res 需要加密的密文
* @param key 秘钥
*/
public String AESEncode(String res, String key) {
public String AESEncode1(String res, String key) {
return keyGeneratorES(res, AES, key, keySizeAES, true);
}
......
src/main/java/com/zksy/szpt/util/SignatureUtil.java
View file @ 83bce181
......@@ -5,4 +5,5 @@ public class SignatureUtil {
public static String TIMESTAMP = "x-szpt-timestamp";
public static String NONCE = "x-szpt-nonce";
public static String APPID = "x-szpt-appid";
public static String DEPT_CODE = "x-szpt-dept-code";
}
src/main/resources/application-prod.yml 0 → 100644
View file @ 83bce181
spring:
datasource:
url: jdbc:mysql://192.168.168.110:3306/szpt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
database: 0
port: 6379
password: 1qaz2wsx
timeout: 1000
host: 192.168.168.110
\ No newline at end of file
src/test/java/com/zksy/szpt/MainTestX.java
View file @ 83bce181
......@@ -20,7 +20,7 @@ public class MainTestX {
public void szptClockInAddTest() {
//请求参数
SzptClockInDTO szptClockInDTO = new SzptClockInDTO();
szptClockInDTO.setId(3);
szptClockInDTO.setId(1);
szptClockInDTO.setCsid("123456111111111111111");
szptClockInDTO.setSbqd("123456");
szptClockInDTO.setXbqt("123456");
......@@ -170,8 +170,8 @@ public class MainTestX {
szptFwxxDTO.setFkdjzdsh("1");
szptFwxxDTO.setQtfwyt("1");
szptFwxxDTO.setJkmhysj(new Date());
szptFwxxDTO.setSjgsdwdm("330102");
szptFwxxDTO.setSjgsdwmc("1");
// szptFwxxDTO.setSjgsdwdm("330102");
// szptFwxxDTO.setSjgsdwmc("1");
szptFwxxDTO.setFzzjzp("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
}
......@@ -216,8 +216,8 @@ public class MainTestX {
szptFwxxDTO.setFkdjzdsh("1");
szptFwxxDTO.setQtfwyt("1");
szptFwxxDTO.setJkmhysj(new Date());
szptFwxxDTO.setSjgsdwdm("330102");
szptFwxxDTO.setSjgsdwmc("1");
// szptFwxxDTO.setSjgsdwdm("330102");
// szptFwxxDTO.setSjgsdwmc("1");
szptFwxxDTO.setFzzjzp("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
}
......@@ -427,8 +427,8 @@ public class MainTestX {
szptGdSbxxDTO.setSbcs("1");
szptGdSbxxDTO.setSblb("1");
szptGdSbxxDTO.setZt("1");
szptGdSbxxDTO.setSjgsdwdm("330102");
szptGdSbxxDTO.setSjgsdwmc("1");
// szptGdSbxxDTO.setSjgsdwdm("330102");
// szptGdSbxxDTO.setSjgsdwmc("1");
szptGdSbxxDTO.setCreateGajgjgdm("123");
szptGdSbxxDTO.setCreateGajgmc("123");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
......@@ -457,8 +457,8 @@ public class MainTestX {
szptGdSbxxDTO.setSbcs("1");
szptGdSbxxDTO.setSblb("1");
szptGdSbxxDTO.setZt("1");
szptGdSbxxDTO.setSjgsdwdm("330102");
szptGdSbxxDTO.setSjgsdwmc("1");
// szptGdSbxxDTO.setSjgsdwdm("330102");
// szptGdSbxxDTO.setSjgsdwmc("1");
szptGdSbxxDTO.setCreateGajgjgdm("123");
szptGdSbxxDTO.setCreateGajgmc("123");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
......@@ -520,8 +520,8 @@ public class MainTestX {
szptGdXxDTO.setSqmc("123");
szptGdXxDTO.setMdlx("1");
szptGdXxDTO.setMdjyzt("1");
szptGdXxDTO.setSjgsdwdm("330102");
szptGdXxDTO.setSjgsdwmc("1");
// szptGdXxDTO.setSjgsdwdm("330102");
// szptGdXxDTO.setSjgsdwmc("1");
szptGdXxDTO.setCreateGajgjgdm("1");
szptGdXxDTO.setCreateGajgmc("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
......@@ -567,8 +567,8 @@ public class MainTestX {
szptGdXxDTO.setSqmc("123");
szptGdXxDTO.setMdlx("1");
szptGdXxDTO.setMdjyzt("1");
szptGdXxDTO.setSjgsdwdm("330102");
szptGdXxDTO.setSjgsdwmc("1");
// szptGdXxDTO.setSjgsdwdm("330102");
// szptGdXxDTO.setSjgsdwmc("1");
szptGdXxDTO.setCreateGajgjgdm("1");
szptGdXxDTO.setCreateGajgmc("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
......@@ -674,8 +674,8 @@ public class MainTestX {
szptQyxxDTO.setCustomlat("30");
szptQyxxDTO.setZt("1");
szptQyxxDTO.setSjgsdwdm("330102");
szptQyxxDTO.setSjgsdwmc("123");
// szptQyxxDTO.setSjgsdwdm("330102");
// szptQyxxDTO.setSjgsdwmc("123");
szptQyxxDTO.setCreateGajgjgdm("123");
szptQyxxDTO.setCreateGajgmc("120.3");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
......@@ -701,8 +701,8 @@ public class MainTestX {
szptQyxxDTO.setCustomlat("30");
szptQyxxDTO.setZt("1");
szptQyxxDTO.setSjgsdwdm("330102");
szptQyxxDTO.setSjgsdwmc("123");
// szptQyxxDTO.setSjgsdwdm("330102");
// szptQyxxDTO.setSjgsdwmc("123");
szptQyxxDTO.setCreateGajgjgdm("123");
szptQyxxDTO.setCreateGajgmc("120.3");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
......
src/test/java/com/zksy/szpt/TestAppStore.java
View file @ 83bce181
......@@ -15,13 +15,16 @@ public class TestAppStore {
@Test
@DisplayName("新增AppId")
public void addAppId() {
AppStoreDTO appStoreDTO = new AppStoreDTO();
appStoreDTO.setAppKey("us2");
appStoreDTO.setAppSecret(DigestUtil.md5Hex("us"));
appStoreDTO.setDeptCode("123456");
for (int i = 0; i < 10000; i++) {
AppStoreDTO appStoreDTO = new AppStoreDTO();
appStoreDTO.setAppKey("scale");
appStoreDTO.setAppSecret(DigestUtil.md5Hex("scale"));
appStoreDTO.setDeptCode("330102");
TestHttpUtil.signatureAndRequest("/rest/appStore/updateAppIdSecret", appStoreDTO, AppStoreDTO.class);
TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
}
// TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);
// TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO);
}
......
src/test/java/com/zksy/szpt/TestHttpUtil.java
View file @ 83bce181
......@@ -32,12 +32,10 @@ public class TestHttpUtil {
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
// log.info("请求参数appId: {}, nonce: {}, timestampStr: {}, 原始body: {}", appId, nonce, timestampStr, json);
//请求体加密
json = EncryptUtil.getInstance().AESEncode(json, appSecret);
// log.info("{}加密后json: {}", appSecret,json);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json);
//签名appId+nonce+timestampStr+aes(body)+deptCode
String data = String.format("%s%s%s%s%S", appId, nonce, timestampStr, json, deptCode);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
......@@ -49,6 +47,7 @@ public class TestHttpUtil {
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.header(SignatureUtil.DEPT_CODE, deptCode)
.body(Mono.just(source), destinationClass)
.retrieve()
.bodyToMono(String.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment