diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java index a47f510..ec9b50a 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java @@ -1,9 +1,11 @@ package com.bonus.base.controller; +import com.bonus.base.domain.TbBdDeviceRecord; import com.bonus.base.domain.TbBdRecord; import com.bonus.base.service.TbBdRecordService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +36,16 @@ public class TbBdRecordController extends BaseController { return success(tbBdRecordService.selectByPrimaryKey(id)); } + /** + * 通过主键查询单条内部数据 + */ + @GetMapping("/getInner/{id}") + public TableDataInfo getById(@PathVariable("id") Long id) { + startPage(); + List list = tbBdRecordService.getById(id); + return getDataTable(list); + } + @GetMapping("/list") public AjaxResult queryByPage(TbBdRecord tbBdRecord) { startPage(); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdRecordService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdRecordService.java index 0dd75d6..12c094e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdRecordService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdRecordService.java @@ -1,5 +1,6 @@ package com.bonus.base.service; +import com.bonus.base.domain.TbBdDeviceRecord; import com.bonus.base.domain.TbBdRecord; import com.bonus.common.core.web.domain.AjaxResult; @@ -61,4 +62,11 @@ public interface TbBdRecordService { * @return */ AjaxResult approve(TbBdRecord tbBdRecord); + + /** + * 通过主键查询单条内部数据 + * @param id + * @return + */ + List getById(Long id); } 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 1360987..40f48fb 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 @@ -97,20 +97,9 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{ @Override public TbBdRecord selectByPrimaryKey(Long id) { TbBdRecord tbBdRecord = tbBdRecordMapper.selectByPrimaryKey(id); - if (tbBdRecord != null) { + if (tbBdRecord != null && tbBdRecord.getRelPhone() != null) { //对外层手机号进行解密处理 tbBdRecord.setRelPhone(Sm4Utils.decode(tbBdRecord.getRelPhone())); - //查询设备绑定记录 - TbBdDeviceRecord record = new TbBdDeviceRecord(); - record.setRecordId(id); - List list = tbBdDeviceRecordMapper.getAll(record); - if (CollectionUtils.isNotEmpty(list)) { - for (TbBdDeviceRecord deviceRecord : list) { - //对内层手机号进行解密处理 - deviceRecord.setDevUserPhone(Sm4Utils.decode(deviceRecord.getDevUserPhone())); - } - tbBdRecord.setRecordList(list); - } } return tbBdRecord; } @@ -204,4 +193,24 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{ } return AjaxResult.error("审核失败,请联系管理员"); } + + /** + * 通过主键查询单条内部数据 + * @param id + * @return + */ + @Override + public List getById(Long id) { + //查询设备绑定记录 + TbBdDeviceRecord record = new TbBdDeviceRecord(); + record.setRecordId(id); + List list = tbBdDeviceRecordMapper.getAll(record); + if (CollectionUtils.isNotEmpty(list)) { + for (TbBdDeviceRecord deviceRecord : list) { + //对内层手机号进行解密处理 + deviceRecord.setDevUserPhone(Sm4Utils.decode(deviceRecord.getDevUserPhone())); + } + } + return list; + } }