From 2147648dd51bada88ba7d01beec6dff15315e7dc Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 4 Jan 2023 15:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/dao/PurpleMansionSeal.java | 18 +++++++++++++----- .../com/ljsd/jieling/util/CBean2Proto.java | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java index ab8397d75..79fa62afd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PurpleMansionSeal.java @@ -37,11 +37,19 @@ public class PurpleMansionSeal{ this.state = state; } - public PurpleMansionSeal(com.ljsd.jieling.thrift.idl.PurpleMansionSeal seal) { - this.sealId = seal.getSealId(); - this.type = seal.getType(); - this.subId = seal.getSubId(); - this.state = seal.getState(); + public PurpleMansionSeal() { + } + + public static PurpleMansionSeal createCrossSeal(com.ljsd.jieling.thrift.idl.PurpleMansionSeal sealIdl){ + PurpleMansionSeal seal = new PurpleMansionSeal(); + if (sealIdl == null){ + return seal; + } + seal.setSealId(sealIdl.getSealId()); + seal.setType(sealIdl.getType()); + seal.setSubId(sealIdl.getSubId()); + seal.setState(sealIdl.getState()); + return seal; } public int getSealId() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index fc8e6b2f1..e58cab84a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -1353,7 +1353,7 @@ public class CBean2Proto { public static Map sealOfCross(Map crossSeals){ HashMap result = new HashMap<>(); for (Map.Entry entry : crossSeals.entrySet()) { - PurpleMansionSeal seal = new PurpleMansionSeal(entry.getValue()); + PurpleMansionSeal seal = PurpleMansionSeal.createCrossSeal(entry.getValue()); result.put(entry.getKey(),seal); } return result;