From 92773d8d1328a54ad1f4536b0e356e625a7781be Mon Sep 17 00:00:00 2001 From: qyx <565485304@qq.com> Date: Mon, 21 Sep 2020 17:56:44 +0800 Subject: [PATCH] =?UTF-8?q?recId=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99,=E5=B0=B1=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/dao/ZhangmenMessageRepository.java | 5 +++++ .../openapi/service/impl/ABClientServiceImpl.java | 11 ++++++++--- src/test/java/com/yuyou/openapi/openapi/RSATest.java | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenMessageRepository.java b/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenMessageRepository.java index 1216f8a..0e0b131 100644 --- a/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenMessageRepository.java +++ b/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenMessageRepository.java @@ -17,4 +17,9 @@ public interface ZhangmenMessageRepository extends JpaRepository findByRecId(Long recId); + + /** + * fixme 因为避免多环境下recId会产生重复的问题,这里先进行写这个接口,后续和上游确认通过 app_id 和 rec_id 进行组合查询,进行去重 + */ + List findByRecIdAndAppId(Long recId, String appId); } diff --git a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java index 7b1c91b..b8f2575 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java +++ b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java @@ -124,7 +124,6 @@ public class ABClientServiceImpl implements ABClientService { } ZhangmenMessageDO zhangmenMessageDO = ZhangmenMessageConverter.convertZhangmenMessageDOFromDTO(dto); - Long recId = zhangmenMessageDO.getRecId(); if (recId <= 0){ log.error("========== [recId is null,please check this data , error msg is {} ] ==========", dto.toString()); @@ -139,8 +138,14 @@ public class ABClientServiceImpl implements ABClientService { return Boolean.FALSE; } }else{ - log.error("========== [insert ZM data error , recId is exist , recId is {} ] ==========", recId); - return Boolean.TRUE; + log.warn("========== [recId is exist ,update this rec , recId is {} ] ==========", recId); + zhangmenMessageRepository.deleteAll(zhangmenMessageDOList); + // 如果存在则进行覆盖更新 + ZhangmenMessageDO update = zhangmenMessageRepository.save(zhangmenMessageDO); + if (update == null) { + log.error("========== [insert ZM data error , please check . ] =========="); + return Boolean.FALSE; + } } return Boolean.TRUE; } diff --git a/src/test/java/com/yuyou/openapi/openapi/RSATest.java b/src/test/java/com/yuyou/openapi/openapi/RSATest.java index 22ed46c..21fe202 100644 --- a/src/test/java/com/yuyou/openapi/openapi/RSATest.java +++ b/src/test/java/com/yuyou/openapi/openapi/RSATest.java @@ -19,7 +19,8 @@ public class RSATest { String str = "{\"tag\":{\"tag_key_id\":111111,\"tag_key_name\":\"学生姓名\",\"tag_key_ mobile\":\"联系方式\",\"tag_key_ grade\":\"课程年级\",\"tag_key_ course\":\"课程科目\"},\"data\":{\"name\":\"张小兵\",\"mobile\":\"13011112222\",\"grade\":\"三年级\",\"course\":\"数学\"}}"; // 轻轻 str = "{\"tag\":{\"tag_key_id\":111111,\"tag_key_name\":\"学生姓名\",\"tag_key_ mobile\":\"联系方式\",\"tag_key_ grade\":\"课程年级\",\"tag_key_ course\":\"课程科目\",\"tag_key_device\":\"试听设备\",\"tag_key_appointment\":\"预约时间段\"},\"data\":{\"name\":\"张小兵\",\"mobile\":\"13011112222\",\"grade\":\"三年级\",\"course\":\"数学\",\"device\":1,\"appointment\":2}}"; - + // 修改测试 + str = "{\"tag\":{\"tag_key_id\":111111,\"tag_key_name\":\"学生姓名\",\"tag_key_ mobile\":\"联系方式\",\"tag_key_ grade\":\"课程年级\",\"tag_key_ course\":\"课程科目\",\"tag_key_device\":\"试听设备\",\"tag_key_appointment\":\"预约时间段\"},\"data\":{\"name\":\"张小兵修改\",\"mobile\":\"13011112222\",\"grade\":\"三年级\",\"course\":\"英语\",\"device\":null,\"appointment\":null}}"; // 为null 的ZM通配加密串 // sgZmAQHqXdOi4W+PBGktK7dc9qTxOq21xNdrYDrFwdXaJ2aRbgCf7/8ug+x+hr+3nkerYoHReCErN9XrWk2QxymzZmOwskHWUcK9nll5CJr/k4VX3LLyAD5wd/HmivBg/pffoqYpa3PvrymNK3WZIrTDhq3H9hCKsS230PpCjNGxt6EZplN/niH0JTE2H9u3vUs+d7jlxy+zZxgmb8G/Eokkl7Tj9BOBZTu6jcThZmBb1ZhzygSkr++SKTVh7zoN/Ef2OOhJ5sCh+nzCHCXN7DnRPj0ClZY/ld0o9BaMYU8xFLxWIM4g+4za6dK2U2oWvyAqDJRnDVlbRcYMKvj0la9KBrrMUNAOAeS9GhsLycLqKMdnalQIJvBo0cwjtpRbS5qk3K88zxJxIjj5lKXbQXA1SuKZBRQ83LCBe+4h2rWlZs7GG03UvPFuQ8dD7CT3+rHk2lPKnJsT4xePSl+FoqaFGHBgUENa6Y7eF79086+Y9mh+Z12i6gR+YAXK9MrhCZn23+MEsE+4N/U68W79juurfZWF57g660Qr+iJJv944RZY/KG7E7AXn5GCAx18mNbFX0at9oNgPYsfcTzHmsYn5tZEWp8nSwvXJCCnCfQ+SmNgA7lh9/RK+Pv720DhN1Z7dBMoOzzeMnQGOA3K0q8RjQFGea0vUOE5UZgIS8Zs= // avzdUAeK1YKyagTpt+pXjgFV5NPeC14k/0Uql4Z3zLwNBBHSumYWwc0V2AYIjaMft5q+wEEOtKJXPbwyeQNpRDWB2NHKiR1pothiJ16ixfIrAtZkxvNsfw5osfri6SZ0GHcDWIlWDtypyoYEIT5AkKWcjqkApuTC7zSgO1rPAvZj1Syvd7Wc43AnZIb0InGLWBu3ZBEdLSAdowdrhDGs+Hk/QPoVcHRCzOXnrHDkpgfxo813FfK53+SjuoVNRai/H6Gjs5xZ0XBr4nvSOqOj1frAO7ctj8fNjTaSF0ECiaWq3/93J1ew69bWroc02EQc3Luial5vj2dmzmiq8qR5FJAK4yx7519lNyj83In2XKpMPit/C5JKWogarbpUNu8Vt0oDCDqH2aV8uGblyQzj7GNa8D7gGa7/8G4o7i8Nf10rHvSuloxv+oQ+WAIxr4MKlhk6thjlPk/NwPNFfZ5YDd9o7OMai7HYUx/Jb+YEPjykS7l9YKFRP6vpr25hMsI8pav3dFR+AkEo6n+mtdw/M6xlmpB9o3/WYMs8N/XE9e+uOpcCRPspSpVhjT1KAHJlCfJ7ST2aivTc6lMERB+62xbMkDgljOvrgQ2zL2RaiuCpVkhd1ukEyGgRnbTU8zarSxsu1sAk7MD0NnoEAP35Cfl0vC5M519mytj3kkIe4DI=