From 11de4d5765b87d4a35dd023e3538f944a34d0de0 Mon Sep 17 00:00:00 2001 From: yewj Date: Sun, 1 Sep 2024 18:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 ++++++++++++------ .../mipsdl/controller/YbApiController.java | 10 +++++++--- .../com/glxp/mipsdl/service/yb/YbClient.java | 9 ++++++--- src/main/resources/application-dev.yml | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 508e587..9ee875e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,18 +104,24 @@ 3.1.0 provided - + + com.alibaba + fastjson + 2.0.4 + + + com.alibaba.fastjson2 + fastjson2 + + + com.alibaba.fastjson2 fastjson2 2.0.24 - - com.alibaba - fastjson - 2.0.4 - + diff --git a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java index f25ea33..021f408 100644 --- a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java +++ b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java @@ -1,18 +1,20 @@ package com.glxp.mipsdl.controller; +import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; import com.glxp.mipsdl.req.yb.DictRequest; import com.glxp.mipsdl.req.yb.Yljg1201Request; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.service.yb.YbClient; import com.glxp.mipsdl.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +@Slf4j @RestController public class YbApiController { @Resource @@ -27,7 +29,8 @@ public class YbApiController { @PostMapping("/udiwms/erp/yb/1201") public BaseResponse getYb1201(@RequestBody Yljg1201Request yljg1201Request) { String jsonStr = JSONUtil.toJsonStr(yljg1201Request); - return ResultVOUtils.success(ybClient.ybPost("1201", JSON.parseObject(jsonStr))); + log.error("【1201】医药机构信息获取请求参数：" + jsonStr); + return ResultVOUtils.success(ybClient.ybPost("1201", jsonStr)); } @@ -37,7 +40,8 @@ public class YbApiController { @PostMapping("/udiwms/erp/yb/dict") public BaseResponse getYb1301(@RequestBody DictRequest dictRequest) { String jsonStr = JSONUtil.toJsonStr(dictRequest.getData()); - return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), JSON.parseObject(jsonStr))); + log.error("【1301】通用字典下载接口请求参数：" + jsonStr); + return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), jsonStr)); } diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java index 516356b..43b4610 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -6,7 +6,9 @@ import cn.hsa.zephyr.apisdk.internal.util.encrypt.EncryptionModeEnum; import cn.hsa.zephyr.apisdk.internal.util.encrypt.SignTypeEnum; import cn.hsa.zephyr.apisdk.request.ZephyrMedicalRequest; import cn.hsa.zephyr.apisdk.response.ChsMedicalResponse; -import com.alibaba.fastjson.JSONObject; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.glxp.mipsdl.entity.system.ThrYbSetup; import com.glxp.mipsdl.service.system.ThrYbSetupService; import com.glxp.mipsdl.util.DateUtil; @@ -21,7 +23,7 @@ public class YbClient { @Resource ThrYbSetupService thrYbSetupService; - public ChsMedicalResponse ybPost(String apiNo, JSONObject requestData) { + public ChsMedicalResponse ybPost(String apiNo, String data) { ThrYbSetup thrYbSetup = thrYbSetupService.getSetUp(); @@ -44,7 +46,8 @@ public class YbClient { req.setInfTime(DateUtil.formatDateTime(new Date())); req.setFixmedinsCode(thrYbSetup.getFixmedins_code()); req.setFixmedinsName(thrYbSetup.getFixmedins_name()); - req.setInput(requestData); + com.alibaba.fastjson.JSONObject yyyy = JSONObject.parseObject(data, com.alibaba.fastjson.JSONObject.class); + req.setInput(yyyy); ChsMedicalResponse resp = client.execute(req); return resp; } catch (ZephyrApiException e) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 82e4c63..c9ae32e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring: strict: false datasource: master: - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver