From daa3c15e05d942c4a5873b41bf968b31cfe6b34b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 25 Mar 2024 09:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=AB=98=E8=80=97=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 14 ++++---- .../com/glxp/mipsdl/config/HospConfig.java | 3 +- src/main/resources/application-pro.yml | 33 +++++++++++++------ .../mapper/system/SysHospConfigDao.xml | 10 +----- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 626ccf3..ef77ccb 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -794,15 +794,15 @@ public class CtqyyClient extends CommonHttpClient { ctqyyRequest.setMsgHeader(getMsgHeader("getSickHighitem")); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest)); -// String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); // String response = // "{\"code\": 20000,\"message\": \"success\",\"data\": {\"list\": [{\"recordNo\": 391,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106971221560052\",\"Barcode\": \"111704022117000188340055\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 390,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106946149100093\",\"Barcode\": \"111704022117000188340007\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 408,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63182\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695502193\",\"Barcode\": \"111703012117000076800035\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 401,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695522023\",\"Barcode\": \"111612212116120902040009\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 423,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695525055\",\"Barcode\": \"111701062116122700670005\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 400,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111612212116120902040047\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 422,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111701062116122700670013\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"}],\"total\": 7}}"; - String response = null; - try { - response = FileUtils.getFileContent("E://ghresponse.json"); - } catch (IOException e) { - e.printStackTrace(); - } +// String response = null; +// try { +// response = FileUtils.getFileContent("E://ghresponse.json"); +// } catch (IOException e) { +// e.printStackTrace(); +// } BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { }); diff --git a/src/main/java/com/glxp/mipsdl/config/HospConfig.java b/src/main/java/com/glxp/mipsdl/config/HospConfig.java index e7e9579..ac8ca55 100644 --- a/src/main/java/com/glxp/mipsdl/config/HospConfig.java +++ b/src/main/java/com/glxp/mipsdl/config/HospConfig.java @@ -36,13 +36,14 @@ public class HospConfig { /** * 获取医院配置信息 + * * @return */ @PostConstruct public SysHospConfigEntity getHospConfig() { if (null == hospConfig) { log.info("系统启动中，获取医院编码"); - SysHospConfigEntity sysHospConfig = hospConfigDao.selectOne(new LambdaQueryWrapper().eq(SysHospConfigEntity::getThirdSys, thirdSys)); + SysHospConfigEntity sysHospConfig = hospConfigDao.selectOne(new LambdaQueryWrapper().eq(SysHospConfigEntity::getThirdSys, thirdSys).last("limit 1")); if (null != sysHospConfig) { hospConfig = sysHospConfig; DictUtl.CURRENT_HOSP_CODE = hospConfig.getCode(); diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 7466019..7a9a816 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,12 +1,25 @@ spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: Glxp@6066 - hikari: - connection-timeout: 60000 - maximum-pool-size: 60 - minimum-idle: 10 - -UDIWMS_IP: http://127.0.0.1:9991 \ No newline at end of file + dynamic: + primary: master + strict: false + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: GLxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + njsql: + url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 +UDIWMS_IP: http://127.0.0.1:9991 diff --git a/src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml b/src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml index 97c1a73..9a2bb37 100644 --- a/src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysHospConfigDao.xml @@ -1,12 +1,4 @@ - - - - - - code, - name - - \ No newline at end of file +