Skip to content

S
szpt
Commit e5b1c795 authored by 以墨为白's avatar 以墨为白 🎧
Browse files
Options

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

parents 235a7264 7b9c34f6
Hide whitespace changes
Inline Side-by-side
Showing with 738 additions and 602 deletions
src/main/java/com/zksy/szpt/domain/dto/SzptGdCsyjhldxDTO.java
View file @ e5b1c795
...@@ -2,6 +2,7 @@ package com.zksy.szpt.domain.dto; ...@@ -2,6 +2,7 @@ package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdRyxxDTO.java
View file @ e5b1c795
...@@ -3,6 +3,7 @@ package com.zksy.szpt.domain.dto; ...@@ -3,6 +3,7 @@ package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
...@@ -12,13 +13,6 @@ import java.util.Date; ...@@ -12,13 +13,6 @@ import java.util.Date;
public class SzptGdRyxxDTO { public class SzptGdRyxxDTO {
/**
* 人员ID
*/
@NotBlank(message = "人员ID不能为空")
private String id;
/** /**
* 人口编码 * 人口编码
*/ */
...@@ -44,6 +38,7 @@ public class SzptGdRyxxDTO { ...@@ -44,6 +38,7 @@ public class SzptGdRyxxDTO {
/** /**
* 性别;cslb=1065 * 性别;cslb=1065
*/ */
@ApiModelProperty(value = "性别( '0':'未知的性别','1':'男性,'2':'女性','5':'女性改(变)男性', '6': '男性改(变)女性'), '9': '未说明的性别'")
private String xb; private String xb;
/** /**
...@@ -245,15 +240,6 @@ public class SzptGdRyxxDTO { ...@@ -245,15 +240,6 @@ public class SzptGdRyxxDTO {
*/ */
private String sjrzrs; private String sjrzrs;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getRkbm() { public String getRkbm() {
return rkbm; return rkbm;
} }
......
src/main/java/com/zksy/szpt/domain/dto/SzptGdSbxxDTO.java
View file @ e5b1c795
package com.zksy.szpt.domain.dto; 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
public class SzptGdSbxxDTO { public class SzptGdSbxxDTO {
/**
* 设备ID
*/
@NotBlank(message = "设备ID不能为空")
private String id;
/** /**
* 设备序列号 * 设备序列号
*/ */
...@@ -64,6 +57,7 @@ public class SzptGdSbxxDTO { ...@@ -64,6 +57,7 @@ public class SzptGdSbxxDTO {
* 运行状态 cslb=1053 * 运行状态 cslb=1053
*/ */
@NotBlank(message = "运行状态不能为空") @NotBlank(message = "运行状态不能为空")
@ApiModelProperty(value = "")
private String yxzt; private String yxzt;
/** /**
...@@ -133,15 +127,6 @@ public class SzptGdSbxxDTO { ...@@ -133,15 +127,6 @@ public class SzptGdSbxxDTO {
@NotBlank(message = "登记公安机关名称不能为空") @NotBlank(message = "登记公安机关名称不能为空")
private String createGajgmc; private String createGajgmc;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSbsn() { public String getSbsn() {
return sbsn; return sbsn;
} }
......
src/main/java/com/zksy/szpt/domain/dto/SzptQyxxDTO.java
View file @ e5b1c795
package com.zksy.szpt.domain.dto; package com.zksy.szpt.domain.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
public class SzptQyxxDTO { public class SzptQyxxDTO {
/**
* 区域ID
*/
@NotBlank(message = "区域ID不能为空")
private String id;
/** /**
* 场所ID * 场所ID
*/ */
...@@ -99,6 +107,14 @@ public class SzptQyxxDTO { ...@@ -99,6 +107,14 @@ public class SzptQyxxDTO {
@NotBlank(message = "登记公安机关名称不能为空") @NotBlank(message = "登记公安机关名称不能为空")
private String createGajgmc; private String createGajgmc;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCsid() { public String getCsid() {
return csid; return csid;
} }
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhKqmbDTO.java
View file @ e5b1c795
...@@ -3,6 +3,12 @@ package com.zksy.szpt.domain.dto; ...@@ -3,6 +3,12 @@ package com.zksy.szpt.domain.dto;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
public class SzptXyzhKqmbDTO { public class SzptXyzhKqmbDTO {
/**
* 模板id
*/
@NotBlank(message = "模板id不能为空")
private String id;
/** /**
* 模板名称 * 模板名称
*/ */
...@@ -15,6 +21,13 @@ public class SzptXyzhKqmbDTO { ...@@ -15,6 +21,13 @@ public class SzptXyzhKqmbDTO {
@NotBlank(message = "状态不能为空") @NotBlank(message = "状态不能为空")
private String zt; private String zt;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getMbmc() { public String getMbmc() {
return mbmc; return mbmc;
} }
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhMbdhDTO.java
View file @ e5b1c795
...@@ -6,6 +6,13 @@ import javax.validation.constraints.NotBlank; ...@@ -6,6 +6,13 @@ import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
public class SzptXyzhMbdhDTO { public class SzptXyzhMbdhDTO {
/**
* 模板itemid
*/
@NotBlank(message = "模板itemid不能为空")
private String id;
/** /**
* 模板id * 模板id
*/ */
...@@ -85,6 +92,14 @@ public class SzptXyzhMbdhDTO { ...@@ -85,6 +92,14 @@ public class SzptXyzhMbdhDTO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gxsj; private Date gxsj;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getMbid() { public String getMbid() {
return mbid; return mbid;
} }
......
src/main/java/com/zksy/szpt/domain/dto/SzptXyzhXyxxDTO.java
View file @ e5b1c795
package com.zksy.szpt.domain.dto; package com.zksy.szpt.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
public class SzptXyzhXyxxDTO { public class SzptXyzhXyxxDTO {
/**
*
*/
@NotNull(message = "id不能为空")
private Integer id;
/** /**
* 学校名称 * 学校名称
...@@ -68,6 +73,13 @@ public class SzptXyzhXyxxDTO { ...@@ -68,6 +73,13 @@ public class SzptXyzhXyxxDTO {
*/ */
private String qrcode; private String qrcode;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getMc() { public String getMc() {
return mc; return mc;
......
src/main/java/com/zksy/szpt/domain/dto/XxRwwcqkDTO.java
View file @ e5b1c795
package com.zksy.szpt.domain.dto; package com.zksy.szpt.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
...@@ -42,6 +44,7 @@ public class XxRwwcqkDTO { ...@@ -42,6 +44,7 @@ public class XxRwwcqkDTO {
* 报名状态;cslb=1005 * 报名状态;cslb=1005
*/ */
@NotBlank(message = "报名状态不能为空") @NotBlank(message = "报名状态不能为空")
@ApiModelProperty(value = "报名状态( 1':'通过','2':'未通过'")
private String bmzt; private String bmzt;
/** /**
......
src/main/java/com/zksy/szpt/domain/dto/XxShxxyDTO.java
View file @ e5b1c795
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
...@@ -25,6 +26,7 @@ public class XxShxxyDTO { ...@@ -25,6 +26,7 @@ public class XxShxxyDTO {
/** /**
* 信息员类型;cslb=1021,l,q * 信息员类型;cslb=1021,l,q
*/ */
@ApiModelProperty(value = "信息员类型('1':'普通信息员', '2': '耳目','3': '刑事特情')")
private String xxylx; private String xxylx;
/** /**
...@@ -40,6 +42,7 @@ public class XxShxxyDTO { ...@@ -40,6 +42,7 @@ public class XxShxxyDTO {
/** /**
* 等级;cslb=1031,l,q * 等级;cslb=1031,l,q
*/ */
@ApiModelProperty(value = "等级('0':'惰性信息员', '1':'一般信息员','2':'活跃信息员', '3': '尖子信息员', '9': '僵尸信息员')")
private String dj; private String dj;
/** /**
...@@ -65,6 +68,7 @@ public class XxShxxyDTO { ...@@ -65,6 +68,7 @@ public class XxShxxyDTO {
/** /**
* 职业类型;cslb=1022,l * 职业类型;cslb=1022,l
*/ */
@ApiModelProperty(value = "职业类型( '101': '小区（物业）保安', '102': '楼道小组长', '103': '环卫工人','104': '城管协管员','105': '交警协警员', '106': '报刊亭（人员）', '107':'邮递员','108': '志愿者','109': '社区工作者','110':'单位（综治）人员','111': '精卫医生', '112': '抄表员', '113': '送奶工', '114': '巡防队员', '115':'其他人员', '116': '便衣抓捕队员', '117':'视频作战队员', '118': '网格员', '119': '网格员发展信息员', '120': '数字城管','123':'废旧金属回收','124': '打复誊店')")
private String zylx; private String zylx;
/** /**
...@@ -116,6 +120,7 @@ public class XxShxxyDTO { ...@@ -116,6 +120,7 @@ public class XxShxxyDTO {
* 上报发送状态;cslb=1037 * 上报发送状态;cslb=1037
*/ */
@NotBlank(message = "上报发送状态不能为空") @NotBlank(message = "上报发送状态不能为空")
@ApiModelProperty(value = "职业类型('0':'初始', '1':'上报成功', '2':'上报失败', '3': '处理中', '9':'待上报')")
private String sbfszt; private String sbfszt;
/** /**
...@@ -132,6 +137,7 @@ public class XxShxxyDTO { ...@@ -132,6 +137,7 @@ public class XxShxxyDTO {
/** /**
* 回访标志;cslb=1152,l,q * 回访标志;cslb=1152,l,q
*/ */
@ApiModelProperty(value = "回访标志( '1':'未回复','2': '不知晓', '3': '知晓')")
private String hfbz; private String hfbz;
/** /**
...@@ -152,6 +158,7 @@ public class XxShxxyDTO { ...@@ -152,6 +158,7 @@ public class XxShxxyDTO {
/** /**
* 状态;cslb=1008,l,q * 状态;cslb=1008,l,q
*/ */
@ApiModelProperty(value = "状态('0': '注销', '1',:'正常')")
@NotBlank(message = "状态不能为空") @NotBlank(message = "状态不能为空")
private String zt; private String zt;
......
src/main/java/com/zksy/szpt/domain/dto/XxZhjfbgDTO.java
View file @ e5b1c795
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -36,6 +37,7 @@ public class XxZhjfbgDTO { ...@@ -36,6 +37,7 @@ public class XxZhjfbgDTO {
/** /**
* 变更类型;cslb=1019 * 变更类型;cslb=1019
*/ */
@ApiModelProperty(value = "变更类型('1':'奖励', '2': '兑换')")
private String bglx; private String bglx;
/** /**
......
src/main/java/com/zksy/szpt/domain/dto/XxZhxxDTO.java
View file @ e5b1c795
package com.zksy.szpt.domain.dto; package com.zksy.szpt.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
...@@ -9,119 +11,142 @@ public class XxZhxxDTO { ...@@ -9,119 +11,142 @@ public class XxZhxxDTO {
* 账户ID * 账户ID
*/ */
@NotBlank(message = "账户ID不能为空") @NotBlank(message = "账户ID不能为空")
@ApiModelProperty(value = "账户ID")
private String zhid; private String zhid;
/** /**
* 账户类型;cslb=1004 * 账户类型;cslb=1004
*/ */
@ApiModelProperty(value = "账户类型('0':'微信', '1':'短信','2':'钉钉')")
private String zhlx; private String zhlx;
/** /**
* 社会信息员ID * 社会信息员ID
*/ */
@ApiModelProperty(value = "社会信息员ID")
private String xxyid; private String xxyid;
/** /**
* 姓名 * 姓名
*/ */
@ApiModelProperty(value = "姓名")
private String xm; private String xm;
/** /**
* 身份证号 * 身份证号
*/ */
@ApiModelProperty(value = "身份证号")
private String sfzh; private String sfzh;
/** /**
* 联系电话 * 联系电话
*/ */
@ApiModelProperty(value = "联系电话")
private String lxdh; private String lxdh;
/** /**
* OPENID * OPENID
*/ */
@ApiModelProperty(value = "OPENID")
private String openid; private String openid;
/** /**
* 昵称 * 昵称
*/ */
@ApiModelProperty(value = "昵称")
private String nc; private String nc;
/** /**
* UNIONID * UNIONID
*/ */
@ApiModelProperty(value = "UNIONID")
private String unionid; private String unionid;
/** /**
* 发送情报数 * 发送情报数
*/ */
@ApiModelProperty(value = "发送情报数")
private String fsqbs; private String fsqbs;
/** /**
* 小程序ID * 小程序ID
*/ */
@ApiModelProperty(value = "小程序ID")
private String accountid; private String accountid;
/** /**
* 前端权限,默认空,支持多个,逗号分隔 * 前端权限,默认空,支持多个,逗号分隔
*/ */
@ApiModelProperty(value = "前端权限")
private String roles; private String roles;
/** /**
* 邀请码 * 邀请码
*/ */
@ApiModelProperty(value = "邀请码")
private String yqm; private String yqm;
/** /**
* 邀请码ID * 邀请码ID
*/ */
@ApiModelProperty(value = "邀请码ID")
private String yqmid; private String yqmid;
/** /**
* 处理标志;cslb=1017 * 处理标志;cslb=1017
*/ */
@NotBlank(message = "处理标志不能为空") @NotBlank(message = "处理标志不能为空")
@ApiModelProperty(value = "处理标志( '1':'处理成功','2':'处理失败', '3':'处理中')")
private String clbz; private String clbz;
/** /**
* 处理时间 * 处理时间
*/ */
@ApiModelProperty(value = "处理时间")
private Date clsj; private Date clsj;
/** /**
* 处理结果 * 处理结果
*/ */
@ApiModelProperty(value = "处理结果")
private String cljg; private String cljg;
/** /**
* 返回时间 * 返回时间
*/ */
@ApiModelProperty(value = "返回时间")
private Date fhsj; private Date fhsj;
/** /**
* OCUUID * OCUUID
*/ */
@ApiModelProperty(value = "OCUUID")
private String ocuuid; private String ocuuid;
/** /**
* 帐号参数JSON * 帐号参数JSON
*/ */
@ApiModelProperty(value = "帐号参数JSON")
private String zhcs; private String zhcs;
/** /**
* 运营商户ID * 运营商户ID
*/ */
@ApiModelProperty(value = "运营商户ID")
private String mchid; private String mchid;
/** /**
* 状态;cslb=1008 * 状态;cslb=1008
*/ */
@NotBlank(message = "状态不能为空") @NotBlank(message = "状态不能为空")
@ApiModelProperty(value = "状态('1':'正常', '0':'注销')")
private String zt; private String zt;
/** /**
* 头像 * 头像
*/ */
@ApiModelProperty(value = "头像")
private String avatar; private String avatar;
......
src/main/java/com/zksy/szpt/domain/po/SzptGdRyxx.java
View file @ e5b1c795
package com.zksy.szpt.domain.po; package com.zksy.szpt.domain.po;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
...@@ -14,7 +15,7 @@ public class SzptGdRyxx { ...@@ -14,7 +15,7 @@ public class SzptGdRyxx {
/** /**
* 人员ID * 人员ID
*/ */
@TableId(type = IdType.INPUT) @TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**
...@@ -40,6 +41,7 @@ public class SzptGdRyxx { ...@@ -40,6 +41,7 @@ public class SzptGdRyxx {
/** /**
* 性别;cslb=1065 * 性别;cslb=1065
*/ */
@ApiModelProperty(value = "性别( '0':'未知的性别','1':'男性,'2':'女性','5':'女性改(变)男性', '6': '男性改(变)女性'), '9': '未说明的性别'")
private String xb; private String xb;
/** /**
......
src/main/java/com/zksy/szpt/domain/po/SzptXyzhXyxx.java
View file @ e5b1c795
...@@ -9,7 +9,7 @@ public class SzptXyzhXyxx { ...@@ -9,7 +9,7 @@ public class SzptXyzhXyxx {
/** /**
* *
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.INPUT)
private Integer id; private Integer id;
/** /**
......
src/main/java/com/zksy/szpt/domain/po/XxRwwcqk.java
View file @ e5b1c795
package com.zksy.szpt.domain.po; package com.zksy.szpt.domain.po;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
...@@ -50,6 +51,7 @@ public class XxRwwcqk { ...@@ -50,6 +51,7 @@ public class XxRwwcqk {
/** /**
* 报名状态;cslb=1005 * 报名状态;cslb=1005
*/ */
@ApiModelProperty(value = "报名状态( '0':'待审核','1':'通过,'2':'未通过')")
private String bmzt; private String bmzt;
/** /**
......
src/main/java/com/zksy/szpt/domain/po/XxShxxy.java
View file @ e5b1c795
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
...@@ -27,6 +28,7 @@ public class XxShxxy { ...@@ -27,6 +28,7 @@ public class XxShxxy {
/** /**
* 信息员类型;cslb=1021,l,q * 信息员类型;cslb=1021,l,q
*/ */
@ApiModelProperty(value = "信息员类型('1':'普通信息员', '2': '耳目','3': '刑事特情')")
private String xxylx; private String xxylx;
/** /**
......
src/main/java/com/zksy/szpt/domain/po/XxZhxx.java
View file @ e5b1c795
package com.zksy.szpt.domain.po; package com.zksy.szpt.domain.po;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
...@@ -19,6 +20,7 @@ public class XxZhxx { ...@@ -19,6 +20,7 @@ public class XxZhxx {
/** /**
* 账户类型;cslb=1004 * 账户类型;cslb=1004
*/ */
@ApiModelProperty(value = "账户类型('0':'微信', '1':'短信','2':'钉钉')")
private String zhlx; private String zhlx;
/** /**
...@@ -84,6 +86,7 @@ public class XxZhxx { ...@@ -84,6 +86,7 @@ public class XxZhxx {
/** /**
* 处理标志;cslb=1017 * 处理标志;cslb=1017
*/ */
@ApiModelProperty(value = "账户类型( '0':'未处理','1':'处理成功,'2':'处理失败,'3':'处理中')")
private String clbz; private String clbz;
/** /**
...@@ -119,6 +122,7 @@ public class XxZhxx { ...@@ -119,6 +122,7 @@ public class XxZhxx {
/** /**
* 状态;cslb=1008 * 状态;cslb=1008
*/ */
@ApiModelProperty(value = "账户类型('0':'注销', '1':'正常')")
private String zt; private String zt;
/** /**
......
src/test/java/com/zksy/szpt/MainTest.java
View file @ e5b1c795
...@@ -49,7 +49,7 @@ public class MainTest { ...@@ -49,7 +49,7 @@ public class MainTest {
xxRwwcqkDTO.setShrid("123456785"); xxRwwcqkDTO.setShrid("123456785");
xxRwwcqkDTO.setWczt("1"); xxRwwcqkDTO.setWczt("1");
xxRwwcqkDTO.setBmzt("1"); xxRwwcqkDTO.setBmzt("1");
// TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class); TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class); TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
} }
...@@ -65,7 +65,7 @@ public class MainTest { ...@@ -65,7 +65,7 @@ public class MainTest {
dto.setXxyid("11"); dto.setXxyid("11");
dto.setZt("2"); dto.setZt("2");
dto.setClbz("2"); dto.setClbz("2");
// TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class);
} }
...@@ -81,7 +81,7 @@ public class MainTest { ...@@ -81,7 +81,7 @@ public class MainTest {
dto.setDhid("12345678"); dto.setDhid("12345678");
dto.setQbid("2"); dto.setQbid("2");
dto.setBgsj(new Date()); dto.setBgsj(new Date());
// TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class);
} }
...@@ -144,7 +144,7 @@ public class MainTest { ...@@ -144,7 +144,7 @@ public class MainTest {
dto.setGzrs(1L); dto.setGzrs(1L);
dto.setSfsh(1); dto.setSfsh(1);
dto.setWcrs(1L); dto.setWcrs(1L);
// TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class);
} }
...@@ -162,7 +162,7 @@ public class MainTest { ...@@ -162,7 +162,7 @@ public class MainTest {
dto.setMchid("11111"); dto.setMchid("11111");
dto.setZt("1"); dto.setZt("1");
dto.setYjdwmc("test"); dto.setYjdwmc("test");
// TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class);
} }
...@@ -173,7 +173,7 @@ public class MainTest { ...@@ -173,7 +173,7 @@ public class MainTest {
dto.setId("12345678"); dto.setId("12345678");
dto.setDwdm("12345678"); dto.setDwdm("12345678");
dto.setShxxyid("12345678"); dto.setShxxyid("12345678");
// TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class);
} }
...@@ -185,7 +185,7 @@ public class MainTest { ...@@ -185,7 +185,7 @@ public class MainTest {
dto.setZt("1"); dto.setZt("1");
dto.setSbfszt("1"); dto.setSbfszt("1");
dto.setShrid("1"); dto.setShrid("1");
// TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class);
} }
...@@ -203,8 +203,13 @@ public class MainTest { ...@@ -203,8 +203,13 @@ public class MainTest {
// String url="xxYjdwdm/delete"; // String url="xxYjdwdm/delete";
// String url="xxYjrw/delete"; // String url="xxYjrw/delete";
// String url="xxZhjfbg/delete"; // String url="xxZhjfbg/delete";
String url = "xxZhxx/delete"; // String url = "xxZhxx/delete";
TestHttpUtil.signatureAndRequest("/rest/"+url, dto, CommonDelParamDTO.class); TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxShxxy/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxYjrw/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/delete", dto, CommonDelParamDTO.class);
TestHttpUtil.signatureAndRequest("/rest/xxZhxx/delete", dto, CommonDelParamDTO.class);
} }
} }
src/test/java/com/zksy/szpt/MainTestX.java
View file @ e5b1c795
package com.zksy.szpt; package com.zksy.szpt;
import cn.hutool.crypto.digest.DigestUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zksy.szpt.domain.dto.*; import com.zksy.szpt.domain.dto.*;
import com.zksy.szpt.service.AppStoreService;
import com.zksy.szpt.util.EncryptUtil;
import com.zksy.szpt.util.SignatureUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@SpringBootTest() @SpringBootTest()
public class MainTestX { public class MainTestX {
String nonce = "2";
String timestampStr = "21";
String appId = "1872576325743943682";
@Resource
private ObjectMapper objectMapper;
@Resource
private AppStoreService appStoreService;
/** /**
* ===================================================考勤=================================================== * ===================================================考勤===================================================
*/ */
@Test @Test
@DisplayName("考勤--新增、更新") @DisplayName("考勤--新增")
public void szptClockInTest() { public void szptClockInAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptClockInDTO szptClockInDTO = new SzptClockInDTO(); SzptClockInDTO szptClockInDTO = new SzptClockInDTO();
szptClockInDTO.setId(100); szptClockInDTO.setId(3);
szptClockInDTO.setCsid("123456111111111111111"); szptClockInDTO.setCsid("123456111111111111111");
szptClockInDTO.setSbqd("123456"); szptClockInDTO.setSbqd("123456");
szptClockInDTO.setXbqt("123456"); szptClockInDTO.setXbqt("123456");
...@@ -58,89 +34,60 @@ public class MainTestX { ...@@ -58,89 +34,60 @@ public class MainTestX {
szptClockInDTO.setQtdkdd("1"); szptClockInDTO.setQtdkdd("1");
szptClockInDTO.setQtdkzp("1"); szptClockInDTO.setQtdkzp("1");
szptClockInDTO.setGkdj("1"); szptClockInDTO.setGkdj("1");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/addSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
try { }
json = objectMapper.writeValueAsString(szptClockInDTO);
} catch (JsonProcessingException e) { @Test
Assertions.fail("json序列化失败"); @DisplayName("考勤--更新")
} public void szptClockInUpdateTest() {
//请求体加密 //请求参数
json = EncryptUtil.getInstance().AESEncode(json, secretKey); SzptClockInDTO szptClockInDTO = new SzptClockInDTO();
//签名appId+nonce+timestampStr+aes(body) szptClockInDTO.setId(1);
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptClockInDTO.setCsid("111111");
String generatedSignature = DigestUtil.md5Hex(data); szptClockInDTO.setSbqd("1");
//请求 szptClockInDTO.setXbqt("1");
WebClient webClient = WebClient.builder() szptClockInDTO.setXcqk("1");
.baseUrl("http://localhost:8086") szptClockInDTO.setSbsj("1");
.defaultHeader("Content-Type", "application/json") szptClockInDTO.setSbr("123456");
.build(); szptClockInDTO.setQdr("123456");
String response = webClient.post().uri("/rest/index/updateSzptClockIn") szptClockInDTO.setQdrlxdh("123456");
.header(SignatureUtil.APPID, appId) szptClockInDTO.setQddkdd("1");
.header(SignatureUtil.NONCE, nonce) szptClockInDTO.setQddkzp("1");
.header(SignatureUtil.TIMESTAMP, timestampStr) szptClockInDTO.setQtdkdd("1");
.header(SignatureUtil.SIGNATURE, generatedSignature) szptClockInDTO.setQtdkzp("1");
.body(Mono.just(szptClockInDTO), SzptClockInDTO.class) szptClockInDTO.setGkdj("1");
.retrieve() TestHttpUtil.signatureAndRequest("/rest/index/updateSzptClockIn", szptClockInDTO, SzptClockInDTO.class);
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
@Test @Test
@DisplayName("考勤--删除") @DisplayName("考勤--删除")
public void deleteClockInTest() { public void szptClockInDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<Integer> ids = new ArrayList<>(); List<Integer> ids = new ArrayList<>();
ids.add(14); ids.add(16);
ids.add(15); ids.add(17);
ids.add(18);
ids.add(19);
ids.add(20);
ids.add(21);
ids.add(22);
ids.add(25);
ids.add(100);
CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO(); CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO();
commonDelIntDTO.setIds(ids); commonDelIntDTO.setIds(ids);
commonDelIntDTO.setSjgsdwdm("330102"); commonDelIntDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptClockIn", commonDelIntDTO, CommonDelIntDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelIntDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
json = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptClockIn")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelIntDTO), CommonDelIntDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================考勤规则=================================================== * ===================================================考勤规则===================================================
*/ */
@Test @Test
@DisplayName("考勤规则--新增、更新") @DisplayName("考勤规则--新增")
public void szptClockInRulesTest() { public void szptClockInRulesAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptClockInRulesDTO szptClockInRulesDTO = new SzptClockInRulesDTO(); SzptClockInRulesDTO szptClockInRulesDTO = new SzptClockInRulesDTO();
szptClockInRulesDTO.setId(100); szptClockInRulesDTO.setId(2);
szptClockInRulesDTO.setName("123456"); szptClockInRulesDTO.setName("123456");
szptClockInRulesDTO.setCsid("123456"); szptClockInRulesDTO.setCsid("123456");
szptClockInRulesDTO.setChockInTime("123456"); szptClockInRulesDTO.setChockInTime("123456");
...@@ -148,87 +95,44 @@ public class MainTestX { ...@@ -148,87 +95,44 @@ public class MainTestX {
szptClockInRulesDTO.setQrCode("1"); szptClockInRulesDTO.setQrCode("1");
szptClockInRulesDTO.setCslx("123456"); szptClockInRulesDTO.setCslx("123456");
szptClockInRulesDTO.setBz("123456"); szptClockInRulesDTO.setBz("123456");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/addSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
try { }
json = objectMapper.writeValueAsString(szptClockInRulesDTO);
} catch (JsonProcessingException e) { @Test
Assertions.fail("json序列化失败"); @DisplayName("考勤规则--更新")
} public void szptClockInRulesUpdateTest() {
//请求体加密 //请求参数
json = EncryptUtil.getInstance().AESEncode(json, secretKey); SzptClockInRulesDTO szptClockInRulesDTO = new SzptClockInRulesDTO();
//签名appId+nonce+timestampStr+aes(body) szptClockInRulesDTO.setId(2);
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptClockInRulesDTO.setName("22222");
String generatedSignature = DigestUtil.md5Hex(data); szptClockInRulesDTO.setCsid("22222");
//请求 szptClockInRulesDTO.setChockInTime("22222");
WebClient webClient = WebClient.builder() szptClockInRulesDTO.setClockInScope("1");
.baseUrl("http://localhost:8086") szptClockInRulesDTO.setQrCode("1");
.defaultHeader("Content-Type", "application/json") szptClockInRulesDTO.setCslx("123456");
.build(); szptClockInRulesDTO.setBz("123456");
// String response = webClient.post().uri("/rest/index/addSzptClockInRules") TestHttpUtil.signatureAndRequest("/rest/index/updateSzptClockInRules", szptClockInRulesDTO, SzptClockInRulesDTO.class);
String response = webClient.post().uri("/rest/index/updateSzptClockInRules")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(szptClockInRulesDTO), SzptClockInRulesDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
@Test @Test
@DisplayName("考勤规则--删除") @DisplayName("考勤规则--删除")
public void deleteClockInRulesTest() { public void szptClockInRulesDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<Integer> ids = new ArrayList<>(); List<Integer> ids = new ArrayList<>();
ids.add(4); ids.add(1);
ids.add(100); ids.add(2);
CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO(); CommonDelIntDTO commonDelIntDTO = new CommonDelIntDTO();
commonDelIntDTO.setIds(ids); commonDelIntDTO.setIds(ids);
commonDelIntDTO.setSjgsdwdm("330102"); commonDelIntDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptClockInRules", commonDelIntDTO, CommonDelIntDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelIntDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
json = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptClockInRules")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelIntDTO), CommonDelIntDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================房屋信息=================================================== * ===================================================房屋信息===================================================
*/ */
@Test @Test
@DisplayName("房屋信息--新增、更新") @DisplayName("房屋信息--新增")
public void szptFwxxTest() { public void szptFwxxAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptFwxxDTO szptFwxxDTO = new SzptFwxxDTO(); SzptFwxxDTO szptFwxxDTO = new SzptFwxxDTO();
szptFwxxDTO.setQyid("5"); szptFwxxDTO.setQyid("5");
...@@ -269,88 +173,79 @@ public class MainTestX { ...@@ -269,88 +173,79 @@ public class MainTestX {
szptFwxxDTO.setSjgsdwdm("330102"); szptFwxxDTO.setSjgsdwdm("330102");
szptFwxxDTO.setSjgsdwmc("1"); szptFwxxDTO.setSjgsdwmc("1");
szptFwxxDTO.setFzzjzp("1"); szptFwxxDTO.setFzzjzp("1");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/addSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
try { }
json = objectMapper.writeValueAsString(szptFwxxDTO);
} catch (JsonProcessingException e) { @Test
Assertions.fail("json序列化失败"); @DisplayName("房屋信息--更新")
} public void szptFwxxUpdateTest() {
//请求体加密 //请求参数
json = EncryptUtil.getInstance().AESEncode(json, secretKey); SzptFwxxDTO szptFwxxDTO = new SzptFwxxDTO();
//签名appId+nonce+timestampStr+aes(body) szptFwxxDTO.setQyid("5");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptFwxxDTO.setCsid("1");
String generatedSignature = DigestUtil.md5Hex(data); szptFwxxDTO.setFwjc("123456");
//请求 szptFwxxDTO.setJzqk("1");
WebClient webClient = WebClient.builder() szptFwxxDTO.setCzyt("1");
.baseUrl("http://localhost:8086") szptFwxxDTO.setHxjg("1");
.defaultHeader("Content-Type", "application/json") szptFwxxDTO.setFxid("123456");
.build(); szptFwxxDTO.setCzba("2");
String response = webClient.post().uri("/rest/index/addSzptFwxx") szptFwxxDTO.setCzbah("123456");
.header(SignatureUtil.APPID, appId) szptFwxxDTO.setCzbaqs("1");
.header(SignatureUtil.NONCE, nonce) szptFwxxDTO.setCzbajz("1");
.header(SignatureUtil.TIMESTAMP, timestampStr) szptFwxxDTO.setFzxm("1");
.header(SignatureUtil.SIGNATURE, generatedSignature) szptFwxxDTO.setFzsfzh("1");
.body(Mono.just(szptFwxxDTO), SzptFwxxDTO.class) szptFwxxDTO.setFzryid("1");
.retrieve() szptFwxxDTO.setFzlxdh("1");
.bodyToMono(String.class) szptFwxxDTO.setFwlc("1");
.block(); szptFwxxDTO.setFwfjh("1");
System.out.println(response); szptFwxxDTO.setFwzt("1");
szptFwxxDTO.setQjms("1");
szptFwxxDTO.setQjzt("1");
szptFwxxDTO.setZjqjsj(new Date());
szptFwxxDTO.setZdrq("1");
szptFwxxDTO.setZdzq("1");
szptFwxxDTO.setFwcs("1");
szptFwxxDTO.setGlrlx("1");
szptFwxxDTO.setGlrxm("1");
szptFwxxDTO.setGlrsfzh("1");
szptFwxxDTO.setGlrryid("1");
szptFwxxDTO.setGlrlxdh("1");
szptFwxxDTO.setGlrgsmc("1");
szptFwxxDTO.setZcsid("1");
szptFwxxDTO.setBz("1");
szptFwxxDTO.setFkdjzdsh("1");
szptFwxxDTO.setQtfwyt("1");
szptFwxxDTO.setJkmhysj(new Date());
szptFwxxDTO.setSjgsdwdm("330102");
szptFwxxDTO.setSjgsdwmc("1");
szptFwxxDTO.setFzzjzp("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
} }
@Test @Test
@DisplayName("房屋信息--删除") @DisplayName("房屋信息--删除")
public void deleteSzptFwxxTest() { public void szptFwxxDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("1");
ids.add("3");
ids.add("5"); ids.add("5");
ids.add("demo");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptFwxx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptFwxx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================场所预警忽略对象=================================================== * ===================================================场所预警忽略对象===================================================
*/ */
@Test @Test
@DisplayName("场所预警忽略对象--新增、更新") @DisplayName("场所预警忽略对象--新增")
public void szptGdCsyjhldxTest() { public void szptGdCsyjhldxAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptGdCsyjhldxDTO szptGdCsyjhldxDTO = new SzptGdCsyjhldxDTO(); SzptGdCsyjhldxDTO szptGdCsyjhldxDTO = new SzptGdCsyjhldxDTO();
szptGdCsyjhldxDTO.setId("5"); szptGdCsyjhldxDTO.setId("2");
szptGdCsyjhldxDTO.setCsid("123456123456"); szptGdCsyjhldxDTO.setCsid("123456123456");
szptGdCsyjhldxDTO.setYjlx("1"); szptGdCsyjhldxDTO.setYjlx("1");
szptGdCsyjhldxDTO.setYjzlx("1"); szptGdCsyjhldxDTO.setYjzlx("1");
...@@ -358,91 +253,47 @@ public class MainTestX { ...@@ -358,91 +253,47 @@ public class MainTestX {
szptGdCsyjhldxDTO.setYwms("1"); szptGdCsyjhldxDTO.setYwms("1");
szptGdCsyjhldxDTO.setBz("123456"); szptGdCsyjhldxDTO.setBz("123456");
szptGdCsyjhldxDTO.setZt("1"); szptGdCsyjhldxDTO.setZt("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
}
String json = null; @Test
try { @DisplayName("场所预警忽略对象--更新")
json = objectMapper.writeValueAsString(szptGdCsyjhldxDTO); public void szptGdCsyjhldxUpdateTest() {
} catch (JsonProcessingException e) { //请求参数
Assertions.fail("json序列化失败"); SzptGdCsyjhldxDTO szptGdCsyjhldxDTO = new SzptGdCsyjhldxDTO();
} szptGdCsyjhldxDTO.setId("1");
//请求体加密 szptGdCsyjhldxDTO.setCsid("1");
json = EncryptUtil.getInstance().AESEncode(json, secretKey); szptGdCsyjhldxDTO.setYjlx("1");
//签名appId+nonce+timestampStr+aes(body) szptGdCsyjhldxDTO.setYjzlx("1");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptGdCsyjhldxDTO.setYwid("1");
String generatedSignature = DigestUtil.md5Hex(data); szptGdCsyjhldxDTO.setYwms("1");
//请求 szptGdCsyjhldxDTO.setBz("123456");
WebClient webClient = WebClient.builder() szptGdCsyjhldxDTO.setZt("1");
.baseUrl("http://localhost:8086") TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdCsyjhldx", szptGdCsyjhldxDTO, SzptGdCsyjhldxDTO.class);
.defaultHeader("Content-Type", "application/json")
.build();
// String response = webClient.post().uri("/rest/index/addSzptGdCsyjhldx")
String response = webClient.post().uri("/rest/index/updateSzptGdCsyjhldx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(szptGdCsyjhldxDTO), SzptGdCsyjhldxDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
@Test @Test
@DisplayName("场所预警忽略对象--删除") @DisplayName("场所预警忽略对象--删除")
public void deleteSzptGdCsyjhldxTest() { public void szptGdCsyjhldxDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("5"); ids.add("1");
ids.add("2");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdCsyjhldx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptGdCsyjhldx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================工地人员信息=================================================== * ===================================================工地人员信息===================================================
*/ */
@Test @Test
@DisplayName("工地人员信息--新增、更新") @DisplayName("工地人员信息--新增")
public void szptGdRyxxTest() { public void szptGdRyxxAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptGdRyxxDTO szptGdRyxxDTO = new SzptGdRyxxDTO(); SzptGdRyxxDTO szptGdRyxxDTO = new SzptGdRyxxDTO();
szptGdRyxxDTO.setId("7"); szptGdRyxxDTO.setRkbm("2");
szptGdRyxxDTO.setRkbm("1234561234561");
szptGdRyxxDTO.setCsid("1123111111111111"); szptGdRyxxDTO.setCsid("1123111111111111");
szptGdRyxxDTO.setCjrlid("1"); szptGdRyxxDTO.setCjrlid("1");
szptGdRyxxDTO.setXm("1"); szptGdRyxxDTO.setXm("1");
...@@ -484,90 +335,80 @@ public class MainTestX { ...@@ -484,90 +335,80 @@ public class MainTestX {
szptGdRyxxDTO.setDatasource("1"); szptGdRyxxDTO.setDatasource("1");
szptGdRyxxDTO.setOrderid("1"); szptGdRyxxDTO.setOrderid("1");
szptGdRyxxDTO.setSjrzrs("123456"); szptGdRyxxDTO.setSjrzrs("123456");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
}
String json = null; @Test
try { @DisplayName("工地人员信息--更新")
json = objectMapper.writeValueAsString(szptGdRyxxDTO); public void szptGdRyxxUpdateTest() {
} catch (JsonProcessingException e) { //请求参数
Assertions.fail("json序列化失败"); SzptGdRyxxDTO szptGdRyxxDTO = new SzptGdRyxxDTO();
} szptGdRyxxDTO.setRkbm("1");
//请求体加密 szptGdRyxxDTO.setCsid("1");
json = EncryptUtil.getInstance().AESEncode(json, secretKey); szptGdRyxxDTO.setCjrlid("1");
//签名appId+nonce+timestampStr+aes(body) szptGdRyxxDTO.setXm("1");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptGdRyxxDTO.setXb("1");
String generatedSignature = DigestUtil.md5Hex(data); szptGdRyxxDTO.setLxdh("123456");
//请求 szptGdRyxxDTO.setCyzjdm("1");
WebClient webClient = WebClient.builder() szptGdRyxxDTO.setZjhm("5");
.baseUrl("http://localhost:8086") szptGdRyxxDTO.setNl("1");
.defaultHeader("Content-Type", "application/json") szptGdRyxxDTO.setUrl("1");
.build(); szptGdRyxxDTO.setMd5("1");
// String response = webClient.post().uri("/rest/index/addSzptGdRyxx") szptGdRyxxDTO.setZjcxts(1);
String response = webClient.post().uri("/rest/index/updateSzptGdRyxx") szptGdRyxxDTO.setZcxts(1);
.header(SignatureUtil.APPID, appId) szptGdRyxxDTO.setYsrczjts(1);
.header(SignatureUtil.NONCE, nonce) szptGdRyxxDTO.setYsrcbz("1");
.header(SignatureUtil.TIMESTAMP, timestampStr) szptGdRyxxDTO.setYsrczts(5);
.header(SignatureUtil.SIGNATURE, generatedSignature) szptGdRyxxDTO.setCkbz("1");
.body(Mono.just(szptGdRyxxDTO), SzptGdRyxxDTO.class) szptGdRyxxDTO.setLkbz("1");
.retrieve() szptGdRyxxDTO.setHjdzDzmc("1");
.bodyToMono(String.class) szptGdRyxxDTO.setHjdzXzqhdm("1");
.block(); szptGdRyxxDTO.setHjdzPcsmc("1");
System.out.println(response); szptGdRyxxDTO.setHjdzPcsdm("123456");
szptGdRyxxDTO.setXzdDzmc("1");
szptGdRyxxDTO.setXzdXzqhdm("5");
szptGdRyxxDTO.setXzdPcsmc("123456123456");
szptGdRyxxDTO.setXzdPcsdm("1");
szptGdRyxxDTO.setZt("1");
szptGdRyxxDTO.setJcsj(new Date());
szptGdRyxxDTO.setTcsj(new Date());
szptGdRyxxDTO.setYjtcsj(new Date());
szptGdRyxxDTO.setZjzpsj(new Date());
szptGdRyxxDTO.setSfglry("5");
szptGdRyxxDTO.setDjzt(1);
szptGdRyxxDTO.setQyid("1");
szptGdRyxxDTO.setQymc("1");
szptGdRyxxDTO.setRylb("1");
szptGdRyxxDTO.setRylx("1");
szptGdRyxxDTO.setLkbdsj(new Date());
szptGdRyxxDTO.setCkbdsj(new Date());
szptGdRyxxDTO.setDatasource("1");
szptGdRyxxDTO.setOrderid("1");
szptGdRyxxDTO.setSjrzrs("123456");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdRyxx", szptGdRyxxDTO, SzptGdRyxxDTO.class);
} }
@Test @Test
@DisplayName("工地人员信息--删除") @DisplayName("工地人员信息--删除")
public void deleteSzptGdRyxxTest() { public void szptGdRyxxDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("1234561234561"); ids.add("1");
ids.add("2");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdRyxx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptGdRyxx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================设备信息=================================================== * ===================================================设备信息===================================================
*/ */
@Test @Test
@DisplayName("设备信息--新增、更新") @DisplayName("设备信息--新增")
public void szptGdSbxxTest() { public void szptGdSbxxAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptGdSbxxDTO szptGdSbxxDTO = new SzptGdSbxxDTO(); SzptGdSbxxDTO szptGdSbxxDTO = new SzptGdSbxxDTO();
szptGdSbxxDTO.setId("7");
szptGdSbxxDTO.setSbsn("1"); szptGdSbxxDTO.setSbsn("1");
szptGdSbxxDTO.setSbmc("1"); szptGdSbxxDTO.setSbmc("1");
szptGdSbxxDTO.setSbbh("1"); szptGdSbxxDTO.setSbbh("1");
...@@ -590,92 +431,61 @@ public class MainTestX { ...@@ -590,92 +431,61 @@ public class MainTestX {
szptGdSbxxDTO.setSjgsdwmc("1"); szptGdSbxxDTO.setSjgsdwmc("1");
szptGdSbxxDTO.setCreateGajgjgdm("123"); szptGdSbxxDTO.setCreateGajgjgdm("123");
szptGdSbxxDTO.setCreateGajgmc("123"); szptGdSbxxDTO.setCreateGajgmc("123");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
}
String json = null; @Test
try { @DisplayName("设备信息--更新")
json = objectMapper.writeValueAsString(szptGdSbxxDTO); public void szptGdSbxxUpdateTest() {
} catch (JsonProcessingException e) { //请求参数
Assertions.fail("json序列化失败"); SzptGdSbxxDTO szptGdSbxxDTO = new SzptGdSbxxDTO();
} szptGdSbxxDTO.setSbsn("1");
//请求体加密 szptGdSbxxDTO.setSbmc("1");
json = EncryptUtil.getInstance().AESEncode(json, secretKey); szptGdSbxxDTO.setSbbh("1");
//签名appId+nonce+timestampStr+aes(body) szptGdSbxxDTO.setSbms("1");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptGdSbxxDTO.setMac("1");
String generatedSignature = DigestUtil.md5Hex(data); szptGdSbxxDTO.setIp("123456");
//请求 szptGdSbxxDTO.setNetmask("1");
WebClient webClient = WebClient.builder() szptGdSbxxDTO.setGw("5");
.baseUrl("http://localhost:8086") szptGdSbxxDTO.setCsid("1");
.defaultHeader("Content-Type", "application/json") szptGdSbxxDTO.setYxzt("1");
.build(); szptGdSbxxDTO.setZtgxsj(new Date());
// String response = webClient.post().uri("/rest/index/addSzptGdSbxx") szptGdSbxxDTO.setCj("1");
String response = webClient.post().uri("/rest/index/updateSzptGdSbxx") szptGdSbxxDTO.setXh("1");
.header(SignatureUtil.APPID, appId) szptGdSbxxDTO.setQyid("1");
.header(SignatureUtil.NONCE, nonce) szptGdSbxxDTO.setQymc("1");
.header(SignatureUtil.TIMESTAMP, timestampStr) szptGdSbxxDTO.setSbcs("1");
.header(SignatureUtil.SIGNATURE, generatedSignature) szptGdSbxxDTO.setSblb("1");
.body(Mono.just(szptGdSbxxDTO), SzptGdSbxxDTO.class) szptGdSbxxDTO.setZt("1");
.retrieve() szptGdSbxxDTO.setSjgsdwdm("330102");
.bodyToMono(String.class) szptGdSbxxDTO.setSjgsdwmc("1");
.block(); szptGdSbxxDTO.setCreateGajgjgdm("123");
System.out.println(response); szptGdSbxxDTO.setCreateGajgmc("123");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
} }
@Test @Test
@DisplayName("设备信息--删除") @DisplayName("设备信息--删除")
public void deleteSzptGdSbxxTest() { public void szptGdSbxxDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("4"); ids.add("4");
ids.add("5"); ids.add("5");
ids.add("6");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdSbxx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptGdSbxx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================工地信息=================================================== * ===================================================工地信息===================================================
*/ */
@Test @Test
@DisplayName("工地信息--新增、更新") @DisplayName("工地信息--新增")
public void szptGdXxTest() { public void szptGdXxAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptGdXxDTO szptGdXxDTO = new SzptGdXxDTO(); SzptGdXxDTO szptGdXxDTO = new SzptGdXxDTO();
szptGdXxDTO.setId("7"); szptGdXxDTO.setId("3");
szptGdXxDTO.setCslx("1"); szptGdXxDTO.setCslx("1");
szptGdXxDTO.setCsmc("1111111111111111111"); szptGdXxDTO.setCsmc("1111111111111111111");
szptGdXxDTO.setCsms("1"); szptGdXxDTO.setCsms("1");
...@@ -698,7 +508,6 @@ public class MainTestX { ...@@ -698,7 +508,6 @@ public class MainTestX {
szptGdXxDTO.setZcdz("1"); szptGdXxDTO.setZcdz("1");
szptGdXxDTO.setAdminzh("123"); szptGdXxDTO.setAdminzh("123");
szptGdXxDTO.setSfzcs("1"); szptGdXxDTO.setSfzcs("1");
szptGdXxDTO.setFcsid("1"); szptGdXxDTO.setFcsid("1");
szptGdXxDTO.setBz("1"); szptGdXxDTO.setBz("1");
szptGdXxDTO.setCjsj(new Date()); szptGdXxDTO.setCjsj(new Date());
...@@ -709,99 +518,85 @@ public class MainTestX { ...@@ -709,99 +518,85 @@ public class MainTestX {
szptGdXxDTO.setZxsj(new Date()); szptGdXxDTO.setZxsj(new Date());
szptGdXxDTO.setSqdm("123"); szptGdXxDTO.setSqdm("123");
szptGdXxDTO.setSqmc("123"); szptGdXxDTO.setSqmc("123");
szptGdXxDTO.setMdlx("1"); szptGdXxDTO.setMdlx("1");
szptGdXxDTO.setMdjyzt("1"); szptGdXxDTO.setMdjyzt("1");
szptGdXxDTO.setSjgsdwdm("330102"); szptGdXxDTO.setSjgsdwdm("330102");
szptGdXxDTO.setSjgsdwmc("1"); szptGdXxDTO.setSjgsdwmc("1");
szptGdXxDTO.setCreateGajgjgdm("1"); szptGdXxDTO.setCreateGajgjgdm("1");
szptGdXxDTO.setCreateGajgmc("1"); szptGdXxDTO.setCreateGajgmc("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
}
String json = null; @Test
try { @DisplayName("工地信息--更新")
json = objectMapper.writeValueAsString(szptGdXxDTO); public void szptGdXxUpdateTest() {
} catch (JsonProcessingException e) { //请求参数
Assertions.fail("json序列化失败"); SzptGdXxDTO szptGdXxDTO = new SzptGdXxDTO();
} szptGdXxDTO.setId("1");
//请求体加密 szptGdXxDTO.setCslx("1");
json = EncryptUtil.getInstance().AESEncode(json, secretKey); szptGdXxDTO.setCsmc("2");
//签名appId+nonce+timestampStr+aes(body) szptGdXxDTO.setCsms("1");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptGdXxDTO.setLxdz("1");
String generatedSignature = DigestUtil.md5Hex(data); szptGdXxDTO.setLxr("1");
//请求 szptGdXxDTO.setLxdh("123456");
WebClient webClient = WebClient.builder() szptGdXxDTO.setSgdw("1");
.baseUrl("http://localhost:8086") szptGdXxDTO.setSgxkz("5");
.defaultHeader("Content-Type", "application/json") szptGdXxDTO.setKgrq(new Date());
.build(); szptGdXxDTO.setYjjgrq(new Date());
// String response = webClient.post().uri("/rest/index/addSzptGdXx") szptGdXxDTO.setLng("120.3");
String response = webClient.post().uri("/rest/index/updateSzptGdXx") szptGdXxDTO.setLat("30");
.header(SignatureUtil.APPID, appId) szptGdXxDTO.setCustomlng("1");
.header(SignatureUtil.NONCE, nonce) szptGdXxDTO.setCustomlat("1");
.header(SignatureUtil.TIMESTAMP, timestampStr) szptGdXxDTO.setZrrxm("1");
.header(SignatureUtil.SIGNATURE, generatedSignature) szptGdXxDTO.setZrrlxdh("1");
.body(Mono.just(szptGdXxDTO), SzptGdXxDTO.class) szptGdXxDTO.setFrxm("1");
.retrieve() szptGdXxDTO.setFrlxdh("1");
.bodyToMono(String.class) szptGdXxDTO.setShxydm("330102");
.block(); szptGdXxDTO.setZcdz("1");
System.out.println(response); szptGdXxDTO.setAdminzh("123");
szptGdXxDTO.setSfzcs("1");
szptGdXxDTO.setFcsid("1");
szptGdXxDTO.setBz("1");
szptGdXxDTO.setCjsj(new Date());
szptGdXxDTO.setZt("1");
szptGdXxDTO.setJhsj(new Date());
szptGdXxDTO.setLocation("1");
szptGdXxDTO.setSjlyXtmc("340102");
szptGdXxDTO.setZxsj(new Date());
szptGdXxDTO.setSqdm("123");
szptGdXxDTO.setSqmc("123");
szptGdXxDTO.setMdlx("1");
szptGdXxDTO.setMdjyzt("1");
szptGdXxDTO.setSjgsdwdm("330102");
szptGdXxDTO.setSjgsdwmc("1");
szptGdXxDTO.setCreateGajgjgdm("1");
szptGdXxDTO.setCreateGajgmc("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
} }
@Test @Test
@DisplayName("工地信息--删除") @DisplayName("工地信息--删除")
public void deleteSzptGdXxTest() { public void szptGdXxDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("1872956891413839873"); ids.add("1");
ids.add("1872957357501657089"); ids.add("2");
ids.add("1874652891924905986"); ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdXx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptGdXx")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
/** /**
* ===================================================工地预警流水表=================================================== * ===================================================工地预警流水表===================================================
*/ */
@Test @Test
@DisplayName("工地预警流水表--新增、更新") @DisplayName("工地预警流水表--新增")
public void szptGdYjTest() { public void szptGdYjAddTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
nonce = String.valueOf(System.currentTimeMillis() / 1000);
String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
//请求参数 //请求参数
SzptGdYjDTO szptGdYjDTO = new SzptGdYjDTO(); SzptGdYjDTO szptGdYjDTO = new SzptGdYjDTO();
szptGdYjDTO.setId("1"); szptGdYjDTO.setId("3");
szptGdYjDTO.setCsid("1"); szptGdYjDTO.setCsid("1");
szptGdYjDTO.setYjrq("1"); szptGdYjDTO.setYjrq("1");
szptGdYjDTO.setYjlx("1"); szptGdYjDTO.setYjlx("1");
...@@ -814,81 +609,342 @@ public class MainTestX { ...@@ -814,81 +609,342 @@ public class MainTestX {
szptGdYjDTO.setCljg("123"); szptGdYjDTO.setCljg("123");
szptGdYjDTO.setClrid("120.3"); szptGdYjDTO.setClrid("120.3");
szptGdYjDTO.setClrxm("30"); szptGdYjDTO.setClrxm("30");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
}
@Test
String json = null; @DisplayName("工地预警流水表--更新")
try { public void szptGdYjUpdateTest() {
json = objectMapper.writeValueAsString(szptGdYjDTO); //请求参数
} catch (JsonProcessingException e) { SzptGdYjDTO szptGdYjDTO = new SzptGdYjDTO();
Assertions.fail("json序列化失败"); szptGdYjDTO.setId("2");
} szptGdYjDTO.setCsid("11111111111111111111");
//请求体加密 szptGdYjDTO.setYjrq("1");
json = EncryptUtil.getInstance().AESEncode(json, secretKey); szptGdYjDTO.setYjlx("1");
//签名appId+nonce+timestampStr+aes(body) szptGdYjDTO.setYjzlx("1");
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json); szptGdYjDTO.setYjnr("1");
String generatedSignature = DigestUtil.md5Hex(data); szptGdYjDTO.setYwid("123456");
//请求 szptGdYjDTO.setYwcs("1");
WebClient webClient = WebClient.builder() szptGdYjDTO.setYjzt("5");
.baseUrl("http://localhost:8086") szptGdYjDTO.setClsj(new Date());
.defaultHeader("Content-Type", "application/json") szptGdYjDTO.setCljg("123");
.build(); szptGdYjDTO.setClrid("120.3");
// String response = webClient.post().uri("/rest/index/addSzptGdYj") szptGdYjDTO.setClrxm("30");
String response = webClient.post().uri("/rest/index/updateSzptGdYj") TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdYj", szptGdYjDTO, SzptGdYjDTO.class);
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(szptGdYjDTO), SzptGdYjDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
@Test @Test
@DisplayName("工地预警流水表--删除") @DisplayName("工地预警流水表--删除")
public void deleteSzptGdYjTest() { public void szptGdYjDeleteTest() {
timestampStr = String.valueOf(System.currentTimeMillis() / 1000); //请求参数
nonce = String.valueOf(System.currentTimeMillis() / 1000); List<String> ids = new ArrayList<>();
String secretKey = this.appStoreService.getAppSecretByAppKey(appId); ids.add("1");
Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率 ids.add("2");
ids.add("3");
// ids.add("1876882723429670913");
// ids.add("1876883035569774594");
// ids.add("1876887147652833281");
CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102");
TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdYj", commonDelDTO, CommonDelDTO.class);
}
/**
* ===================================================区域信息表===================================================
*/
@Test
@DisplayName("区域信息表--新增")
public void szptQyxxAddTest() {
//请求参数
SzptQyxxDTO szptQyxxDTO = new SzptQyxxDTO();
szptQyxxDTO.setId("3");
szptQyxxDTO.setCsid("1");
szptQyxxDTO.setQymc("1");
szptQyxxDTO.setQyjc("1");
szptQyxxDTO.setQyqc("1");
szptQyxxDTO.setQylx("1");
szptQyxxDTO.setLevel("123456");
szptQyxxDTO.setFqyid("1");
szptQyxxDTO.setXssx("5");
szptQyxxDTO.setLng("6");
szptQyxxDTO.setLat("123");
szptQyxxDTO.setCustomlng("120.3");
szptQyxxDTO.setCustomlat("30");
szptQyxxDTO.setZt("1");
szptQyxxDTO.setSjgsdwdm("330102");
szptQyxxDTO.setSjgsdwmc("123");
szptQyxxDTO.setCreateGajgjgdm("123");
szptQyxxDTO.setCreateGajgmc("120.3");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
}
@Test
@DisplayName("区域信息表--更新")
public void szptQyxxUpdateTest() {
//请求参数
SzptQyxxDTO szptQyxxDTO = new SzptQyxxDTO();
szptQyxxDTO.setId("1");
szptQyxxDTO.setCsid("111111");
szptQyxxDTO.setQymc("1");
szptQyxxDTO.setQyjc("1");
szptQyxxDTO.setQyqc("1");
szptQyxxDTO.setQylx("1");
szptQyxxDTO.setLevel("123456");
szptQyxxDTO.setFqyid("1");
szptQyxxDTO.setXssx("5");
szptQyxxDTO.setLng("6");
szptQyxxDTO.setLat("123");
szptQyxxDTO.setCustomlng("120.3");
szptQyxxDTO.setCustomlat("30");
szptQyxxDTO.setZt("1");
szptQyxxDTO.setSjgsdwdm("330102");
szptQyxxDTO.setSjgsdwmc("123");
szptQyxxDTO.setCreateGajgjgdm("123");
szptQyxxDTO.setCreateGajgmc("120.3");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
}
@Test
@DisplayName("区域信息表--删除")
public void szptQyxxDeleteTest() {
List<String> ids = new ArrayList<>();
ids.add("1");
ids.add("2");
ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102");
TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptQyxx", commonDelDTO, CommonDelDTO.class);
}
/**
* ===================================================打卡信息===================================================
*/
@Test
@DisplayName("打卡信息--新增")
public void szptXyzhDkxxAddTest() {
//请求参数
SzptXyzhDkxxDTO szptXyzhDkxxDTO = new SzptXyzhDkxxDTO();
szptXyzhDkxxDTO.setDklsid("3");
szptXyzhDkxxDTO.setXyid("1");
szptXyzhDkxxDTO.setRyid("1");
szptXyzhDkxxDTO.setQdsj(new Date());
szptXyzhDkxxDTO.setQtsj(new Date());
szptXyzhDkxxDTO.setZt("1");
szptXyzhDkxxDTO.setQddz("1");
szptXyzhDkxxDTO.setQtdz("1");
szptXyzhDkxxDTO.setQdxzb("1");
szptXyzhDkxxDTO.setQdyzb("1");
szptXyzhDkxxDTO.setQtxzb("1");
szptXyzhDkxxDTO.setQtyzb("1");
szptXyzhDkxxDTO.setQdtp("1");
szptXyzhDkxxDTO.setQttp("1");
szptXyzhDkxxDTO.setCjsj(new Date());
szptXyzhDkxxDTO.setGxsj(new Date());
TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
}
@Test
@DisplayName("打卡信息--更新")
public void szptXyzhDkxxUpdateTest() {
//请求参数 //请求参数
SzptXyzhDkxxDTO szptXyzhDkxxDTO = new SzptXyzhDkxxDTO();
szptXyzhDkxxDTO.setDklsid("1");
szptXyzhDkxxDTO.setXyid("1111");
szptXyzhDkxxDTO.setRyid("1111");
szptXyzhDkxxDTO.setQdsj(new Date());
szptXyzhDkxxDTO.setQtsj(new Date());
szptXyzhDkxxDTO.setZt("1");
szptXyzhDkxxDTO.setQddz("1");
szptXyzhDkxxDTO.setQtdz("1");
szptXyzhDkxxDTO.setQdxzb("1");
szptXyzhDkxxDTO.setQdyzb("1");
szptXyzhDkxxDTO.setQtxzb("1");
szptXyzhDkxxDTO.setQtyzb("1");
szptXyzhDkxxDTO.setQdtp("1");
szptXyzhDkxxDTO.setQttp("1");
szptXyzhDkxxDTO.setCjsj(new Date());
szptXyzhDkxxDTO.setGxsj(new Date());
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhDkxx", szptXyzhDkxxDTO, SzptXyzhDkxxDTO.class);
}
@Test
@DisplayName("打卡信息--删除")
public void szptXyzhDkxxDeleteTest() {
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
ids.add("1874653022954954754"); ids.add("1");
ids.add("1876882297523142657"); ids.add("2");
ids.add("1876882403576119297"); ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102");
TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhDkxx", commonDelDTO, CommonDelDTO.class);
}
ids.add("1876882723429670913"); /**
ids.add("1876883035569774594"); * ===================================================考勤模板===================================================
ids.add("1876887147652833281"); */
@Test
@DisplayName("考勤模板--新增")
public void szptXyzhKqmbAddTest() {
//请求参数
SzptXyzhKqmbDTO szptXyzhKqmbDTO = new SzptXyzhKqmbDTO();
szptXyzhKqmbDTO.setId("3");
szptXyzhKqmbDTO.setMbmc("1");
szptXyzhKqmbDTO.setZt("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
}
@Test
@DisplayName("考勤模板--更新")
public void szptXyzhKqmbUpdateTest() {
//请求参数
SzptXyzhKqmbDTO szptXyzhKqmbDTO = new SzptXyzhKqmbDTO();
szptXyzhKqmbDTO.setId("2");
szptXyzhKqmbDTO.setMbmc("22");
szptXyzhKqmbDTO.setZt("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhKqmb", szptXyzhKqmbDTO, SzptXyzhKqmbDTO.class);
}
@Test
@DisplayName("考勤模板--删除")
public void szptXyzhKqmbDeleteTest() {
List<String> ids = new ArrayList<>();
ids.add("1");
ids.add("2");
ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102");
TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhKqmb", commonDelDTO, CommonDelDTO.class);
}
/**
* ===================================================考勤情况===================================================
*/
@Test
@DisplayName("考勤情况--新增")
public void szptXyzhMbdhAddTest() {
//请求参数
SzptXyzhMbdhDTO szptXyzhMbdhDTO = new SzptXyzhMbdhDTO();
szptXyzhMbdhDTO.setId("3");
szptXyzhMbdhDTO.setMbid("3");
szptXyzhMbdhDTO.setDay("2");
szptXyzhMbdhDTO.setSbsj1("1");
szptXyzhMbdhDTO.setXbsj1("1");
szptXyzhMbdhDTO.setSbsj2("1");
szptXyzhMbdhDTO.setXbsj2("1");
szptXyzhMbdhDTO.setSbsj3("1");
szptXyzhMbdhDTO.setXbsj3("1");
szptXyzhMbdhDTO.setZt("1");
szptXyzhMbdhDTO.setCjrid("1");
szptXyzhMbdhDTO.setCjrxm("1");
szptXyzhMbdhDTO.setCjsj(new Date());
szptXyzhMbdhDTO.setGxrid("1");
szptXyzhMbdhDTO.setGxrxm("1");
szptXyzhMbdhDTO.setGxsj(new Date());
TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
}
@Test
@DisplayName("考勤情况--更新")
public void szptXyzhMbdhUpdateTest() {
//请求参数
SzptXyzhMbdhDTO szptXyzhMbdhDTO = new SzptXyzhMbdhDTO();
szptXyzhMbdhDTO.setId("1");
szptXyzhMbdhDTO.setMbid("311111");
szptXyzhMbdhDTO.setDay("2");
szptXyzhMbdhDTO.setSbsj1("11111");
szptXyzhMbdhDTO.setXbsj1("11111");
szptXyzhMbdhDTO.setSbsj2("1");
szptXyzhMbdhDTO.setXbsj2("1");
szptXyzhMbdhDTO.setSbsj3("1");
szptXyzhMbdhDTO.setXbsj3("1");
szptXyzhMbdhDTO.setZt("1");
szptXyzhMbdhDTO.setCjrid("1");
szptXyzhMbdhDTO.setCjrxm("1");
szptXyzhMbdhDTO.setCjsj(new Date());
szptXyzhMbdhDTO.setGxrid("1");
szptXyzhMbdhDTO.setGxrxm("1");
szptXyzhMbdhDTO.setGxsj(new Date());
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhMbdh", szptXyzhMbdhDTO, SzptXyzhMbdhDTO.class);
}
@Test
@DisplayName("考勤情况--删除")
public void szptXyzhMbdhDeleteTest() {
List<String> ids = new ArrayList<>();
ids.add("1");
ids.add("2");
ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102");
TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhMbdh", commonDelDTO, CommonDelDTO.class);
}
/**
* ===================================================校园信息===================================================
*/
@Test
@DisplayName("校园信息--新增")
public void szptXyzhXyxxAddTest() {
//请求参数
SzptXyzhXyxxDTO szptXyzhXyxxDTO = new SzptXyzhXyxxDTO();
szptXyzhXyxxDTO.setId(3);
szptXyzhXyxxDTO.setMc("3");
szptXyzhXyxxDTO.setSsdwmc("2");
szptXyzhXyxxDTO.setSsdwdm("1");
szptXyzhXyxxDTO.setZddw("1");
szptXyzhXyxxDTO.setCjsj(new Date());
szptXyzhXyxxDTO.setGxsj(new Date());
szptXyzhXyxxDTO.setDz("1");
szptXyzhXyxxDTO.setZb("1");
szptXyzhXyxxDTO.setXxlx("1");
szptXyzhXyxxDTO.setDakafw(1);
szptXyzhXyxxDTO.setKqmbid("1");
szptXyzhXyxxDTO.setQrcode("1");
TestHttpUtil.signatureAndRequest("/rest/index/addSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
}
@Test
@DisplayName("校园信息--更新")
public void szptXyzhXyxxUpdateTest() {
//请求参数
SzptXyzhXyxxDTO szptXyzhXyxxDTO = new SzptXyzhXyxxDTO();
szptXyzhXyxxDTO.setId(3);
szptXyzhXyxxDTO.setMc("333333");
szptXyzhXyxxDTO.setSsdwmc("2");
szptXyzhXyxxDTO.setSsdwdm("1");
szptXyzhXyxxDTO.setZddw("1");
szptXyzhXyxxDTO.setCjsj(new Date());
szptXyzhXyxxDTO.setGxsj(new Date());
szptXyzhXyxxDTO.setDz("1");
szptXyzhXyxxDTO.setZb("1");
szptXyzhXyxxDTO.setXxlx("1");
szptXyzhXyxxDTO.setDakafw(1);
szptXyzhXyxxDTO.setKqmbid("1");
szptXyzhXyxxDTO.setQrcode("1");
TestHttpUtil.signatureAndRequest("/rest/index/updateSzptXyzhXyxx", szptXyzhXyxxDTO, SzptXyzhXyxxDTO.class);
}
@Test
@DisplayName("校园信息--删除")
public void szptXyzhXyxxDeleteTest() {
List<String> ids = new ArrayList<>();
ids.add("1");
ids.add("2");
ids.add("3");
CommonDelDTO commonDelDTO = new CommonDelDTO(); CommonDelDTO commonDelDTO = new CommonDelDTO();
commonDelDTO.setIds(ids); commonDelDTO.setIds(ids);
commonDelDTO.setSjgsdwdm("330102"); commonDelDTO.setSjgsdwdm("330102");
String json = null; TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhXyxx", commonDelDTO, CommonDelDTO.class);
try {
json = objectMapper.writeValueAsString(commonDelDTO);
} catch (JsonProcessingException e) {
Assertions.fail("json序列化失败");
}
//请求体加密
String json1 = EncryptUtil.getInstance().AESEncode(json, secretKey);
//签名appId+nonce+timestampStr+aes(body)
String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json1);
String generatedSignature = DigestUtil.md5Hex(data);
//请求
WebClient webClient = WebClient.builder()
.baseUrl("http://localhost:8086")
.defaultHeader("Content-Type", "application/json")
.build();
String response = webClient.post().uri("/rest/index/deleteSzptGdYj")
.header(SignatureUtil.APPID, appId)
.header(SignatureUtil.NONCE, nonce)
.header(SignatureUtil.TIMESTAMP, timestampStr)
.header(SignatureUtil.SIGNATURE, generatedSignature)
.body(Mono.just(commonDelDTO), CommonDelDTO.class)
.retrieve()
.bodyToMono(String.class)
.block();
System.out.println(response);
} }
} }
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