From 33c2058d2ce2a3c64b582742efca48ae94f1c95a Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 19 Sep 2024 13:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbBdDeviceRecordController.java | 2 +- .../java/com/bonus/base/domain/TbBdRecord.java | 9 ++++++++- .../service/impl/TbBdRecordServiceImpl.java | 8 +++++++- .../resources/mapper/base/TbBdRecordMapper.xml | 18 +++++++++++------- .../resources/mapper/base/TbProPowerMapper.xml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java index 106646f..311b75b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdDeviceRecordController.java @@ -52,7 +52,7 @@ public class TbBdDeviceRecordController extends BaseController { * @param tbBdDeviceVo * @return */ - @GetMapping("/DeviceList") + @GetMapping("/getDeviceList") public TableDataInfo getDeviceList(TbBdDeviceVo tbBdDeviceVo) { startPage(); List list = tbBdDeviceRecordService.getDeviceList(tbBdDeviceVo); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java index f7c6e5c..07d34d1 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java @@ -116,13 +116,20 @@ public class TbBdRecord implements Serializable { /** * 审核人 */ - @ApiModelProperty(value="审核人") + @ApiModelProperty(value="审核人id") private Long auditUser; + /** + * 审核人 + */ + @ApiModelProperty(value="审核人姓名") + private String auditUserName; + /** * 审核时间 */ @ApiModelProperty(value="审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date auditTime; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java index 967eed9..77eeb26 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.base.service.impl; +import cn.hutool.core.util.PhoneUtil; import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.base.config.ExceptionEnum; import com.bonus.base.domain.TbBdDeviceRecord; @@ -16,7 +17,6 @@ import com.bonus.base.domain.TbBdRecord; import java.util.Date; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import com.bonus.base.mapper.TbBdRecordMapper; @@ -75,6 +75,9 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{ deviceRecord.setRecordId(record.getId()); deviceRecord.setProId(record.getProId()); if (StringUtils.isNotBlank(deviceRecord.getDevUserPhone())) { + if (!PhoneUtil.isMobile(deviceRecord.getDevUserPhone())) { + return AjaxResult.error(ExceptionEnum.INVALID_PHONE_NUMBER_FORMAT.getCode(), ExceptionEnum.INVALID_PHONE_NUMBER_FORMAT.getMsg()); + } deviceRecord.setDevUserPhone(Sm4Utils.encode(deviceRecord.getDevUserPhone())); } //根据设备名称或编码唯一校验 @@ -156,6 +159,9 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{ deviceRecord.setRecordId(record.getId()); deviceRecord.setProId(record.getProId()); if (StringUtils.isNotBlank(deviceRecord.getDevUserPhone())) { + if (!PhoneUtil.isMobile(deviceRecord.getDevUserPhone())) { + return AjaxResult.error(ExceptionEnum.INVALID_PHONE_NUMBER_FORMAT.getCode(), ExceptionEnum.INVALID_PHONE_NUMBER_FORMAT.getMsg()); + } deviceRecord.setDevUserPhone(Sm4Utils.encode(deviceRecord.getDevUserPhone())); } result += tbBdDeviceRecordMapper.insertSelective(deviceRecord); diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml index fae735b..13d415f 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml @@ -21,18 +21,12 @@ + id, depart_id, depart_name, pro_id, pro_name, rel_user, rel_phone, del_flag, audit_status, remarks, create_time, create_user, update_time, update_user, audit_user, audit_time - + + update tb_bd_record diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml index 811a91f..1d8bc06 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbProPowerMapper.xml @@ -8,7 +8,7 @@ from tb_pro_power tb where tb.del_flag = '0' - and tb.pro_id = #{proId} + and tb.pro_id = #{id} and tb.gt_name like concat('%',#{gtName},'%')