From 9f215ade260e30382ef39ec09bd2c9128e591448 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 11 Sep 2023 18:32:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#=20=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station/service/impl/StationServiceImpl.java | 55 +++++++++++----------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index 9e1a89f..79997f8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -91,7 +91,8 @@ public class StationServiceImpl extends BaseServiceImpl sort = Optional.ofNullable(this.getStationMaxOrder()); req.setSort(sort.isPresent() ? sort.get() + 1 : 1); - Assert.isTrue(this.saveOrUpdate(req), () -> { + boolean updateResult = this.saveOrUpdate(req); + Assert.isTrue(updateResult, () -> { throw new ServiceException("创建/修改站点信息失败！"); }); this.pushStation(req); @@ -229,32 +230,32 @@ public class StationServiceImpl extends BaseServiceImpllambdaUpdate() - .set(StationEntity::getCode, req.getCode()) - .set(StationEntity::getName, req.getName()) - .set(StationEntity::getType, req.getType()) - .set(StationEntity::getCommissionTime, req.getCommissionTime()) - .set(StationEntity::getEnableControl, req.getEnableControl()) - .set(StationEntity::getLgtd, req.getLgtd()) - .set(StationEntity::getLttd, req.getLttd()) - .set(StationEntity::getRefDept, req.getRefDept()) - .set(StationEntity::getAreaCode, req.getAreaCode()) - .set(StationEntity::getRefDomain, req.getRefDomain()) - .set(StationEntity::getRefBasin, req.getRefBasin()) - .set(StationEntity::getRefArea, req.getRefArea()) - .set(StationEntity::getRemark, req.getRemark()) - .set(StationEntity::getPic, req.getPic()) - .set(StationEntity::getContact, req.getContact()) - .set(StationEntity::getContactor, req.getContactor()) - .set(StationEntity::getAddress, req.getAddress()) - .set(StationEntity::getCompany, req.getCompany()) - .set(StationEntity::getCreateDept, req.getCreateDept()) - .set(StationEntity::getServeType, req.getServeType()) - .set(StationEntity::getLimitWaterLevel, req.getLimitWaterLevel()) - .eq(StationEntity::getId, req.getId())); - } +// @Override +// public boolean updateById(StationEntity req) { +// return super.update(Wrappers.lambdaUpdate() +// .set(StationEntity::getCode, req.getCode()) +// .set(StationEntity::getName, req.getName()) +// .set(StationEntity::getType, req.getType()) +// .set(StationEntity::getCommissionTime, req.getCommissionTime()) +// .set(StationEntity::getEnableControl, req.getEnableControl()) +// .set(StationEntity::getLgtd, req.getLgtd()) +// .set(StationEntity::getLttd, req.getLttd()) +// .set(StationEntity::getRefDept, req.getRefDept()) +// .set(StationEntity::getAreaCode, req.getAreaCode()) +// .set(StationEntity::getRefDomain, req.getRefDomain()) +// .set(StationEntity::getRefBasin, req.getRefBasin()) +// .set(StationEntity::getRefArea, req.getRefArea()) +// .set(StationEntity::getRemark, req.getRemark()) +// .set(StationEntity::getPic, req.getPic()) +// .set(StationEntity::getContact, req.getContact()) +// .set(StationEntity::getContactor, req.getContactor()) +// .set(StationEntity::getAddress, req.getAddress()) +// .set(StationEntity::getCompany, req.getCompany()) +// .set(StationEntity::getCreateDept, req.getCreateDept()) +// .set(StationEntity::getServeType, req.getServeType()) +// .set(StationEntity::getLimitWaterLevel, req.getLimitWaterLevel()) +// .eq(StationEntity::getId, req.getId())); +// } @Override From 7c4c2c4ff8c191a5734583e6586564272aeaa3b8 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 11 Sep 2023 18:33:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#=20=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81fei?= =?UTF-8?q?gn=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E6=8A=A5=E9=94=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/message/push/feign/PushMsgClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/push/feign/PushMsgClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/push/feign/PushMsgClient.java index 92ae534..9a838db 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/push/feign/PushMsgClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/push/feign/PushMsgClient.java @@ -28,8 +28,8 @@ import org.springframework.web.bind.annotation.RestController; public class PushMsgClient implements IPushMsgClient { @Override - @PostMapping("/sendMail") - @ApiOperation("发送邮件") + @PostMapping("/sendSms") + @ApiOperation("发送短信") @ApiOperationSupport(order=1) public R sendSms(SmsPushDto smsPushDto) { IPushService pushService = SpringUtil.getBean("smsPushService"); @@ -37,8 +37,8 @@ public class PushMsgClient implements IPushMsgClient { } @Override - @PostMapping("/sendSms") - @ApiOperation("发送短信") + @PostMapping("/sendMail") + @ApiOperation("发送邮件") @ApiOperationSupport(order=2) public R sendMail(MailPushDto mailPushDto) { IPushService pushService = SpringUtil.getBean("mailPushService");