增加普通核验接口请求的登录信息字段

删除响应里的证件类型字段

src/main/java/com/rshy/project/hy/server/param/LoginInfo.java

@@ -0,0 +1,50 @@
+package com.rshy.project.hy.server.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 登录信息入参
+ * <p>
+ * Created by fanqun on 2022/6/13.
+ */
+@Data
+@Accessors(chain = true)
+public class LoginInfo {
+    /**
+     * 登录ID，警号
+     */
+    @ApiModelProperty("登录ID,即警员警号")
+    private String id;
+    /**
+     * 登录姓名，警员姓名
+     */
+    @ApiModelProperty("警员姓名")
+    private String name;
+    /**
+     * 警员身份证号
+     */
+    @ApiModelProperty("警员身份证")
+    private String idNum;
+    /**
+     * 警员手机号码
+     */
+    @ApiModelProperty("警员手机号")
+    private String phone;
+    /**
+     * 证码通设备IP
+     */
+    @ApiModelProperty("证码通设备IP")
+    private String ip;
+    /**
+     * 管辖派出所内部组织代码
+     */
+    @ApiModelProperty("管辖派出所组织代码")
+    private String orgCode;
+    /**
+     * 证码通设备放置位置
+     */
+    @ApiModelProperty("证码通设备放置位置")
+    private String location;
+}

src/main/java/com/rshy/project/hy/server/param/RshyParam.java

@@ -1,10 +1,12 @@
 package com.rshy.project.hy.server.param;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.rshy.project.hy.model.constant.WebConstant;
 import com.rshy.project.hy.model.entity.Identity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -30,7 +32,7 @@ public class RshyParam {
     @ApiModelProperty("健康码")
     private String barCode;
 
-    @ApiModelProperty("超时时间")
+    @ApiModelProperty("超时时间,单位秒")
     private Integer timeout = WebConstant.TIMEOUT;
 
     @ApiModelProperty("人脸照片 Base64")
@@ -39,7 +41,12 @@ public class RshyParam {
     @ApiModelProperty("锁屏状态")
     private Integer screenLocked;
 
+    @ApiModelProperty("登录信息")
+    private LoginInfo loginInfo;
+
     @JSONField(serialize = false, deserialize = false)
+    @ApiModelProperty(hidden = true)
+    @JsonIgnore
     private Identity identity;
 
     @Override

src/main/java/com/rshy/project/hy/server/vo/RshyVo.java

@@ -41,8 +41,8 @@ public class RshyVo {
     @ApiModelProperty("身份证号")
     private String sfzh;
 
-    @ApiModelProperty("证件类型")
-    private String zjlx = "居民身份证";
+    //@ApiModelProperty("证件类型")
+    //private String zjlx = "居民身份证";
 
     @ApiModelProperty("姓名")
     private String xm;

src/main/java/com/rshy/project/hy/web/controller/RshyController.java

@@ -50,7 +50,7 @@ public class RshyController {
 
     @GetMapping(value = "/version")
     public String version() {
-        return "1.2.4.220613";
+        return "1.2.4.220614";
     }
 
     @ApiOperation("普通核验模式")