Commit 68894e4272001163f49125bd5c63cc360a9d4836

Authored by 房远帅
1 parent ccffaab8

鑫米兰:设备属性上报

... ... @@ -40,9 +40,9 @@ ks:
40 40 WHEN de.id = '77c0bf22-29c6-11f1-926f-2f3182abc65f' THEN '飞针机车间'
41 41 WHEN de.id = '77c0bf23-29c6-11f1-926f-2f3182abc65f' THEN '蚀刻生产线'
42 42 ELSE '导电膜生产线' END AS sn,
43   - tkl1.dbl_v AS Ep,
44   - tkl10.dbl_v AS Ua,
45   - tkl16.dbl_v AS Ia
  43 + COALESCE(tkl1.dbl_v, CAST(tkl1.long_v AS DOUBLE PRECISION)) AS Ep,
  44 + COALESCE(tkl1.dbl_v, CAST(tkl1.long_v AS DOUBLE PRECISION)) AS Ua,
  45 + COALESCE(tkl1.dbl_v, CAST(tkl1.long_v AS DOUBLE PRECISION)) AS Ia
46 46 FROM
47 47 device de
48 48 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
... ... @@ -79,16 +79,18 @@ FROM
79 79 AND tkl16.KEY = 79
80 80 WHERE
81 81 de.organization_id = '1697500a-dc11-45cc-88f5-2ad47472a9bb'
82   - AND de.device_profile_id = 'c2401630-ffec-11f0-926f-2f3182abc65f'
83   - AND de.id IN ('9d8539a0-2f27-11f1-926f-2f3182abc65f', 'bb1cfba0-2be5-11f1-926f-2f3182abc65f', 'bb1cd491-2be5-11f1-926f-2f3182abc65f', 'bb1cd490-2be5-11f1-926f-2f3182abc65f', '77c0bf22-29c6-11f1-926f-2f3182abc65f', '77c0bf23-29c6-11f1-926f-2f3182abc65f')"
  82 + AND de.device_profile_id = 'de36b0f0-9acf-11f1-91f1-1bded40a486e'
  83 + AND de.id IN ('9d8539a0-2f27-11f1-926f-2f3182abc65f', 'bb1cfba0-2be5-11f1-926f-2f3182abc65f',
  84 + 'bb1cd491-2be5-11f1-926f-2f3182abc65f', 'bb1cd490-2be5-11f1-926f-2f3182abc65f',
  85 + '77c0bf22-29c6-11f1-926f-2f3182abc65f', '77c0bf23-29c6-11f1-926f-2f3182abc65f')"
84 86
85 87 selectSql1: "SELECT
86 88 CASE
87 89 WHEN de.id = '6775ad30-ffee-11f0-926f-2f3182abc65f' THEN '1号水表'
88 90 WHEN de.id = '6775d440-ffee-11f0-926f-2f3182abc65f' THEN '2号水表'
89 91 ELSE '其他' END AS sn,
90   - tkl1.dbl_v AS zll,
91   - tkl2.dbl_v AS ssll
  92 + COALESCE(tkl1.dbl_v, CAST(tkl1.long_v AS DOUBLE PRECISION)) AS zll,
  93 + COALESCE(tkl2.dbl_v, CAST(tkl2.long_v AS DOUBLE PRECISION)) AS ssll
92 94 FROM
93 95 device de
94 96 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
... ...