From 791326a721fe3cceb484d836b9d86f13059d1f85 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Wed, 29 Sep 2021 18:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=BA=E7=AB=99=E3=80=81?= =?UTF-8?q?=E6=A1=A9=E3=80=81=E7=BB=88=E7=AB=AF=E8=B4=B9=E7=8E=87=E6=A8=A1?= =?UTF-8?q?=E5=9E=8Bid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/mapper/XhpcChargingStationMapper.java | 12 ++++++++++++ .../service/XhpcChargingStationServiceImpl.java | 11 ++++++----- .../mapper/XhpcChargingStationMapper.xml | 8 ++++++++ .../user/service/impl/XhpcAppUserServiceImpl.java | 15 ++++++--------- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java index e58f00ef..8f8f36e0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java @@ -234,4 +234,16 @@ public interface XhpcChargingStationMapper { */ List> getXhpcRateTimeNumber(@Param("chargingStationId") Long chargingStationId); + /** + * 修改桩的计费模型id + * @param chargingStationId + */ + void updateXhpcChargingPile(@Param("chargingStationId") Long chargingStationId,@Param("rateModelId") Long rateModelId); + + /** + * 修改终端的计费模型id + * @param chargingStationId + */ + void updateXhpcTerminal(@Param("chargingStationId") Long chargingStationId,@Param("rateModelId") Long rateModelId); + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index a854a112..4e3a52ba 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -482,8 +482,9 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi cacheRateModel.setTfPricesSeq(tfPricesSeq); R r = powerPileService.setStationRateModel(chargingStationId, rateModelId, cacheRateModel); - System.out.println(r.getCode()); - System.out.println(r.getMsg()); + //修改桩和终端的模板id + xhpcChargingStationMapper.updateXhpcChargingPile(chargingStationId,rateModelId); + xhpcChargingStationMapper.updateXhpcTerminal(chargingStationId,rateModelId); return AjaxResult.success(); } @@ -901,9 +902,9 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } cacheRateModel.setTfPricesSeq(tfPricesSeq); R r = powerPileService.setStationRateModel(chargingStationId, rateModelId, cacheRateModel); - System.out.println(r.getCode()); - System.out.println(r.getMsg()); - + //修改桩和终端的模板id + xhpcChargingStationMapper.updateXhpcChargingPile(chargingStationId,rateModelId); + xhpcChargingStationMapper.updateXhpcTerminal(chargingStationId,rateModelId); return AjaxResult.success(); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 1782603b..57f7f759 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -852,4 +852,12 @@ where charging_station_id = #{chargingStationId} order by sort + + + update xhpc_charging_pile set rate_model_id=#{rateModelId} WHERE charging_station_id=#{chargingStationId} + + + + update xhpc_terminal set rate_model_id=#{rateModelId} WHERE charging_station_id=#{chargingStationId} + diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index ced54d86..b4b2dbaf 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -116,16 +116,13 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService { if (StringUtils.isEmpty(phone)) { return R.fail(HttpStatus.NOT_NULL, "请重新获取手机号"); } - if("2".equals(type)){ - if (StringUtils.isEmpty(code)) { - return R.fail(HttpStatus.NOT_NULL, "验证码不能为空"); - } - String captcha = redisService.getCacheObject("pvToken:" + phone); - if (!code.equalsIgnoreCase(captcha)) { - R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); - } + if (StringUtils.isEmpty(code)) { + return R.fail(HttpStatus.NOT_NULL, "验证码不能为空"); + } + String captcha = redisService.getCacheObject("pvToken:" + phone); + if (!code.equalsIgnoreCase(captcha)) { + R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } - XhpcAppUser info = xhpcAppUserMapper.getAppUserByPhone(phone); if (StringUtils.isNotNull(info)) { return R.fail(HttpStatus.ALREADY_EXISTING, "账号已存在");