jcnet/webio-node
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
Jay
2017-04-05 15:10:02 +08:00
parent 57a37b047f
commit b684672ad2
5 changed files with 256 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
route/api/wristband.js
+82 -74
View File
@@ -22,14 +22,14 @@ router
}
let arr = req.query;
if(!arr.mac) return n('ERR0000');
if(!arr.devid) return n('ERR0000');
if (!arr.mac) return n('ERR0000');
if (!arr.devid) return n('ERR0000');
let query = "insert into ??.?? values (null, ?, ?,?,?,?,?,?,?,?,?,?,?,?,unix_timestamp())";
let param = [
config.db.db9,
'rawdata',
arr.devid || '',
arr.mac || '',
arr.mac || '',
arr.val2 || '',
arr.val3 || '',
arr.val4 || '',
@@ -43,21 +43,21 @@ router
arr.timestamp || '',
];
res.db.query(query, param, (err, row) => {
if(err) return n('ERR8001');
if (err) return n('ERR8001');
res.api_res = {
record: []
};
let q = "select count(*) as c from ??.?? where `mac` = ?";
let p = [config.db.db9, 'wristband', arr.mac];
res.db.query(q, p, (err, row) => {
let pros = [];
if(!(err || row.length == 0 || row[0].c > 0)){
let q = "insert into ??.?? values (null, ?, '', unix_timestamp(), unix_timestamp())";
let p = [config.db.db9, 'wristband', arr.mac];
pros.push(tool.promiseQuery(res,q,p,'q1'));
}
let pros = [];
if (!(err || row.length == 0 || row[0].c > 0)) {
let q = "insert into ??.?? values (null, ?, '', unix_timestamp(), unix_timestamp())";
let p = [config.db.db9, 'wristband', arr.mac];
pros.push(tool.promiseQuery(res, q, p, 'q1'));
}
let lq = "insert into ??.?? (`mac`, `devid`, `val2`, `val3`, `val4`, `val5`, `val6`, `val7`, `val8`, `val9`, `val10`, `val11`, `timestamp`, `ctime`, `mtime`) values \
let lq = "insert into ??.?? (`mac`, `devid`, `val2`, `val3`, `val4`, `val5`, `val6`, `val7`, `val8`, `val9`, `val10`, `val11`, `timestamp`, `ctime`, `mtime`) values \
(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, unix_timestamp(), unix_timestamp()) ON DUPLICATE KEY \
update \
`devid` = ?, \
@@ -73,46 +73,47 @@ router
`val11` = ?, \
`timestamp` = ?, \
`mtime` = unix_timestamp()";
let lp = [config.db.db9, 'lastdata',
arr.mac,
arr.devid,
arr.val2 || '',
arr.val3 || '',
arr.val4 || '',
arr.val5 || '',
arr.val6 || '',
arr.val7 || '',
arr.val8 || '',
arr.val9 || '',
arr.val10 || '',
arr.val11 || '',
arr.timestamp || '',
arr.devid,
arr.val2 || '',
arr.val3 || '',
arr.val4 || '',
arr.val5 || '',
arr.val6 || '',
arr.val7 || '',
arr.val8 || '',
arr.val9 || '',
arr.val10 || '',
arr.val11 || '',
arr.timestamp || '']
let lp = [config.db.db9, 'lastdata',
arr.mac,
arr.devid,
arr.val2 || '',
arr.val3 || '',
arr.val4 || '',
arr.val5 || '',
arr.val6 || '',
arr.val7 || '',
arr.val8 || '',
arr.val9 || '',
arr.val10 || '',
arr.val11 || '',
arr.timestamp || '',
arr.devid,
arr.val2 || '',
arr.val3 || '',
arr.val4 || '',
arr.val5 || '',
arr.val6 || '',
arr.val7 || '',
arr.val8 || '',
arr.val9 || '',
arr.val10 || '',
arr.val11 || '',
arr.timestamp || ''
]
pros.push(tool.promiseQuery(res,lq,lp,'q2'));
pros.push(tool.promiseQuery(res, lq, lp, 'q2'));
Promise.all(pros)
.then(r => {
n()
})
.catch(err => {
console.log(err);
n();
})
})
// n();
Promise.all(pros)
.then(r => {
n()
})
.catch(err => {
console.log(err);
n();
})
})
// n();
})
})
.post('*', async(req, res, n) => {
@@ -124,27 +125,7 @@ router
}
n();
})
.post('/getstatus', (req,res,n) => {
// let query = "select * from \
// (\
// select xx.`mac`, xx.`val11`, dd.`val2`, dd.`val3`, dd.`val4`, dd.`val5`, dd.`val6`, dd.`val7`, dd.`val8`, dd.`val9`, dd.`val10`, dd.`timestamp`, l.`name` \
// from ??.?? xx \
// left join ??.?? l \
// on l.`serialnumber` = xx.`devid` \
// left join ( \
// select * from (\
// select * from ??.?? \
// where `timestamp` > unix_timestamp() - 20 \
// order by `timestamp` desc \
// ) t1 group by `mac`\
// ) dd \
// on dd.`mac` = xx.`mac`\
// where xx.`timestamp` > unix_timestamp() - 20 \
// order by xx.`val11` desc, xx.`timestamp` desc \
// limit 2147483647\
// ) x \
// group by `mac`";
// let param = [config.db.db9, 'rawdata', config.db.db9, 'location', config.db.db9, 'rawdata']
.post('/getstatus', (req, res, n) => {
let query = "select w.`name`, l.`name` as locname, l2.`name` as last_locname, ll.*\
from ??.?? w\
@@ -163,11 +144,38 @@ router
left join ??.?? l2 \
on \
l2.`serialnumber` = ll.`devid` \
order by w.`uid`";
let param = [config.db.db9, 'wristband', config.db.db9, 'rawdata', config.db.db9, 'lastdata', config.db.db9, 'location', config.db.db9, 'location',];
";
let param = [config.db.db9, 'wristband', config.db.db9, 'rawdata', config.db.db9, 'lastdata', config.db.db9, 'location', config.db.db9, 'location', ];
res.db.query(query, param, (err,row) => {
if(err) return rt.err(res,err,n,'ERR8000');
let sortfield = '';
let sortorder = '';
if (req.body.data && req.body.data.sort) {
if (req.body.data.sort.field) sortfield = req.body.data.sort.field;
if (req.body.data.sort.order) sortorder = req.body.data.sort.order;
}
switch (sortfield) {
case 'mac':
case 'val2':
case 'val3':
case 'val4':
case 'val5':
case 'val6':
case 'val7':
case 'val8':
case 'val9':
case 'val10':
case 'val11':
query += `order by ll.${sortfield} ${sortorder}`;
break;
default:
query += 'order by w.`uid`';
break;
}
res.db.query(query, param, (err, row) => {
if (err) return rt.err(res, err, n, 'ERR8000');
res.api_res = {
record: tool.checkArray(row)