李晓鹤 / iot-scheduler · Commits

Commit f06d2add357df8f4604065bfaeabc2d9006a59fd

Authored by 朱园亮
1 parent b519ea94

同池上报水电能源数据sql修改

Inline Side-by-side
Showing 1 changed file with 13 additions and 28 deletions
... ... @@ -37,53 +37,38 @@ ks:
37 37 tkl1.dbl_v AS Ep,
38 38 tkl2.dbl_v AS Ubc,
39 39 tkl3.dbl_v AS Uc,
40   - tkl4.dbl_v AS P,
41 40 tkl5.dbl_v AS Uab,
42 41 tkl6.dbl_v AS Ib,
43   - tkl7.dbl_v AS Eq,
44 42 tkl8.dbl_v AS F,
45   - tkl9.dbl_v AS Q,
46 43 tkl10.dbl_v AS Ua,
47   - tkl11.dbl_v AS S,
48 44 tkl12.dbl_v AS Ic,
49 45 tkl13.dbl_v AS Ub,
50 46 tkl14.dbl_v AS Uca,
51   - tkl15.dbl_v AS PSum,
52 47 tkl16.dbl_v AS Ia
53 48 FROM
54 49 device de
55 50 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
56   - AND tkl1.key = 64
  51 + AND tkl1.key = 536
57 52 LEFT JOIN ts_kv_latest tkl2 ON de.id = tkl2.entity_id
58   - AND tkl2.key = 65
  53 + AND tkl2.key = 499
59 54 LEFT JOIN ts_kv_latest tkl3 ON de.id = tkl3.entity_id
60   - AND tkl3.key = 66
61   - LEFT JOIN ts_kv_latest tkl4 ON de.id = tkl4.entity_id
62   - AND tkl4.key = 67
  55 + AND tkl3.key = 492
63 56 LEFT JOIN ts_kv_latest tkl5 ON de.id = tkl5.entity_id
64   - AND tkl5.key = 68
  57 + AND tkl5.key = 496
65 58 LEFT JOIN ts_kv_latest tkl6 ON de.id = tkl6.entity_id
66   - AND tkl6.key = 69
67   - LEFT JOIN ts_kv_latest tkl7 ON de.id = tkl7.entity_id
68   - AND tkl7.key = 70
  59 + AND tkl6.key = 495
69 60 LEFT JOIN ts_kv_latest tkl8 ON de.id = tkl8.entity_id
70   - AND tkl8.key = 71
71   - LEFT JOIN ts_kv_latest tkl9 ON de.id = tkl9.entity_id
72   - AND tkl9.key = 72
  61 + AND tkl8.key = 537
73 62 LEFT JOIN ts_kv_latest tkl10 ON de.id = tkl10.entity_id
74   - AND tkl10.key = 73
75   - LEFT JOIN ts_kv_latest tkl11 ON de.id = tkl11.entity_id
76   - AND tkl11.key = 74
  63 + AND tkl10.key = 497
77 64 LEFT JOIN ts_kv_latest tkl12 ON de.id = tkl12.entity_id
78   - AND tkl12.key = 75
  65 + AND tkl12.key = 498
79 66 LEFT JOIN ts_kv_latest tkl13 ON de.id = tkl13.entity_id
80   - AND tkl13.key = 76
  67 + AND tkl13.key = 493
81 68 LEFT JOIN ts_kv_latest tkl14 ON de.id = tkl14.entity_id
82   - AND tkl14.key = 77
83   - LEFT JOIN ts_kv_latest tkl15 ON de.id = tkl15.entity_id
84   - AND tkl15.key = 78
  69 + AND tkl14.key = 494
85 70 LEFT JOIN ts_kv_latest tkl16 ON de.id = tkl16.entity_id
86   - AND tkl16.key = 79
  71 + AND tkl16.key = 489
87 72 WHERE
88 73 de.organization_id='35bcdb94-31ec-4750-9ee9-cc855aa66e17'
89 74 AND de.device_profile_id = '6c1f9650-0298-11f1-9cb8-e3376d1e7978'"
... ... @@ -95,9 +80,9 @@ ks:
95 80 FROM
96 81 device de
97 82 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
98   - AND tkl1.key = 83
  83 + AND tkl1.key = 541
99 84 LEFT JOIN ts_kv_latest tkl2 ON de.id = tkl2.entity_id
100   - AND tkl2.key = 84
  85 + AND tkl2.key = 542
101 86 WHERE
102 87 de.organization_id='35bcdb94-31ec-4750-9ee9-cc855aa66e17'
103 88 AND de.device_profile_id = 'fdf70e30-0272-11f1-9cb8-e3376d1e7978'"
... ...