Merge remote-tracking branch 'origin/master'

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

@@ -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);
 }

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

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

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

@@ -78,7 +78,18 @@
     where id = #{id}
   </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <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
     set del_flag = 1

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

@@ -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