Showing
1 changed file
with
8 additions
and
6 deletions
| ... | ... | @@ -36,7 +36,7 @@ scheduler: |
| 36 | 36 | hsq: |
| 37 | 37 | push: "0 0 0/1 * * ?" |
| 38 | 38 | pj: |
| 39 | - push: "0 0/30 * * * ?" | |
| 39 | + push: "0 0/10 * * * ?" | |
| 40 | 40 | |
| 41 | 41 | hn: |
| 42 | 42 | third: |
| ... | ... | @@ -88,14 +88,16 @@ pj: |
| 88 | 88 | selectSql: "SELECT |
| 89 | 89 | tko.name AS entName, |
| 90 | 90 | de.name AS deviceName, |
| 91 | - de.sn AS deviceCode, | |
| 91 | + dc.credentials_id AS deviceCode, | |
| 92 | 92 | tkl.long_v AS status |
| 93 | 93 | FROM |
| 94 | 94 | device de |
| 95 | - LEFT JOIN tk_organization tko ON de.organization_id = tko.id | |
| 96 | - LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id AND tkl.key = 61 | |
| 97 | - WHERE de.tenant_id = '0414df80-f01d-11f0-9cb8-e3376d1e7978' | |
| 98 | - AND de.device_profile_id = '0418b010-f01d-11f0-9cb8-e3376d1e7978';" | |
| 95 | + LEFT JOIN tk_organization tko ON de.organization_id = tko.id | |
| 96 | + LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id AND tkl.KEY = 61 | |
| 97 | + LEFT JOIN device_credentials dc on de.id = dc.device_id | |
| 98 | + WHERE | |
| 99 | + de.tenant_id = '0414df80-f01d-11f0-9cb8-e3376d1e7978' | |
| 100 | + AND de.device_profile_id = '0418b010-f01d-11f0-9cb8-e3376d1e7978';" | |
| 99 | 101 | |
| 100 | 102 | sh: |
| 101 | 103 | iot: | ... | ... |