From ee1896e59bac0a619a875868a4ce832b826be78a Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Wed, 25 Jun 2025 18:03:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(sis):=20=E5=87=AD=E8=AF=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../e8/VoucherControlController.java | 39 ------------------ .../sis/sdk/e8/VoucherControlService.java | 17 -------- .../domain/voucher/req/CancelVoucherReq.java | 16 -------- .../e8/impl/VoucherControlServiceImpl.java | 41 ------------------- .../dromara/sis/sdk/e8/utils/E8ApiUtil.java | 5 +-- 5 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/voucher/req/CancelVoucherReq.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java index bb6c3b6..10dff46 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.sis.sdk.e8.VoucherControlService; -import org.dromara.sis.sdk.e8.domain.voucher.req.CancelVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; @@ -46,25 +45,6 @@ public class VoucherControlController { } } - /** - * 批量发行凭证 - * - * @param req 凭证数据 - * @return Boolean - */ - @PostMapping("/issueVoucherMany") - public R issueVoucherMany(@RequestBody List req) { - log.info("E8批量发行凭证入参：{}", req); - - Boolean flag = voucherControlService.issueVoucherMany(req); - - if (flag) { - return R.ok(); - } else { - return R.fail("E8批量发行凭证，调用失败！"); - } - } - /** * 操作凭证 * @@ -103,25 +83,6 @@ public class VoucherControlController { } } - /** - * 注销人员凭证 - * - * @param req 入参 - * @return Boolean - */ - @PostMapping("/cancelVoucher") - public R cancelVoucher(@RequestBody CancelVoucherReq req) { - log.info("E8注销人员凭证入参：{}", req); - - Boolean flag = voucherControlService.cancelVoucher(req); - - if (flag) { - return R.ok(); - } else { - return R.fail("E8注销人员凭证，调用失败！"); - } - } - /** * 上传人脸 * diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java index 0bb9f0e..f211ab1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java @@ -1,6 +1,5 @@ package org.dromara.sis.sdk.e8; -import org.dromara.sis.sdk.e8.domain.voucher.req.CancelVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; @@ -22,14 +21,6 @@ public interface VoucherControlService { */ Boolean issueVoucher(IssueVoucherReq req); - /** - * 批量发行凭证 - * - * @param req 凭证数据 - * @return Boolean - */ - Boolean issueVoucherMany(List req); - /** * 操作凭证 * @@ -46,14 +37,6 @@ public interface VoucherControlService { */ Boolean changeCard(ChangeCardReq req); - /** - * 注销人员凭证 - * - * @param req 入参 - * @return Boolean - */ - Boolean cancelVoucher(CancelVoucherReq req); - /** * 上传人脸 * diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/voucher/req/CancelVoucherReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/voucher/req/CancelVoucherReq.java deleted file mode 100644 index cbf178e..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/voucher/req/CancelVoucherReq.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.sis.sdk.e8.domain.voucher.req; - -import lombok.Data; - -import java.util.List; - -/** - * @author lsm - * @apiNote CancelVoucherReq - * @since 2025/6/25 - */ -@Data -public class CancelVoucherReq { - - private List ids; -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java index fa87143..ab99105 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java @@ -5,7 +5,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.sis.sdk.e8.VoucherControlService; import org.dromara.sis.sdk.e8.domain.ApiResp; -import org.dromara.sis.sdk.e8.domain.voucher.req.CancelVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; @@ -30,7 +29,6 @@ public class VoucherControlServiceImpl implements VoucherControlService { private static final String ISSUANCE_VOUCHER_MANY = "/api/E8/voucher/issue-voucher-many"; private static final String OPERATE_VOUCHER = "/api/E8/voucher/operate-many"; private static final String CHANGE_CARD = "/api/E8/voucher/change-card"; - private static final String CANCEL_VOUCHER = "/api/E8/voucher/cancel-voucher"; private final E8ApiUtil e8ApiUtil; @@ -53,26 +51,6 @@ public class VoucherControlServiceImpl implements VoucherControlService { return apiResp.getSuccess(); } - /** - * 批量发行凭证 - * - * @param req 凭证数据 - * @return Boolean - */ - public Boolean issueVoucherMany(List req) { - // 封装入参 - Map params = new HashMap<>(); - params.put("many", true); - params.put("list", req); - - // 调用API - ApiResp apiResp = e8ApiUtil.doPost(params, ISSUANCE_VOUCHER_MANY); - - if (!apiResp.getSuccess()) log.error("E8批量发行凭证失败，errorMsg：{}", apiResp); - - return apiResp.getSuccess(); - } - /** * 操作凭证 * @@ -111,25 +89,6 @@ public class VoucherControlServiceImpl implements VoucherControlService { return apiResp.getSuccess(); } - /** - * 注销人员凭证 - * - * @param req 入参 - * @return Boolean - */ - @Override - public Boolean cancelVoucher(CancelVoucherReq req) { - Map params = new HashMap<>(); - params.put("many", true); - params.put("list", req.getIds()); - - ApiResp apiResp = e8ApiUtil.doPost(params, CANCEL_VOUCHER); - - if (!apiResp.getSuccess()) log.error("E8注销人员凭证失败，errorMsg：{}", apiResp); - - return apiResp.getSuccess(); - } - /** * 上传人脸 * diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java index 3cc1df4..62071bd 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java @@ -41,13 +41,10 @@ public class E8ApiUtil { String jsonBody; // 判断是否执行批量接口 if (params.get("many") != null) { - Object list = params.get("list"); - List realParams = CollectionUtil.toList(list); - // sign签名 sign = getPostSign(null, api, timestamp); // 将params转换为JSON字符串 - jsonBody = JSONUtil.toJsonStr(realParams); + jsonBody = JSONUtil.toJsonStr(params.get("list")); }else { // sign签名 From 44f102823c3b2fe8ce6cbea5449d8c4a6917f5b9 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Wed, 25 Jun 2025 18:08:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(sis):=20=E5=87=AD=E8=AF=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/sis/controller/e8/VoucherControlController.java | 1 - .../java/org/dromara/sis/sdk/e8/VoucherControlService.java | 2 -- .../dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java | 4 +--- .../src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java | 3 +-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java index 10dff46..5b1ad5a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/e8/VoucherControlController.java @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.util.List; /** * @author lsm diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java index f211ab1..73fc0b4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/VoucherControlService.java @@ -4,8 +4,6 @@ import org.dromara.sis.sdk.e8.domain.voucher.req.ChangeCardReq; import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; -import java.util.List; - /** * @author lsm * @apiNote VoucherControlService diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java index ab99105..df36201 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/impl/VoucherControlServiceImpl.java @@ -11,8 +11,7 @@ import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; import org.dromara.sis.sdk.e8.utils.E8ApiUtil; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; + import java.util.Map; /** @@ -26,7 +25,6 @@ import java.util.Map; public class VoucherControlServiceImpl implements VoucherControlService { private static final String ISSUANCE_VOUCHER = "/api/E8/voucher/issue-voucher"; - private static final String ISSUANCE_VOUCHER_MANY = "/api/E8/voucher/issue-voucher-many"; private static final String OPERATE_VOUCHER = "/api/E8/voucher/operate-many"; private static final String CHANGE_CARD = "/api/E8/voucher/change-card"; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java index 62071bd..6fa2a82 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java @@ -1,6 +1,5 @@ package org.dromara.sis.sdk.e8.utils; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -46,7 +45,7 @@ public class E8ApiUtil { // 将params转换为JSON字符串 jsonBody = JSONUtil.toJsonStr(params.get("list")); - }else { + } else { // sign签名 sign = getPostSign(params, api, timestamp); // 将params转换为JSON字符串