From 2a7b3d7328076bab6f7ab11b8ffe9daef78ae9d8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 14 Mar 2023 10:10:18 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pile/MemberBasicInfoController.java | 5 +++-- .../impl/MemberPlateNumberRelationServiceImpl.java | 6 ++++++ .../mapper/pile/MemberPlateNumberRelationMapper.xml | 2 +- jsowell-ui/src/views/member/info/detail.vue | 12 +++++++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index e0be5586d..3625268a7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Locale; /** * 会员基础信息Controller @@ -161,7 +162,7 @@ public class MemberBasicInfoController extends BaseController { return getDataTable(list); } - @PreAuthorize("@ss.hasPermi('member:info:remove')") + @PreAuthorize("@ss.hasPermi('member:info:update')") @Log(title = "修改车牌号信息", businessType = BusinessType.UPDATE) @PostMapping("/updatePlateNumber") public AjaxResult updatePlateNumber(@RequestBody MemberPlateNumberRelation relation){ @@ -178,7 +179,7 @@ public class MemberBasicInfoController extends BaseController { @PostMapping("/deletePlateNumber") public AjaxResult deletePlateNumber(@RequestBody MemberPlateNumberRelation relation){ int i = memberPlateNumberRelationService.unbindingPlateNumber(relation.getMemberId(), relation.getLicensePlateNumber()); - logger.info("后管解除绑定用户：{} 的车牌号：{}", relation.getMemberId(), relation.getPhoneNumber()); + logger.info("后管解除绑定用户：{} 的车牌号：{}", relation.getMemberId(), relation.getLicensePlateNumber()); return toAjax(i); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java index af56d8f2a..b6899ad45 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java @@ -1,7 +1,9 @@ package com.jsowell.pile.service.impl; import java.util.List; +import java.util.Locale; +import com.jsowell.common.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; @@ -65,6 +67,10 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR @Override public int updatePlateNumber(MemberPlateNumberRelation memberPlateNumberRelation) { + if (StringUtils.isNotBlank(memberPlateNumberRelation.getLicensePlateNumber())) { + String plateNumber = memberPlateNumberRelation.getLicensePlateNumber().toUpperCase(Locale.ROOT); + memberPlateNumberRelation.setLicensePlateNumber(plateNumber); + } return memberPlateNumberRelationMapper.updatePlateNumber(memberPlateNumberRelation); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml index 6332757d3..056ab8180 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -91,7 +91,7 @@ - update set license_plate_number = #{licensePlateNumber,jdbcType=VARCHAR} + update member_plate_number_relation set license_plate_number = #{licensePlateNumber,jdbcType=VARCHAR} where member_id = #{memberId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/jsowell-ui/src/views/member/info/detail.vue b/jsowell-ui/src/views/member/info/detail.vue index b3893ef77..0ae194dcd 100644 --- a/jsowell-ui/src/views/member/info/detail.vue +++ b/jsowell-ui/src/views/member/info/detail.vue @@ -364,10 +364,15 @@ export default { }, /** 提交按钮 */ submitForm() { + if (!this.checkPlateNumber(this.form.plateNumber)) { + this.$message('请输入正确的车牌号码'); + return; + } const param = { memberId: this.memberId, - licensePlateNumber: this.form + licensePlateNumber: this.form.plateNumber } + console.log("form:", this.form); this.$refs['form'].validate((valid) => { updatePlateNumber(param).then((response) => { this.$modal.msgSuccess('修改成功') @@ -447,6 +452,11 @@ export default { this.memberTransactionTotal = response.total; }) }, + // 车牌号校验 + checkPlateNumber (plateNumber) { + const re = /[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/; + return plateNumber.search(re) !== -1; + }, } };