autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 16:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 测试取消桩状态判断条件

Browse Source
This commit is contained in:
Lemon
2023-11-22 18:44:21 +08:00
parent b6a9c78170
commit 534dd77350
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -191,11 +191,11 @@ public class PileService {
} }
// 判断桩是否在线 // 判断桩是否在线
boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn()); // boolean onLineStatus = pileConnectorInfoService.checkPileOffLine(pileInfoVO.getPileSn());
if (onLineStatus) { // if (onLineStatus) {
// true为离线 // // true为离线
throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
} // }
// 查询站点信息 // 查询站点信息
PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId()); PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileInfoVO.getStationId());
@@ -246,9 +246,9 @@ public class PileService {
return null; return null;
} }
// 枪口状态不为2：占用（未充电） // 枪口状态不为2：占用（未充电）
if (!StringUtils.equals("2", pileConnectorDetailVO.getConnectorStatus())) { // if (!StringUtils.equals("2", pileConnectorDetailVO.getConnectorStatus())) {
throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR); // throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
} // }
String pileSn = pileConnectorDetailVO.getPileSn(); String pileSn = pileConnectorDetailVO.getPileSn();
PileConnectorVO resultVO = getPileDetailByPileSn(pileSn); PileConnectorVO resultVO = getPileDetailByPileSn(pileSn);
List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList(); List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();

8
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -36,10 +36,10 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev # 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 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 username: jsowell_prd_copy
password: 123456 password: 123456
# 从库数据源 # 从库数据源
slave: slave: