From fa704d791f6ee7cca65377ee54aac8cd4c349065 Mon Sep 17 00:00:00 2001 From: Frank <3224536684@qq.com> Date: Fri, 22 Sep 2023 14:25:04 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Dfastjson=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=A6=96=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B0=8F=E5=86=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../javase/hksup/starter/model/FaceInfoParam.java | 3 +++ .../hksup/starter/model/SearchFaceInfoParam.java | 3 +++ .../net/javase/hksup/starter/model/UserInfo.java | 12 ++++++++---- .../javase/hksup/starter/model/UserInfoDetail.java | 4 +++- .../net/javase/hksup/starter/service/CmsServer.java | 3 +-- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index dce69cd..1e2b947 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ net.javase.hk hk-sup-spring-boot-starter - 0.0.5 + 0.0.6 hk-sup-spring-boot-starter hk-sup-spring-boot-starter @@ -50,7 +50,7 @@ com.alibaba fastjson - 2.0.26 + 2.0.40 diff --git a/src/main/java/net/javase/hksup/starter/model/FaceInfoParam.java b/src/main/java/net/javase/hksup/starter/model/FaceInfoParam.java index 26f795c..f5ee585 100644 --- a/src/main/java/net/javase/hksup/starter/model/FaceInfoParam.java +++ b/src/main/java/net/javase/hksup/starter/model/FaceInfoParam.java @@ -1,5 +1,6 @@ package net.javase.hksup.starter.model; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -25,11 +26,13 @@ public class FaceInfoParam implements Serializable { private String faceLibType = "blackFD"; + @JSONField(name = "FDID") private String FDID = "1"; /** * 人员工号，以人为中心方式，下发人脸前需要先下发人员工号，人脸绑定在工号上 */ + @JSONField(name = "FPID") private String FPID; public FaceInfoParam(String faceURL, String FPID) { diff --git a/src/main/java/net/javase/hksup/starter/model/SearchFaceInfoParam.java b/src/main/java/net/javase/hksup/starter/model/SearchFaceInfoParam.java index 9d9866a..2cb670d 100644 --- a/src/main/java/net/javase/hksup/starter/model/SearchFaceInfoParam.java +++ b/src/main/java/net/javase/hksup/starter/model/SearchFaceInfoParam.java @@ -1,5 +1,6 @@ package net.javase.hksup.starter.model; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Getter; import lombok.Setter; @@ -20,8 +21,10 @@ public class SearchFaceInfoParam implements Serializable { private String faceLibType = "blackFD"; + @JSONField(name = "FDID") private String FDID = "1"; + @JSONField(name = "FPID") private String FPID; public SearchFaceInfoParam() { diff --git a/src/main/java/net/javase/hksup/starter/model/UserInfo.java b/src/main/java/net/javase/hksup/starter/model/UserInfo.java index d53504b..ebbe4de 100644 --- a/src/main/java/net/javase/hksup/starter/model/UserInfo.java +++ b/src/main/java/net/javase/hksup/starter/model/UserInfo.java @@ -1,5 +1,6 @@ package net.javase.hksup.starter.model; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -25,12 +26,15 @@ public class UserInfo implements Serializable { @Builder.Default private String userType = "normal"; - private Valid Valid; + @Builder.Default + @JSONField(name = "Valid") + private Valid valid = new Valid(); @Builder.Default private String doorRight = "1"; - private List RightPlan; + @JSONField(name = "RightPlan") + private List rightPlan; @Builder.Default private String gender = "male"; @@ -58,11 +62,11 @@ public class UserInfo implements Serializable { @AllArgsConstructor public static class RightPlan { - private Long doorNo; + private Integer doorNo; private String planTemplateNo = "1"; - public RightPlan(Long doorNo) { + public RightPlan(Integer doorNo) { this.doorNo = doorNo; } } diff --git a/src/main/java/net/javase/hksup/starter/model/UserInfoDetail.java b/src/main/java/net/javase/hksup/starter/model/UserInfoDetail.java index accb770..8271bd2 100644 --- a/src/main/java/net/javase/hksup/starter/model/UserInfoDetail.java +++ b/src/main/java/net/javase/hksup/starter/model/UserInfoDetail.java @@ -1,5 +1,6 @@ package net.javase.hksup.starter.model; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -18,7 +19,8 @@ public class UserInfoDetail implements Serializable { private String mode; - private List EmployeeNoList; + @JSONField(name = "EmployeeNoList") + private List employeeNoList; @Getter @Setter diff --git a/src/main/java/net/javase/hksup/starter/service/CmsServer.java b/src/main/java/net/javase/hksup/starter/service/CmsServer.java index 863d8d3..0c1031d 100644 --- a/src/main/java/net/javase/hksup/starter/service/CmsServer.java +++ b/src/main/java/net/javase/hksup/starter/service/CmsServer.java @@ -265,9 +265,8 @@ public class CmsServer { //输入参数，XML或者JSON数据,删除人员信息json报文 Map parameter = new HashMap<>(); - parameter.put("mode", "byEmployeeNo"); // 删除方式, byEmployeeNo: 按员工ID号 UserInfoDetail detail = new UserInfoDetail(); - detail.setMode("byEmployeeNo"); + detail.setMode("byEmployeeNo"); // 删除方式, byEmployeeNo: 按员工ID号 List list = new ArrayList<>(); for (String no : employeeNos) { list.add(new UserInfoDetail.EmployeeNo(no));