Skip to content

Commit

Permalink
press page added
Browse files Browse the repository at this point in the history
  • Loading branch information
@CSedat
CSedat committed Oct 19, 2022
1 parent 541e963 commit fb8424c
Show file tree
Hide file tree
Showing 5 changed files with 442 additions and 4 deletions.
1 change: 1 addition & 0 deletions server/ambardata/10-2022/19-10-2022.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"time":"9:34 19-10-2022","status":40,"seviye":95},{"time":"9:35 19-10-2022","status":40,"seviye":95},{"time":"9:36 19-10-2022","status":40,"seviye":95},{"time":"9:37 19-10-2022","status":40,"seviye":95},{"time":"9:38 19-10-2022","status":40,"seviye":95},{"time":"9:39 19-10-2022","status":40,"seviye":95},{"time":"9:40 19-10-2022","status":40,"seviye":95},{"time":"9:41 19-10-2022","status":40,"seviye":95},{"time":"9:42 19-10-2022","status":40,"seviye":95},{"time":"9:44 19-10-2022","status":40,"seviye":95},{"time":"9:45 19-10-2022","status":40,"seviye":95},{"time":"9:46 19-10-2022","status":40,"seviye":95},{"time":"9:48 19-10-2022","status":40,"seviye":95},{"time":"9:49 19-10-2022","status":40,"seviye":95},{"time":"9:50 19-10-2022","status":40,"seviye":95},{"time":"9:51 19-10-2022","status":40,"seviye":95},{"time":"9:52 19-10-2022","status":40,"seviye":95},{"time":"9:53 19-10-2022","status":40,"seviye":95},{"time":"9:54 19-10-2022","status":40,"seviye":95},{"time":"9:55 19-10-2022","status":40,"seviye":95},{"time":"9:56 19-10-2022","status":40,"seviye":95},{"time":"9:57 19-10-2022","status":40,"seviye":95},{"time":"9:58 19-10-2022","status":40,"seviye":95},{"time":"9:59 19-10-2022","status":40,"seviye":95},{"time":"10:0 19-10-2022","status":40,"seviye":95},{"time":"10:1 19-10-2022","status":40,"seviye":95},{"time":"10:2 19-10-2022","status":40,"seviye":95},{"time":"10:3 19-10-2022","status":40,"seviye":95},{"time":"10:4 19-10-2022","status":40,"seviye":95},{"time":"10:5 19-10-2022","status":40,"seviye":95},{"time":"10:6 19-10-2022","status":40,"seviye":95},{"time":"10:7 19-10-2022","status":40,"seviye":95},{"time":"10:9 19-10-2022","status":40,"seviye":95},{"time":"10:10 19-10-2022","status":40,"seviye":95},{"time":"10:12 19-10-2022","status":40,"seviye":95},{"time":"10:13 19-10-2022","status":40,"seviye":95},{"time":"10:14 19-10-2022","status":40,"seviye":95},{"time":"10:15 19-10-2022","status":40,"seviye":95},{"time":"10:16 19-10-2022","status":40,"seviye":95},{"time":"10:17 19-10-2022","status":40,"seviye":95},{"time":"10:22 19-10-2022","status":40,"seviye":95},{"time":"10:23 19-10-2022","status":40,"seviye":95},{"time":"10:24 19-10-2022","status":40,"seviye":95},{"time":"10:26 19-10-2022","status":40,"seviye":95},{"time":"10:27 19-10-2022","status":40,"seviye":95},{"time":"10:28 19-10-2022","status":40,"seviye":95},{"time":"10:29 19-10-2022","status":40,"seviye":95},{"time":"10:30 19-10-2022","status":40,"seviye":95},{"time":"10:31 19-10-2022","status":40,"seviye":95},{"time":"10:32 19-10-2022","status":40,"seviye":95},{"time":"10:33 19-10-2022","status":40,"seviye":95},{"time":"10:34 19-10-2022","status":40,"seviye":95},{"time":"10:35 19-10-2022","status":40,"seviye":95},{"time":"10:36 19-10-2022","status":40,"seviye":95},{"time":"10:37 19-10-2022","status":40,"seviye":95},{"time":"10:38 19-10-2022","status":40,"seviye":95},{"time":"10:39 19-10-2022","status":40,"seviye":95},{"time":"10:40 19-10-2022","status":40,"seviye":95},{"time":"10:41 19-10-2022","status":40,"seviye":95},{"time":"10:42 19-10-2022","status":40,"seviye":95},{"time":"10:43 19-10-2022","status":40,"seviye":95},{"time":"10:44 19-10-2022","status":40,"seviye":95},{"time":"10:45 19-10-2022","status":40,"seviye":95},{"time":"10:46 19-10-2022","status":40,"seviye":95},{"time":"10:47 19-10-2022","status":40,"seviye":95},{"time":"10:48 19-10-2022","status":40,"seviye":95},{"time":"10:49 19-10-2022","status":40,"seviye":95},{"time":"10:50 19-10-2022","status":40,"seviye":95},{"time":"10:51 19-10-2022","status":40,"seviye":95},{"time":"10:52 19-10-2022","status":40,"seviye":95},{"time":"10:53 19-10-2022","status":40,"seviye":95},{"time":"10:54 19-10-2022","status":40,"seviye":95},{"time":"10:55 19-10-2022","status":40,"seviye":95},{"time":"10:56 19-10-2022","status":40,"seviye":95},{"time":"10:57 19-10-2022","status":40,"seviye":95},{"time":"10:58 19-10-2022","status":40,"seviye":95},{"time":"10:59 19-10-2022","status":40,"seviye":95},{"time":"11:0 19-10-2022","status":40,"seviye":95},{"time":"11:1 19-10-2022","status":40,"seviye":95},{"time":"11:2 19-10-2022","status":40,"seviye":95},{"time":"11:3 19-10-2022","status":40,"seviye":95},{"time":"11:4 19-10-2022","status":40,"seviye":95},{"time":"11:5 19-10-2022","status":40,"seviye":95},{"time":"11:6 19-10-2022","status":40,"seviye":95},{"time":"11:7 19-10-2022","status":0,"seviye":0},{"time":"11:8 19-10-2022","status":0,"seviye":0},{"time":"11:9 19-10-2022","status":0,"seviye":0},{"time":"11:10 19-10-2022","status":0,"seviye":0},{"time":"11:11 19-10-2022","status":0,"seviye":0},{"time":"11:12 19-10-2022","status":40,"seviye":95},{"time":"11:13 19-10-2022","status":40,"seviye":95},{"time":"11:14 19-10-2022","status":40,"seviye":95},{"time":"11:15 19-10-2022","status":40,"seviye":95},{"time":"11:16 19-10-2022","status":40,"seviye":95},{"time":"11:17 19-10-2022","status":40,"seviye":95},{"time":"11:18 19-10-2022","status":40,"seviye":95},{"time":"11:32 19-10-2022","status":40,"seviye":95},{"time":"11:33 19-10-2022","status":40,"seviye":95},{"time":"11:34 19-10-2022","status":40,"seviye":95}]
1 change: 1 addition & 0 deletions server/pressdata/10-2022/19-10-2022.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:19 19-10-2022","d609":130,"d610":150},{"time":"10:22 19-10-2022","d609":150,"d610":150},{"time":"10:23 19-10-2022","d609":150,"d610":150},{"time":"10:24 19-10-2022","d609":150,"d610":150},{"time":"10:26 19-10-2022","d609":150,"d610":150},{"time":"10:27 19-10-2022","d609":150,"d610":150},{"time":"10:28 19-10-2022","d609":150,"d610":150},{"time":"10:29 19-10-2022","d609":150,"d610":150},{"time":"10:30 19-10-2022","d609":150,"d610":150},{"time":"10:31 19-10-2022","d609":150,"d610":150},{"time":"10:32 19-10-2022","d609":150,"d610":150},{"time":"10:33 19-10-2022","d609":150,"d610":150},{"time":"10:34 19-10-2022","d609":150,"d610":150},{"time":"10:35 19-10-2022","d609":150,"d610":10},{"time":"10:36 19-10-2022","d609":50,"d610":10},{"time":"10:37 19-10-2022","d609":150,"d610":20},{"time":"10:38 19-10-2022","d609":150,"d610":20},{"time":"10:39 19-10-2022","d609":150,"d610":30},{"time":"10:40 19-10-2022","d609":150,"d610":30},{"time":"10:41 19-10-2022","d609":150,"d610":20},{"time":"10:42 19-10-2022","d609":150,"d610":30},{"time":"10:43 19-10-2022","d609":150,"d610":30},{"time":"10:44 19-10-2022","d609":150,"d610":30},{"time":"10:45 19-10-2022","d609":150,"d610":30},{"time":"10:46 19-10-2022","d609":150,"d610":30},{"time":"10:47 19-10-2022","d609":150,"d610":20},{"time":"10:48 19-10-2022","d609":150,"d610":20},{"time":"10:49 19-10-2022","d609":150,"d610":30},{"time":"10:50 19-10-2022","d609":150,"d610":30},{"time":"10:51 19-10-2022","d609":150,"d610":30},{"time":"10:52 19-10-2022","d609":10,"d610":30},{"time":"10:53 19-10-2022","d609":10,"d610":30},{"time":"10:54 19-10-2022","d609":30,"d610":30},{"time":"10:55 19-10-2022","d609":30,"d610":40},{"time":"10:56 19-10-2022","d609":30,"d610":40},{"time":"10:57 19-10-2022","d609":20,"d610":60},{"time":"10:58 19-10-2022","d609":30,"d610":60},{"time":"10:59 19-10-2022","d609":30,"d610":60},{"time":"11:0 19-10-2022","d609":30,"d610":60},{"time":"11:1 19-10-2022","d609":20,"d610":60},{"time":"11:2 19-10-2022","d609":30,"d610":60},{"time":"11:3 19-10-2022","d609":20,"d610":60},{"time":"11:4 19-10-2022","d609":20,"d610":60},{"time":"11:5 19-10-2022","d609":30,"d610":60},{"time":"11:6 19-10-2022","d609":20,"d610":60},{"time":"11:7 19-10-2022","d609":0,"d610":0},{"time":"11:8 19-10-2022","d609":0,"d610":0},{"time":"11:9 19-10-2022","d609":0,"d610":0},{"time":"11:10 19-10-2022","d609":0,"d610":0},{"time":"11:11 19-10-2022","d609":0,"d610":0},{"time":"11:12 19-10-2022","d609":60,"d610":70},{"time":"11:13 19-10-2022","d609":60,"d610":70},{"time":"11:14 19-10-2022","d609":60,"d610":70},{"time":"11:15 19-10-2022","d609":60,"d610":70},{"time":"11:16 19-10-2022","d609":60,"d610":70},{"time":"11:17 19-10-2022","d609":70,"d610":70},{"time":"11:18 19-10-2022","d609":70,"d610":70},{"time":"11:32 19-10-2022","d609":70,"d610":70},{"time":"11:33 19-10-2022","d609":70,"d610":70},{"time":"11:34 19-10-2022","d609":70,"d610":70}]
218 changes: 214 additions & 4 deletions server/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ var plcdata = {
level: 0,
kw: 0,
kwh: 0,
}
},
D609Status: 0,
D610Status: 0,
}


