From a90d5a8c8213af735345ce1544363619fa92ecc4 Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 18 May 2022 18:06:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=A1=E6=97=B6=E6=A0=A1?= =?UTF-8?q?=E4=BB=B7=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9F=AD=E4=BF=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/controller/XhpcChargingPileController.java | 4 ++-- .../xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index eb41f876..a8acec1a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -160,9 +160,9 @@ public class XhpcChargingPileController extends BaseController { } R r = powerPileService.configTimeNRateModel(serialNumber); if(r.getCode() !=200){ - return AjaxResult.error("下发校时校价失败，请重新下发"); + return AjaxResult.error(r.getMsg()); } - return AjaxResult.success("下发校时校价成功"); + return AjaxResult.success(r.getMsg()); } @GetMapping("/configRmReplyMessage") diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml index 6b2de728..d3d69341 100644 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml +++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml @@ -100,7 +100,7 @@ status, create_time as createTime from xhpc_sms - where del_flag=0 + where del_flag=0 and content is not null and status=#{status}