Teams/sy_hx_pbl_backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/pblbackend

Browse Source
This commit is contained in:
赵正易
2025-01-20 11:40:46 +08:00
parent 01e2395c3f 1aab89865d
commit ff0d483697
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/appsettings.Development.json
View File

@@ -10,8 +10,8 @@
"dbConfigs": [
{
"Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;Port=3306",
//"Conn": "Data Source=10.72.80.161;User ID=root;Password=doantech123;Initial Catalog=pbl_huaxiang_v2;Port=3306",
"Conn": "Data Source=10.72.80.161;User ID=root;Password=doantech123;Initial Catalog=pbl_huaxiang_v2;Port=3306",
"DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
"ConfigId": "0", //多租户唯一标识
"IsAutoCloseConnection": true

2
DOAN.ServiceCore/DoanBackgroundService.cs
View File

@@ -108,7 +108,7 @@ namespace DOAN.ServiceCore
int col = i.BitNum - 1;
// Console.WriteLine($"row={row},col={col},PLCValueByteArray[row]={getPLCValueByteArray.Length}");
// packNum= packNum+( GetInvertedBit(getPLCValueByteArray[row], col) ? 1 : 0);
packNum= packNum+( GetInvertedBit(getPLCValueByteArray[row], col) ? 1 : 0);
//Console.WriteLine($"row:{row}-col:{col} packNum:{packNum} ");
}
// 记录日志

2
Infrastructure/PLC/PLCTool.cs
View File

@@ -21,7 +21,7 @@ namespace DOAN.Infrastructure.PLC
public PLCTool()
{
this.siemensTcpNet = new SiemensS7Net(SiemensPLCS.S200Smart, "192.168.2.1")
this.siemensTcpNet = new SiemensS7Net(SiemensPLCS.S200Smart, "10.72.82.242")
{
ConnectTimeOut = 5000
};