Expand All @@ -67,13 +69,13 @@ const users = [
id: 1,
username: "sedatcapar",
password: "ss1q2w",
roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar']
roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar', 'press']
},
{
id: 2,
username: "tunahansimsek",
password: "Ts159753",
roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar']
roles:['pdc', 'yks', 'slurry', 'kmadde', 'ambar', 'press']
},
{
id: 3,
Expand Down Expand Up @@ -103,7 +105,7 @@ const users = [
id: 7,
username: "kaanuzuner",
password: "ku123456.",
roles:['pdc', 'slurry', 'kmadde']
roles:['pdc', 'slurry', 'kmadde', 'ambar']
},
{
id: 8,
Expand Down Expand Up @@ -211,6 +213,13 @@ app.post('/api/getambardatafromdate', function (req, res) {
});
});

app.post('/api/getpressdatafromdate', function (req, res) {
var date = req.body.date;
var dateFull = req.body.dateFull;
let data = fs.readFileSync(`./pressdata/${date}/${dateFull}.json`);
res.send(data);
});

app.get('/api/saveslurry', function (req, res) {
res.destroy();
const prof = new Promise(function (resolve, reject) {
Expand Down Expand Up @@ -676,6 +685,207 @@ function crusherPLCvaluesReady(err, values) {
plcdata.crusherpdc = {
bc1b_1: parseInt(values.bc1bpdc1.toFixed()),
bc1b_2: parseInt(values.bc1bpdc2.toFixed()),
};
}

var D609_Press = new nodes7;
var D609_Pressvariables = {
status: 'DB150,INT0',
};
D609_Press.initiateConnection({
port: 102,
host: '10.35.17.40',
rack: 0,
slot: 1,
timeout: 30000,
debug: true
}, D609_Pressconnected);
function D609_Pressconnected(err) {
if (typeof (err) !== "undefined") {
console.log(err);
}
D609_Press.setTranslationCB(function (tag) {
return D609_Pressvariables[tag];
});
D609_Press.addItems(['status',]);
D609_Press.readAllItems(D609_PressvaluesReady);
}
function D609_PressvaluesReady(err, values) {
if (err) { console.log('\x1b[31m', `Plc Bağlantısı Yok yada Okunan Değerlerde Hata Var` ,'\x1b[0m'); return }
D609_Press.readAllItems(D609_PressvaluesReady);
plcdata.D609Status = values.status;
}
function Save609PressData() {
fs.readFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, null, function (error, data) {
if (error) { console.log(error); }
var amdata = JSON.parse(data)
let d609status = 0;
let d610status = 0;
switch (plcdata.D609Status) {
case 1:
d609status = 10;
break;
case 2:
d609status = 20
break;
case 3:
d609status = 30
break;
case 4:
d609status = 40
break;
case 5:
d609status = 50
break;
case 6:
d609status = 60
break;
case 7:
d609status = 70
break;
case 8:
d609status = 80
break;
case 9:
d609status = 90
break;
case 10:
d609status = 100
break;
case 11:
d609status = 110
break;
case 12:
d609status = 120
break;
case 13:
d609status = 130
break;
case 14:
d609status = 140
break;
case 15:
d609status = 150
break;
default:
break;
}
switch (plcdata.D610Status) {
case 1:
d610status = 10;
break;
case 2:
d610status = 20
break;
case 3:
d610status = 30
break;
case 4:
d610status = 40
break;
case 5:
d610status = 50
break;
case 6:
d610status = 60
break;
case 7:
d610status = 70
break;
case 8:
d610status = 80
break;
case 9:
d610status = 90
break;
case 10:
d610status = 100
break;
case 11:
d610status = 110
break;
case 12:
d610status = 120
break;
case 13:
d610status = 130
break;
case 14:
d610status = 140
break;
case 15:
d610status = 150
break;
default:
break;
}

amdata.push({
time: GetDate(true),
d609: d609status,
d610: d610status
});
fs.writeFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, JSON.stringify(amdata), err => {
if (err) throw err;
});
});
}

setInterval(() => {
var dir = `./pressdata/${GetFileDate(true)}`;
if (!fs.existsSync(dir)){
fs.mkdirSync(dir, { recursive: true });
console.log('\x1b[32m', `${dir} directory created.` ,'\x1b[0m');
fs.readFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, null, function (error, data) {
if (error) {
fs.appendFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, '[]', err => {
if (err) throw err;
console.log('\x1b[32m', `${GetFileDate()}.json File created.` ,'\x1b[0m');
Save609PressData()
});
}else{
Save609PressData()
}
});
}else{
fs.readFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, null, function (error, data) {
if (error) {
fs.appendFile(`./pressdata/${GetFileDate(true)}/${GetFileDate()}.json`, '[]', err => {
if (err) throw err;
console.log('\x1b[32m', `${GetFileDate()}.json File created.` ,'\x1b[0m');
Save609PressData()
});
}else{
Save609PressData()
}
});
}
} , 60000);

