From a2d88fa57d0d289eefb14161c1ad558859e262a7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 13 Jul 2020 17:35:35 +0800 Subject: [PATCH] update --- .../platform/biz/service/MongoSyncService.java | 39 ++++++++++++++++++++++ .../lyms/platform/common/utils/LymsEncodeUtil.java | 2 +- .../web/service/impl/PatientWeightServiceImpl.java | 4 +-- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java index c470c2b..2e23920 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java @@ -424,4 +424,43 @@ public class MongoSyncService { } + public static void main(String[] args) { + Object entity = null; + String className = "26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB"; + String json ="rO0ABXNyACxjb20ubHltcy5wbGF0Zm9ybS5wb2pvLlJlc2lkZW50c0Fy" + + "Y2hpdmVNb2RlbAAAABa1TPYeAgBXWgAJaXNIaXN0b3J5TAAHYWRkcmVzc3QAEkxqYXZhL2xhbmcvU3RyaW5nO0wAD2FkZHJlc3NSZWdpc3RlcnEAfgABTAADYWdldAATTGphdmEvbGFuZy9Jbn" + + "RlZ2VyO0wABmFyZWFJZHEAfgABTAAOYXJlYVJlZ2lzdGVySWRxAH4AAUwACWJkWHlIb3Vyc3EAfgABTAAIYmlydGhkYXl0ABBMamF2YS91dGlsL0RhdGU7TAAIYnVpbGREYXlxAH4AA0wAC2J1" + + "aWxkRG9jdG9ycQB+AAFMAAJienEAfgABTAAEY2NubHEAfgABTAAMY2Vuc3VzVHlwZUlkcQB+AAFMAA5jZXJ0aWZpY2F0ZU51bXEAfgABTAARY2VydGlmaWNhdGVUeXBlSWRxAH4AAUwAB2NoZW" + + "NrdXBxAH4AAUwAC2NoZWNrdXBUaW1lcQB+AANMAA1jaGlsZEV4dEFkZHJzdAAQTGphdmEvdXRpbC9MaXN0O0wABmNpdHlJZHEAfgABTAAOY2l0eVJlZ2lzdGVySWRxAH4AAUwABGNvZGV0ABBM" + + "amF2YS9sYW5nL0xvbmc7TAAJY291bnRyeUlkcQB+AAFMAAdjcmVhdGVkcQB+AANMAA1mYW1pbHlIaXN0b3J5cQB+AAFMAAxmb2xsb3d1cFRpbWVxAH4AA0wABWhhc0hqcQB+AAJMAARoY2NzcQ" + + "B+AAFMAApob3NwaXRhbElkcQB+AAFMAARoeWNzcQB+AAFMAAJpZHEAfgABTAALaXNPck5vdEJkWHlxAH4AAUwACWlzT3JOb3RHbHEAfgABTAAJaXNPck5vdEh5cQB+AAFMAAppc09yTm90UXhl" + + "cQB+AAFMAAtpc09yTm90UnNqanEAfgABTAAJaXNPck5vdFNjcQB+AAFMAAlpc09yTm90U3JxAH4AAUwACWlzT3JOb3RYeXEAfgABTAAJaXNPck5vdFlqcQB+AAFMAAppc09yTm90cmRscQB+AA" + + "FMAAVqaXpoaXEAfgABTAACanFxAH4AAUwABGp0Ym1xAH4AAUwAC2xldmVsVHlwZUlkcQB+AAFMAApsaXZlVHlwZUlkcQB+AAFMAAptYXJyaWFnZUlkcQB+AAFMAARtY3lqcQB+AANMAAhtaWxp" + + "dGFyeXEAfgACTAAIbW9kaWZpZWRxAH4AA0wACG5hdGlvbklkcQB+AAFMAAtwYXN0SGlzdG9yeXEAfgABTAAPcGVyc29uYWxIaXN0b3J5cQB+AAFMAAVwaG9uZXEAfgABTAAFcGhvdG9xAH4AAU" + + "wADXByZWduYW50QnVpbGRxAH4AAUwADnByZXNlbnRIaXN0b3J5cQB+AAFMABBwcm9mZXNzaW9uVHlwZUlkcQB+AAFMAApwcm92aW5jZUlkcQB+AAFMABJwcm92aW5jZVJlZ2lzdGVySWRxAH4A" + + "AUwACXB1Ymxpc2hJZHEAfgABTAALcHVibGlzaE5hbWVxAH4AAUwABHJnbGNxAH4AAUwAA3NleHEAfgABTAAMc3BvdXNlQ2FyZE5vcQB+AAFMABBzcG91c2VDZXJ0VHlwZUlkcQB+AAFMAApzcG" + + "91c2VOYW1lcQB+AAFMAAtzcG91c2VQaG9uZXEAfgABTAAEc3RvcHEAfgABTAAIc3RyZWV0SWRxAH4AAUwAEHN0cmVldFJlZ2lzdGVySWRxAH4AAUwABHN0c2NxAH4AAUwAAnRqcQB+AAFMAA90" + + "cmFja0hvc3BpdGFsSWRxAH4AAUwACHVzZXJuYW1lcQB+AAFMAAh2Y0NhcmROb3EAfgABTAAId29ya1VuaXRxAH4AAUwABHh4cWtxAH4AAUwABXh5em5zcQB+AAFMAAR5ak1scQB+AAFMAAN5am" + + "xxAH4AAUwAAnlucQB+AAJMAAt5d2dtSGlzdG9yeXEAfgABTAAEemNjc3EAfgABTAAGem5zdHprcQB+AAFMAAJ6cXEAfgABTAAEenloY3EAfgABTAAEenlsY3EAfgABeHIAKWNvbS5seW1zLnBs" + + "YXRmb3JtLmNvbW1vbi5yZXN1bHQuQmFzZU1vZGVsAAAAAAAAAAECAAB4cAB0AAnlh6Tlh7DmuZZ0AAzlupflrZDms4rmnZFzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbH" + + "VleHIAEGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhwAAAAGnQAAzMyNXQAAzMyNXBzcgAOamF2YS51dGlsLkRhdGVoaoEBS1l0GQMAAHhwdwgAAACwQTFkAHhzcQB+AA93CAAAAXKzjxwA" + + "eHQACjIxMDAwMDUwMDRwcHB0ABIzNzEwODIxOTkzMTIyODQxMlh0ACQ3MGFlMWQ5My0yOTY0LTQ2YmMtODNmYS1iZWM5ZmY2MDViMWN0AAEwcHNyABNqYXZhLnV0aWwuQXJyYXlMaXN0eIHSHZ" + + "nHYZ0DAAFJAARzaXpleHAAAAAAdwQAAAAAeHQAAzIzNHQAAzIzNHNyAA5qYXZhLmxhbmcuTG9uZzuL5JDMjyPfAgABSgAFdmFsdWV4cQB+AAsAAAAADApd83QAGDU3Y2VhZDY2MjMxYTE4YTFh" + + "YWExMmI5NnNxAH4AD3cIAAABcrXdHOZ4dAAQeyJ5ZXNPck5vIjoibm8ifXNxAH4AD3cIAAABcrXdHOZ4cHB0AAoyMTAwMDAxNzczcHQAGDVlZTZlMDhhMGNmMjMyYTA4YTNiYWNkZHBwcHBwcH" + + "BwcHBwcHBwcHQAJGQ3NWQxOTAyLTYxYTUtNGExNy1hNjhhLTViOGE5ODI2NTM3YnBwcQB+AB10ABg1N2NmZDgyYjIzMWFhYjBmYThiMDk2ZTd0ABB7Inllc09yTm8iOiJubyJ9dAAQeyJ5ZXNP" + + "ck5vIjoibm8ifXQACzE1MjUzMTg2MDUzcHEAfgAVdAAQeyJ5ZXNPck5vIjoibm8ifXB0AAMyMTF0AAMyMTF0AAoyMTAwMDA1MDA0dAAJ546L57u057u0cHQAJGMyMzc3OWYxLWNiNmUtNDRkMC" + + "05ZmM4LTBhOTkwYmY2MTg0Y3BwcHBwdAAENDA1MHQABDQwNjFwcHB0AAnnjovnkZvmu6JwcHBwcHBzcQB+AAoAAAABdAAQeyJ5ZXNPck5vIjoibm8ifXBwcHBw"; + try { + entity = SerializUtils.byteToObj(Base64.decodeBase64(json)); + } catch (Exception ee) { + try { + entity = JsonUtil.jkstr2Obj(LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key), Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key))); + } catch (Exception e) { + e.printStackTrace(); + } + } + System.out.println(entity); + } + + } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 1364b0e..3afad3c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -26,7 +26,7 @@ public class LymsEncodeUtil { //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); - String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89", key); + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key); System.out.println("解密后：" + json); String key1 = "Lymsh@2020"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 28ff225..cfa2269 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -770,8 +770,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } if (k1 < 1000) { k1 = 1000; - } else if (k1 > 3300) { - k1 = 3300; + } else if (k1 > 3100) { + k1 = 3100; } //孕早期 if (week < 12) { -- 1.8.3.1