bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备接入联调

This commit is contained in:
mashuai 2024-09-20 14:47:57 +08:00
parent 56b77d83f0
commit eb7930d996
3 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbBdRecordController.java
View File

@ -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<TbBdDeviceRecord> list = tbBdRecordService.getById(id);
return getDataTable(list);
}
@GetMapping("/list")
public AjaxResult queryByPage(TbBdRecord tbBdRecord) {
startPage();

8
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbBdRecordService.java
View File

@ -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<TbBdDeviceRecord> getById(Long id);
}

33
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbBdRecordServiceImpl.java
View File

@ -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<TbBdDeviceRecord> 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<TbBdDeviceRecord> getById(Long id) {
//查询设备绑定记录
TbBdDeviceRecord record = new TbBdDeviceRecord();
record.setRecordId(id);
List<TbBdDeviceRecord> list = tbBdDeviceRecordMapper.getAll(record);
if (CollectionUtils.isNotEmpty(list)) {
for (TbBdDeviceRecord deviceRecord : list) {
//对内层手机号进行解密处理
deviceRecord.setDevUserPhone(Sm4Utils.decode(deviceRecord.getDevUserPhone()));
}
}
return list;
}
}