From 534dd77350d240fa5fd3594eaaad90fcd0f540fa Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 22 Nov 2023 18:44:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=B5=8B=E8=AF=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=A1=A9=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/service/PileService.java | 16 ++++++++-------- .../src/main/resources/application-dev.yml | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 3da853897..6f1035888 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -191,11 +191,11 @@ public class PileService { } // 判断桩是否在线 - boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); - if (onLineStatus) { - // true为离线 - throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); - } + // boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); + // if (onLineStatus) { + // // true为离线 + // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); + // } // 查询站点信息 PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId()); @@ -246,9 +246,9 @@ public class PileService { return null; } // 枪口状态不为2：占用（未充电） - if (!StringUtils.equals("2", pileConnectorDetailVO.getConnectorStatus())) { - throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); - } + // if (!StringUtils.equals("2", pileConnectorDetailVO.getConnectorStatus())) { + // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); + // } String pileSn = pileConnectorDetailVO.getPileSn(); PileConnectorVO resultVO = getPileDetailByPileSn(pileSn); List connectorInfoList = resultVO.getConnectorInfoList(); diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 01a6c12db..248424319 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -36,10 +36,10 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_dev -# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_prd_copy +# url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_dev + url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_prd_copy password: 123456 # 从库数据源 slave: