接口联调

bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java

@@ -47,6 +47,12 @@ public class TbDevAttribute implements Serializable {
     @ApiModelProperty(value="设备名称")
     private String devName;
 
+    /**
+     * 设备编码
+     */
+    @ApiModelProperty(value="设备编码")
+    private String devCode;
+
     /**
     * 检测值
     */

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

@@ -39,9 +39,11 @@
 
     <select id="getDevAttributeLatestInfoById" resultType="com.bonus.base.domain.TbDevAttribute">
         select
-        tddr.dev_id as devId,tddr.jc_name as jcName,tddr.jc_value as jcValue,tddr.jc_unit as jcUnit,
+            tddr.dev_id as devId, t2.dev_name as devName,t2.dev_code as devCode,tddr.jc_name as jcName,tddr.jc_value as jcValue,tddr.jc_unit as jcUnit,
             tddr.is_warn as isWarn,tddr.jc_time as jcTime
         from tb_dev_attribute tddr
+            LEFT JOIN tb_device t1 on tddr.dev_id = t1.id
+            LEFT JOIN tb_bd_device_record t2 on t1.bd_id = t2.id
         where tddr.dev_id = #{devId}
     </select>
 
@@ -70,7 +72,8 @@
         LEFT JOIN tb_device device ON device.id = tddr.dev_id
         LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
         WHERE
-        tddr.create_time >= DATE_SUB(NOW(), INTERVAL 1 DAY)
+        tddr.create_time >= CURDATE()
+        AND tddr.create_time &lt; CURDATE() + INTERVAL 1 DAY
         AND tbdr.pro_id = #{proId} AND tddr.dev_type IN (117, 118)
         ORDER BY
         tddr.create_time DESC
@@ -149,8 +152,9 @@
         LEFT JOIN tb_device device ON device.id = tddr.dev_id
         LEFT JOIN tb_bd_device_record tbdr ON tbdr.id = device.bd_id
         WHERE
-        tddr.create_time >= DATE_SUB(NOW(), INTERVAL 1 DAY)
-        AND tbdr.pro_id = #{proId} AND tddr.dev_type = 'limited'
+        tddr.create_time >= CURDATE()
+        AND tddr.create_time &lt; CURDATE() + INTERVAL 1 DAY
+        AND tbdr.pro_id = #{proId} AND tddr.dev_type = 119
         ORDER BY
         tddr.create_time DESC
     </select>