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

bug优化

This commit is contained in:
mashuai 2024-10-11 11:14:26 +08:00
parent b0602caadc
commit 75317676b1
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbBdRecordMapper.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.mapper;
import com.bonus.base.domain.TbBdDeviceRecord;
import com.bonus.base.domain.TbBdRecord;
import org.apache.ibatis.annotations.Mapper;
@ -24,4 +25,6 @@ public interface TbBdRecordMapper {
List<TbBdRecord> getAll(TbBdRecord record);
TbBdRecord selectByName(TbBdRecord record);
List<TbBdDeviceRecord> getList(Long id);
}

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

@ -202,9 +202,7 @@ public class TbBdRecordServiceImpl implements TbBdRecordService{
@Override
public List<TbBdDeviceRecord> getById(Long id) {
//查询设备绑定记录
TbBdDeviceRecord record = new TbBdDeviceRecord();
record.setRecordId(id);
List<TbBdDeviceRecord> list = tbBdDeviceRecordMapper.getAll(record);
List<TbBdDeviceRecord> list = tbBdRecordMapper.getList(id);
if (CollectionUtils.isNotEmpty(list)) {
for (TbBdDeviceRecord deviceRecord : list) {
//对内层手机号进行解密处理

11
bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml
View File

@ -78,6 +78,17 @@
where id = #{id}
</select>
<select id="getList" resultType="com.bonus.base.domain.TbBdDeviceRecord">
select
tbdr.id as id, tbdr.record_id as recordId, tbdr.dev_name as devName, tbdr.dev_code as devCode, tbdr.unit_name as unitName, tbdr.area_name as areaName,
tbdr.dev_user as devUser, tbdr.dev_user_phone as devUserPhone,
tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName
from tb_bd_device_record tbdr
left join tb_bd_record tbr on tbdr.record_id = tbr.id
left join sys_user su on tbr.audit_user = su.user_id
where tbdr.record_id = #{id}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
update tb_bd_record

5
bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml
View File

@ -187,7 +187,7 @@
LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
WHERE
tddr.is_warn = '1'
AND tbdr.pro_id = #{proId} AND tddr.dev_type IN ('angle','pull')
AND tbdr.pro_id = #{proId} AND tddr.dev_type IN (117, 118)
ORDER BY
tddr.create_time DESC
limit 10
@ -220,7 +220,7 @@
LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
WHERE
tddr.is_warn = '1'
AND tbdr.pro_id = #{proId} AND tddr.dev_type = 'limited'
AND tbdr.pro_id = #{proId} AND tddr.dev_type = 119
ORDER BY
tddr.create_time DESC
limit 10
@ -265,7 +265,6 @@
tb_dev_data_record AS tddr
WHERE
tddr.dev_id = #{devId}
AND tddr.dev_type IN ('angle','pull')
AND (
SELECT COUNT(*)
FROM tb_dev_data_record AS sub