From 7a907c1f181f18c3686866deff7db9983d0e9702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=AB=8B=E6=96=B0?= Date: Wed, 24 Jul 2024 13:13:26 +0800 Subject: [PATCH] aaa --- server/app.js | 4 +- server/comman/frpclinet.js | 8 +- server/comman/getliuliang.js | 54 ++++++++++++++ server/comman/initdb.js | 27 +++++++ server/comman/tstws.js | 5 +- server/router/devinfo.js | 2 + server/router_handler/devinof_handle.js | 90 ++++++++++++++++++++-- ui2/index.html | 2 +- ui2/package-lock.json | 6 ++ ui2/package.json | 1 + ui2/src/App.vue | 59 ++++++++++++++- ui2/src/components/devinfoMain.vue | 18 +++-- ui2/src/components/devinfoshow.vue | 67 +++++++++-------- ui2/src/components/devinofgrid.vue | 81 +++++++++++++++++++- ui2/src/components/modar/setUserinfo.vue | 95 +++++++++++++++++++++++- ui2/src/eventBus.js | 5 ++ ui2/src/main.js | 4 +- ui2/src/main.ts | 15 ---- ui2/tsconfig.app.json | 2 +- ui2/vite.config.ts | 1 + 20 files changed, 475 insertions(+), 71 deletions(-) create mode 100644 server/comman/getliuliang.js create mode 100644 server/comman/initdb.js delete mode 100644 ui2/src/main.ts diff --git a/server/app.js b/server/app.js index 2448a49..5a5dc7c 100644 --- a/server/app.js +++ b/server/app.js @@ -65,7 +65,7 @@ app.listen(1000, function () { const schedule = require('node-schedule'); const taskforupdate=require('./comman/frpclinet') - +const getliuliang=require('./comman/getliuliang') const scheduleCronstyle = ()=>{ @@ -73,7 +73,9 @@ const scheduleCronstyle = ()=>{ schedule.scheduleJob('* 30 * * * *',()=>{ console.log('scheduleCronstyle:' + new Date()); taskforupdate.getfrpserver(); + getliuliang.updatasimdb(); }); } taskforupdate.getfrpserver(); + getliuliang.updatasimdb();; scheduleCronstyle(); \ No newline at end of file diff --git a/server/comman/frpclinet.js b/server/comman/frpclinet.js index 5d04700..3abc15d 100644 --- a/server/comman/frpclinet.js +++ b/server/comman/frpclinet.js @@ -123,7 +123,7 @@ async function getfrpserver() if(aaa[i].name.endsWith('_data')) { - console.log(aaa[i]) + // console.log(aaa[i]) var data=aaa[i] //console.log(aaa[i].name) //去除后缀 @@ -139,7 +139,7 @@ async function getfrpserver() if (data.name=="TowerIS2_2006_data") { //将data.nameup 从devlistname中删除 - console.log("delete TowerIS2_2006_data") + //console.log("delete TowerIS2_2006_data") } @@ -149,8 +149,8 @@ async function getfrpserver() //将data.nameup 从devlistname中删除 let index=devlistname.indexOf(data.nameup) devlistname.splice(index,1) - console.log("delete "+data.nameup) - console.log(devlistname); + // console.log("delete "+data.nameup) + // console.log(devlistname); } diff --git a/server/comman/getliuliang.js b/server/comman/getliuliang.js new file mode 100644 index 0000000..00020eb --- /dev/null +++ b/server/comman/getliuliang.js @@ -0,0 +1,54 @@ +const axios = require('axios'); +const herader = { + 'Content-Type': 'application/json', + 'Uuid':"5e74228e138c4da891f9d49e198ed5b6" +} +const db=require("../comman/db") +let query = {"msisdn":"1441026718896","pageSize":10,"currentPage":1} +// testgetliuliang(); + +async function testgetliuliang(){ + let resulat=await getliuliang(query); + console.log(resulat); + +} + +async function getsiminfobymsisdn(msisdn){ + let query = {"msisdn":msisdn,"pageSize":10,"currentPage":1} + let resulat=await getliuliang(query); + return resulat; + +} +exports.updatasimdb=updatasimdb; +const initdb=require("../comman/initdb") +async function updatasimdb(){ + + initdb.initdb(); + let sql="select * from devuser where 1" + let result=await db.queryacy(sql); + for (let i = 0; i < result.length; i++) { + let siminfo=await getsiminfobymsisdn(result[i].simnumber); + // console.log(siminfo); + if(siminfo.length>0){ + simtotal=siminfo[0].periodCanUsage + simused=siminfo[0].hasUseRate + simdateline=siminfo[0].exitTime + //更新simtotal和 simused simdateline + sql="update devuser set simtotal='"+simtotal+"',simused='"+simused+"',simdateline='"+simdateline+"' where autoid="+result[i].autoid; + + await db.queryacy(sql); + } + } + +} + + + + +async function getliuliang(query){ + let result=await axios.post('https://api.wl1688.net/client/card/findMyPage', query, { headers: herader }); + // console.log(result.data.data.list); + return result.data.data.list; + +} + diff --git a/server/comman/initdb.js b/server/comman/initdb.js new file mode 100644 index 0000000..0c5d8e0 --- /dev/null +++ b/server/comman/initdb.js @@ -0,0 +1,27 @@ +const db=require("../comman/db") + +let sql="CREATE TABLE IF NOT EXISTS `remotemqtt`.`devuser` (\ + `autoid` INT NOT NULL AUTO_INCREMENT,\ + `devid` INT NOT NULL,\ + `devname` VARCHAR(255) NOT NULL,\ + `simnumber` VARCHAR(20) NOT NULL,\ + `simtotal` INT NULL,\ + `simused` INT NULL,\ + `simdateline` DATE NULL,\ + `devusername` TEXT NULL,\ + `beizhu` TEXT NULL,\ + PRIMARY KEY (`autoid`)\ +) ENGINE = InnoDB;\ +" + +async function initdb(){ + db.query(sql,(err)=>{ + if(err){ + console.log(err); + } + else{ + console.log("create devuser success"); + } + }) +} +exports.initdb=initdb; \ No newline at end of file diff --git a/server/comman/tstws.js b/server/comman/tstws.js index a09f138..fd2680a 100644 --- a/server/comman/tstws.js +++ b/server/comman/tstws.js @@ -38,7 +38,10 @@ async function sendMessageAndWaitForResponse(addres, message) { } async function runinws( message,addres){ let aa=await sendMessageAndWaitForResponse(addres,message) - + if(typeof aa[0]!="array"||aa.length==0) + { + aa=[Buffer.from("error")] + } return aa // console.log(aa[1].toString()) diff --git a/server/router/devinfo.js b/server/router/devinfo.js index a16255c..286bfc6 100644 --- a/server/router/devinfo.js +++ b/server/router/devinfo.js @@ -3,4 +3,6 @@ var router = express.Router(); const devinfoHandler = require('../router_handler/devinof_handle') router.get('/getfilelistinfo', devinfoHandler.getfilelistinfo) +router.post('/getdevuserinfo', devinfoHandler.getDevUserinfo) +router.post('/setdevuserinfo', devinfoHandler.setDevUserinfo) module.exports = router; \ No newline at end of file diff --git a/server/router_handler/devinof_handle.js b/server/router_handler/devinof_handle.js index ad3ed16..e7406f5 100644 --- a/server/router_handler/devinof_handle.js +++ b/server/router_handler/devinof_handle.js @@ -1,9 +1,89 @@ -const db=require("../comman/db") +const { updateLocale } = require("moment"); +const db = require("../comman/db") -exports.getfilelistinfo=(req, res) => { - sql='SELECT d.*, i.last_online FROM filebrowerinfo d JOIN frpinfo i ON d.name = i.id;' - db.query(sql,(err,result)=>{ +exports.getfilelistinfo = (req, res) => { + sql = 'SELECT d.*, i.last_online FROM filebrowerinfo d JOIN frpinfo i ON d.name = i.id;' + db.query(sql, (err, result) => { res.send(result); }) -} \ No newline at end of file +} + +exports.getDevUserinfo = (req, res) => { + let devid = req.body.devid; + sql = 'SELECT * FROM devuser where devid=' + devid + ';' + + db.query(sql, (err, result) => { + if (err || result.length == 0) { + // console.log(err); + let message = { "devid": devid }; + //去filebrowerinfo查询name + let sql = 'SELECT name FROM filebrowerinfo where autoid=' + devid + ';' + db.query(sql, (err, result) => { + if (err || result.length == 0) { + console.log(err); + message.devname = "未知"; + res.send(message); + + return; + } + + message.devname = result[0].name; + res.send([message]); + }) + + + + }else + { + res.send(result); + } + + + + }) + +} +exports.setDevUserinfo = (req, res) => { + let data=req.body + let devid = data.devid; + //先查询是否存在 + let sql = 'SELECT * FROM devuser where devid=' + devid + ';' + db.query(sql, (err, result) => { + if (err || result.length == 0) { + //不存在则插入 + insertDevUser(data, res); + } else { + //存在则更新 + updateDevUser(data, res); + } + }) + + + + +} +function insertDevUser(data,res) +{ + let sql = 'INSERT INTO devuser SET ?' + db.query(sql, data, (err, result) => { + if (err) { + // console.log(err); + res.send({ "status": "error" }); + } else { + res.send({ "status": "success" }); + } + }) +} +function updateDevUser(data,res) +{ + let sql = 'UPDATE devuser SET ? WHERE devid = ?' + db.query(sql, [data, data.devid], (err, result) => { + if (err) { + // console.log(err); + res.send({ "status": "error" }); + } else { + res.send({ "status": "success" }); + } + }) +} diff --git a/ui2/index.html b/ui2/index.html index dde16aa..2e087ad 100644 --- a/ui2/index.html +++ b/ui2/index.html @@ -8,6 +8,6 @@
- + diff --git a/ui2/package-lock.json b/ui2/package-lock.json index b9c7441..8fde691 100644 --- a/ui2/package-lock.json +++ b/ui2/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "axios": "^1.7.2", + "mitt": "^3.0.1", "vue": "^3.4.31" }, "devDependencies": { @@ -1081,6 +1082,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "node_modules/muggle-string": { "version": "0.4.1", "resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.4.1.tgz", diff --git a/ui2/package.json b/ui2/package.json index 29172ad..0682a41 100644 --- a/ui2/package.json +++ b/ui2/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "axios": "^1.7.2", + "mitt": "^3.0.1", "vue": "^3.4.31" }, "devDependencies": { diff --git a/ui2/src/App.vue b/ui2/src/App.vue index d78a317..1d4a9d7 100644 --- a/ui2/src/App.vue +++ b/ui2/src/App.vue @@ -1,6 +1,54 @@ - \ No newline at end of file + diff --git a/ui2/src/components/devinfoshow.vue b/ui2/src/components/devinfoshow.vue index c0191d4..c4aa0ff 100644 --- a/ui2/src/components/devinfoshow.vue +++ b/ui2/src/components/devinfoshow.vue @@ -1,7 +1,7 @@ @@ -114,4 +123,4 @@ h1 { width: 100%; } - \ No newline at end of file + diff --git a/ui2/src/components/devinofgrid.vue b/ui2/src/components/devinofgrid.vue index 9c011bc..454807b 100644 --- a/ui2/src/components/devinofgrid.vue +++ b/ui2/src/components/devinofgrid.vue @@ -1,11 +1,86 @@ - - + + + diff --git a/ui2/src/components/modar/setUserinfo.vue b/ui2/src/components/modar/setUserinfo.vue index 85af715..7232fa9 100644 --- a/ui2/src/components/modar/setUserinfo.vue +++ b/ui2/src/components/modar/setUserinfo.vue @@ -1,9 +1,102 @@ -