From 31551bb223dd0aa754a6e0494328c80b99e19963 Mon Sep 17 00:00:00 2001 From: yanglin Date: Mon, 3 Mar 2025 11:36:19 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=8D=B0=E7=AB=A0=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E4=BA=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/server/ess/ContractManager.java | 4 ++-- .../server/ess/controller/CallbackController.java | 4 ++-- .../{JsonObjectAsString.java => StringObject.java} | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) rename ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/{JsonObjectAsString.java => StringObject.java} (58%) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java index a2e397cc..a57c5964 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java @@ -23,7 +23,7 @@ import cn.axzo.nanopart.ess.server.dao.EssContractDao; import cn.axzo.nanopart.ess.server.dao.EssLogDao; import cn.axzo.nanopart.ess.server.entity.EssContract; import cn.axzo.nanopart.ess.server.entity.EssPerson; -import cn.axzo.nanopart.ess.server.ess.domain.JsonObjectAsString; +import cn.axzo.nanopart.ess.server.ess.domain.StringObject; import cn.axzo.nanopart.ess.server.ess.mq.EssBroadcaster; import cn.axzo.nanopart.ess.server.ess.support.ContractSupport; import cn.axzo.nanopart.ess.server.utils.BizAssertions; @@ -64,7 +64,7 @@ public class ContractManager { EssPerson superAdmin = orgManager.getSuperAdminOrThrow(request.getCreator().getOuId()); List essFileIds = essClient.uploadDocument(superAdmin, request.getByFile().getBase64Files()); ChannelCreateFlowByFilesResponse essResponse = essClient.createContractByFile(superAdmin, essFileIds, - request.getByFile(), JsonObjectAsString.create().put(CONTRACT_ID, contract.getId()).toString()); + request.getByFile(), StringObject.create().put(CONTRACT_ID, contract.getId()).toString()); List essRecipientIds = Arrays.stream(essResponse.getApprovers()) // .map(ApproverItem::getRecipientId) // .collect(toList()); diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java index 9c355e1f..6ed9cf26 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java @@ -43,7 +43,7 @@ import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.ContractManager; import cn.axzo.nanopart.ess.server.ess.EssService; import cn.axzo.nanopart.ess.server.ess.OrgManager; -import cn.axzo.nanopart.ess.server.ess.domain.JsonObjectAsString; +import cn.axzo.nanopart.ess.server.ess.domain.StringObject; import cn.axzo.nanopart.ess.server.ess.domain.OrgOpenId; import cn.axzo.nanopart.ess.server.ess.domain.PersonOpenId; import cn.axzo.nanopart.ess.server.ess.support.EssSupport; @@ -183,7 +183,7 @@ class CallbackController implements EssCallbackApi, InitializingBean { }).collect(toList()); EssContract contract = essContractDao.findOrNull(changes.getFlowId()); if (contract == null && StringUtils.isNotBlank(changes.getCustomerData())) { - JSONObject customData = JsonObjectAsString.parse(changes.getCustomerData()).asJsonObject(); + JSONObject customData = StringObject.parse(changes.getCustomerData()).asJsonObject(); contract = essContractDao.getById(customData.getLong(ContractManager.CONTRACT_ID)); } if (contract == null) { diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/JsonObjectAsString.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/StringObject.java similarity index 58% rename from ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/JsonObjectAsString.java rename to ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/StringObject.java index 35994928..fc202ae6 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/JsonObjectAsString.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/StringObject.java @@ -9,23 +9,23 @@ import lombok.RequiredArgsConstructor; * @author yanglin */ @RequiredArgsConstructor(access = AccessLevel.PRIVATE) -public class JsonObjectAsString { +public class StringObject { private final JSONObject obj; - public static JsonObjectAsString create() { - return new JsonObjectAsString(new JSONObject()); + public static StringObject create() { + return new StringObject(new JSONObject()); } - public static JsonObjectAsString parse(String jsonStr) { - return new JsonObjectAsString(JSONObject.parseObject(jsonStr)); + public static StringObject parse(String jsonStr) { + return new StringObject(JSONObject.parseObject(jsonStr)); } public JSONObject asJsonObject() { return obj; } - public JsonObjectAsString put(String key, Object value) { + public StringObject put(String key, Object value) { obj.put(key, value); return this; }