var D610_Press = new nodes7;
var D610_Pressvariables = {
status: 'DB150,INT0',
};
D610_Press.initiateConnection({
port: 102,
host: '10.35.17.50',
rack: 0,
slot: 1,
timeout: 30000,
debug: true
}, D610_Pressconnected);
function D610_Pressconnected(err) {
if (typeof (err) !== "undefined") {
console.log(err);
}
D610_Press.setTranslationCB(function (tag) {
return D610_Pressvariables[tag];
});
D610_Press.addItems(['status',]);
D610_Press.readAllItems(D610_PressvaluesReady);
}
function D610_PressvaluesReady(err, values) {
if (err) { console.log('\x1b[31m', `Plc Bağlantısı Yok yada Okunan Değerlerde Hata Var` ,'\x1b[0m'); return }
D610_Press.readAllItems(D610_PressvaluesReady);
plcdata.D610Status = values.status;
}
11 changes: 11 additions & 0 deletions src/pages/MainPage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import YKSPage from './YKSPage'
import HourlySlurry from './HourlySlurry'
import LabPage from './LabPage'
import AmbarPump from './AmbarPump'
import PressData from './PressData'


function TabPanel(props) {
Expand Down Expand Up @@ -94,6 +95,11 @@ export default function FullWidthTabs() {
<Tab label="Ambar Pompa" key={4} value={4} {...a11yProps(4)} />
: ""
}
{
user?.user?.roles.find(e => e === 'press') ?
<Tab label="Press Kayıt" key={5} value={5} {...a11yProps(5)} />
: ""
}
</Tabs>
</AppBar>
<SwipeableViews
Expand Down Expand Up @@ -130,6 +136,11 @@ export default function FullWidthTabs() {
<AmbarPump />
</div>
</TabPanel>
<TabPanel className=" h-[90.6vh] w-full " value={value} index={5} dir={theme.direction}>
<div className=' text-white h-full'>
<PressData />
</div>
</TabPanel>
</SwipeableViews>
</Box>
</div>
Expand Down
Loading

0 comments on commit fb8424c

Please sign in to comment.