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 2b0be4d..cbc6984 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1399,7 +1399,7 @@ public class CtqyyClient extends CommonHttpClient { IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); - if (page.getTotal() == 0){ + if (page.getTotal() == 0) { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(null); @@ -1431,7 +1431,7 @@ public class CtqyyClient extends CommonHttpClient { //拉取处方退货时,改成拉取v_ypzs_pres_info_return IPage page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); - if (page.getTotal() == 0){ + if (page.getTotal() == 0) { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(null); @@ -1683,7 +1683,7 @@ public class CtqyyClient extends CommonHttpClient { IPage page = vInsurNationGoodsClMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); - if (page.getTotal() == 0){ + if (page.getTotal() == 0) { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(null); @@ -1846,13 +1846,13 @@ public class CtqyyClient extends CommonHttpClient { if (basicProductsEntity != null) { collectOrderBiz.setRelId(basicUdirelEntity.getId()); collectOrderBiz.setThrCode(basicUdirelEntity.getMainId()); - }else { + } else { errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); } } else { errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); } - }else { + } else { errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";"); } //==================================== @@ -1879,6 +1879,7 @@ public class CtqyyClient extends CommonHttpClient { return ResultVOUtils.error(500, "下载失败!"); } } + private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { List presInfoEntities = page.getRecords(); List vInsurNationGoodsReturns = new ArrayList<>(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index cb12b54..657c7e8 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://dm.xmglxp.com:33066/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: Glxp@6066 driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -14,32 +14,32 @@ spring: # username: SD_UDIJK # password: SD_UDIJK # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?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_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver - # thirdSql: - # url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - # username: root - # password: Glxp@6066 - # driver-class-name: com.p6spy.engine.spy.P6SpyDriver + # thirdSql: + # url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?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 ptxhSql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # username: SD_UDIJK # password: SD_UDIJK # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?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_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver ctqyySql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # username: I_YPZS # password: zy02v4ys # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_yxfy?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_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver hikari: connection-timeout: 60000