xiaoguo75131
/
CVDEMCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能调整

Browse Source
main
xiaoguo 9 months ago
parent 2023d359f7
commit 1c1eed70ed
12 changed files with 300 additions and 46 deletions
Show Stats Download Patch File Download Diff File

8
.gitignore vendored
Unescape Escape View File

@ -3,10 +3,10 @@
################################################################################
/CVDEMCS/.vs/
/CVDEMCS/CVDEMCS/bin/
/CVDEMCS/CVDEMCS/obj/
/.vs/
/CVDEMCS/bin/
/CVDEMCS/obj/
/CVDEMCS/obj
/obj
*.user
/.vs

10
CVDEMCS/Common/Log/LogExtensions.cs
Unescape Escape View File

@ -33,12 +33,13 @@ namespace PVDEMCS.Common.Log
/// 写入Error级别日志
/// </summary>
/// <param name="ex">异常对象</param>
public static void WriteErrorLog(this Exception ex)
public static void WriteErrorLog(this Exception ex,string title="")
{
var error = new StringBuilder();
error.AppendLine(title);
while (ex != null)
{
error.AppendLine($"{ex.Message}:{Environment.NewLine}");
error.AppendLine($"{ex.Message}");
error.AppendLine($"{ex.StackTrace};");
ex = ex.InnerException;
}
@ -49,12 +50,13 @@ namespace PVDEMCS.Common.Log
/// 写入Fatal级别日志
/// </summary>
/// <param name="ex">异常对象</param>
public static void WriteFatalLog(this Exception ex)
public static void WriteFatalLog(this Exception ex, string title = "")
{
var error = new StringBuilder();
error.AppendLine(title);
while (ex != null)
{
error.AppendLine($"{ex.Message}:{Environment.NewLine}");
error.AppendLine($"{ex.Message}");
error.AppendLine($"{ex.StackTrace};");
ex = ex.InnerException;
}

56
CVDEMCS/Devices/Impl/DeviceRun.cs
Unescape Escape View File

@ -102,8 +102,16 @@ namespace PVDEMCS.Devices.Impl
{
foreach (var item in monitors)
{
var task = item.StartAsync();
try
{
var task = item.StartAsync();
}
catch (Exception ex)
{
ex.WriteErrorLog("监控设备连接异常");
}
}
Thread.Sleep(5000);
}
});
@ -113,17 +121,9 @@ namespace PVDEMCS.Devices.Impl
{
while (true)
{
try
{
RunEquipmentRecord();
Thread.Sleep(3000);
}
catch (Exception ex)
{
ex.WriteErrorLog();
}
RunEquipmentRecord();
Thread.Sleep(3000);
}
});
@ -135,14 +135,14 @@ namespace PVDEMCS.Devices.Impl
try
{
equipmentRecordService.RunEquipmentRecordDayTotal(DateTime.Now);
Thread.Sleep(1000 * 60);
}
catch (Exception ex)
{
ex.WriteErrorLog();
ex.WriteErrorLog("设备记录日统计异常");
}
Thread.Sleep(1000 * 60);
}
});
@ -151,7 +151,15 @@ namespace PVDEMCS.Devices.Impl
{
while (true)
{
equipmentRecordService.RunEquipmentRecordTotal();
try
{
equipmentRecordService.RunEquipmentRecordTotal();
}
catch (Exception ex)
{
ex.WriteErrorLog("设备记录统计异常");
}
Thread.Sleep(1000 * 1800);
}
});
@ -162,6 +170,7 @@ namespace PVDEMCS.Devices.Impl
{
try
{
var models = new List<EquipmentRecordUpdateModel>();
foreach (var monitor in monitors)
{
if (!monitor.IsRun)
@ -205,17 +214,28 @@ namespace PVDEMCS.Devices.Impl
{
continue;
}
equipmentRecordService.AddUpdateEquipmentRecord(id, state, DateTime.Now);
//equipmentRecordService.AddUpdateEquipmentRecord(id, state, DateTime.Now);
models.Add(new EquipmentRecordUpdateModel
{
EquipmentId=id,
State=state,
DateTime=DateTime.Now
});
}
}
}
}
if (models.Count > 0)
{
//批量更新
equipmentRecordService.AddUpdateEquipmentRecordBatch(models);
}
}
catch (Exception ex)
{
ex.WriteErrorLog();
ex.WriteErrorLog("记录设备数据异常");
}
}

5
CVDEMCS/Program.cs
Unescape Escape View File

@ -26,8 +26,9 @@ builder.Services.AddSwaggerGen(options =>
//Ìí¼Ó¿çÓò²ßÂÔ
builder.Services.AddCors(options =>
{
options.AddPolicy("CorsPolicy", opt => opt.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod().WithExposedHeaders("X-Pagination"));
options.AddPolicy("CorsPolicy", opt => opt.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod());
});
//×¢²á·þÎñ
builder.AddAutofacExt();
//
@ -40,7 +41,7 @@ var app = builder.Build();
// Configure the HTTP request pipeline.
//if (app.Environment.IsDevelopment())
//{
//}
app.UseSwagger();

14
CVDEMCS/Properties/launchSettings.json
Unescape Escape View File

@ -1,5 +1,17 @@
{
"profiles": {
"WSL": {
"commandName": "WSL2",
"distributionName": ""
},
"cvdemcs": {
"commandName": "Project",
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:34771"
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
@ -14,7 +26,7 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:34771",
"applicationUrl": "http://127.0.0.1:34771",
"sslPort": 0
}
}

8
CVDEMCS/Services/IEquipmentRecordService.cs
Unescape Escape View File

@ -57,6 +57,14 @@ namespace PVDEMCS.Services
/// <returns></returns>
Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime);
/// <summary>
/// 批量添加或更新设备状态记录
/// 1.如果设备最新记录状态没有改变则更新结束时间
/// 2.如果没有记录则添加记录
/// </summary>
/// <returns></returns>
Result AddUpdateEquipmentRecordBatch(List<EquipmentRecordUpdateModel> items);
/// <summary>
/// 进行设备状态记录统计（日统计）
/// </summary>

12
CVDEMCS/Services/Impl/EquipmentRecordService.cs
Unescape Escape View File

@ -72,6 +72,18 @@ namespace PVDEMCS.Services.Impl
return result;
}
/// <summary>
/// 批量添加或更新设备状态记录
/// 1.如果设备最新记录状态没有改变则更新结束时间
/// 2.如果没有记录则添加记录
/// </summary>
/// <returns></returns>
public Result AddUpdateEquipmentRecordBatch(List<EquipmentRecordUpdateModel> items)
{
var result = this._equipmentRecordRepository.AddUpdateEquipmentRecordBatch(items);
return result;
}
/// <summary>
/// 进行设备状态记录统计（日统计）
/// </summary>

21
CVDEMCS/Services/Models/EquipmentRecordUpdateModel.cs
Unescape Escape View File

@ -0,0 +1,21 @@
namespace PVDEMCS.Services.Models
{
/// <summary>
/// 设备状态记录模型
/// </summary>
public class EquipmentRecordUpdateModel
{
/// <summary>
/// 设备Id
/// </summary>
public string EquipmentId { get; set; }
/// <summary>
/// 设备状态
/// </summary>
public string State { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime DateTime { get; set; }
}
}

8
CVDEMCS/Services/Repositories/IEquipmentRecordRepository.cs
Unescape Escape View File

@ -53,6 +53,14 @@ namespace PVDEMCS.Services.Repositories
/// <returns></returns>
Result AddUpdateEquipmentRecord(string equipmentId, string state, DateTime dateTime);
/// <summary>
/// 批量添加或更新设备状态记录
/// 1.如果设备最新记录状态没有改变则更新结束时间
/// 2.如果没有记录则添加记录
/// </summary>
/// <returns></returns>
Result AddUpdateEquipmentRecordBatch(List<EquipmentRecordUpdateModel> items);
/// <summary>
/// 进行设备状态记录统计（日统计）
/// </summary>

82
CVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
Unescape Escape View File

@ -13,6 +13,7 @@ using PVDEMCS.Common.Tools;
using PVDEMCS.Services.Models;
using PVDEMCS.Services.Repositories.Entities;
using SixLabors.ImageSharp.Processing.Processors.Transforms;
using System;
using System.Text.RegularExpressions;
namespace PVDEMCS.Services.Repositories.Impl
@ -114,13 +115,13 @@ namespace PVDEMCS.Services.Repositories.Impl
}
if (endTime.HasValue)
{
query = query.Where(f => f.EndTime <= endTime);
query = query.Where(f => f.StartTime <= endTime);
}
return query;
}
/// <summary>
/// 添加或更新设备状态记录
/// 批量添加或更新设备状态记录
/// 1.如果设备最新记录状态没有改变则更新结束时间
/// 2.如果没有记录则添加记录
/// </summary>
@ -132,7 +133,14 @@ namespace PVDEMCS.Services.Repositories.Impl
{
using (var context = new EFContext())
{
var entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId).OrderByDescending(f => f.StartTime).FirstOrDefault();
//降低查询数据量
var endDateTime = dateTime.AddDays(-3);
var entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId && f.StartTime <= endDateTime).OrderByDescending(f => f.StartTime).FirstOrDefault();
//如果3天内没有找到
if (entity == null)
{
entity = context.EquipmentRecords.Where(f => f.EquipmentId == equipmentId).OrderByDescending(f => f.StartTime).FirstOrDefault();
}
//如果最新记录状态没有改变
if (entity != null && entity.State == state)
{
@ -164,6 +172,58 @@ namespace PVDEMCS.Services.Repositories.Impl
}
}
/// <summary>
/// 添加或更新设备状态记录
/// 1.如果设备最新记录状态没有改变则更新结束时间
/// 2.如果没有记录则添加记录
/// </summary>
/// <returns></returns>
public Result AddUpdateEquipmentRecordBatch(List<EquipmentRecordUpdateModel> items)
{
using (var context = new EFContext())
{
foreach (var item in items)
{
//降低查询数据量
var endDateTime = item.DateTime.AddDays(-3);
var entity = context.EquipmentRecords.Where(f => f.EquipmentId == item.EquipmentId && f.StartTime >= endDateTime).OrderByDescending(f => f.StartTime).FirstOrDefault();
//如果3天内没有找到
if (entity == null)
{
entity = context.EquipmentRecords.Where(f => f.EquipmentId == item.EquipmentId).OrderByDescending(f => f.StartTime).FirstOrDefault();
}
//如果最新记录状态没有改变
if (entity != null && entity.State == item.State)
{
entity.EndTime = item.DateTime;
entity.Update();
}
else
{
//更新最新记录结束时间
if (entity != null)
{
entity.EndTime = item.DateTime;
entity.Update();
}
//添加设备状态新记录
var record = new EquipmentRecordEntity
{
EquipmentId = item.EquipmentId,
State = item.State,
StartTime = item.DateTime,
EndTime = item.DateTime,
};
record.Create();
context.EquipmentRecords.Add(record);
}
}
context.SaveChanges();
}
return new Result();
}
/// <summary>
/// 进行设备状态记录统计（日统计）
/// </summary>
@ -177,7 +237,9 @@ namespace PVDEMCS.Services.Repositories.Impl
var result = new Result();
using (var context = new EFContext())
{
var query = context.EquipmentRecords.Where(f => (f.StartTime >= begDate && f.StartTime <= endDate) || (f.EndTime >= begDate && f.EndTime <= endDate)).ToList();
var query = context.EquipmentRecords.Where(f => (f.StartTime >= begDate && f.StartTime <= endDate)).ToList();
//过滤跨天的数据部分
//获取状态统计时间
var total = query.GroupBy(f => new { f.EquipmentId, f.State })
.Select(f => new TotalRecord
@ -226,10 +288,8 @@ namespace PVDEMCS.Services.Repositories.Impl
int.TryParse(ionbondConfig.ConfigValue, out ionbond);
}
var minDate = total.Min(f => f.Date);
var maxDate = total.Max(f => f.Date);
var dayTotals = context.EquipmentRecordDayTotals.Where(f => f.TotalDay >= minDate && f.TotalDay <= maxDate).ToList();
var dayTotals = context.EquipmentRecordDayTotals.Where(f => f.TotalDay >= begDate && f.TotalDay <= endDate).ToList();
foreach (var item in total.Select(f => new { f.EquipmentId, f.Date }).Distinct())
{
var value = dayTotals.Where(f => f.EquipmentId == item.EquipmentId && f.TotalDay == item.Date).FirstOrDefault();
@ -458,7 +518,7 @@ namespace PVDEMCS.Services.Repositories.Impl
{
query = query.Where(f => f.TotalDay <= endTime);
}
query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime);
// query = query.Where(f => f.TotalDay >= begTime && f.TotalDay <= endTime);
return query;
}
@ -526,7 +586,7 @@ namespace PVDEMCS.Services.Repositories.Impl
}
if (endTime.HasValue)
{
sql += $" AND total_day <= '{endTime.Value.ToString("yyyy-MM-dd")}'";
sql += $" AND total_day <= '{endTime.Value.AddDays(1).ToString("yyyy-MM-dd")}'";
}
if (!equipmentName.IsNullOrEmpty())
{
@ -682,7 +742,7 @@ namespace PVDEMCS.Services.Repositories.Impl
if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM"))
{
//初尝值不包括今天
days = now.Day - 1;
// days = now.Day - 1;
//获取当月到当前的分钟
minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
}
@ -800,7 +860,7 @@ namespace PVDEMCS.Services.Repositories.Impl
}
if (end == DateTime.Now.ToString("yyyy-MM-dd"))
{
days = days - 1;
//days = days - 1;
minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
}
else

2
CVDEMCS/Services/Repositories/Impl/EquipmentRepository.cs
Unescape Escape View File

@ -181,6 +181,8 @@ namespace PVDEMCS.Services.Repositories
update.Activated = entity.Activated;
update.OrdrNo = entity.OrdrNo;
update.Remark = entity.Remark;
update.Model = entity.Model;
update.IsAlarm = entity.IsAlarm;
update.Update();
context.SaveChanges();

120
SQL/cvdemcs.sql
Unescape Escape View File

@ -5,13 +5,13 @@
Source Server Type : MySQL
Source Server Version : 80034
Source Host : 127.0.0.1:3306
Source Schema : pvdemcs
Source Schema : cvdemcs
Target Server Type : MySQL
Target Server Version : 80034
File Encoding : 65001
Date: 06/11/2023 10:40:28
Date: 19/05/2024 20:16:32
*/
SET NAMES utf8mb4;
@ -40,6 +40,11 @@ CREATE TABLE `device_info` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'PLC控制器' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of device_info
-- ----------------------------
INSERT INTO `device_info` VALUES ('1139430641660118767', 'PLC01', '化学涂层', b'1', 'S7_200Smart', '192.168.10.10', 102, '11', '1', '2023-10-31 15:56:48', '1', '2023-10-31 15:56:48', NULL, NULL, b'0');
-- ----------------------------
-- Table structure for device_point
-- ----------------------------
@ -65,6 +70,54 @@ CREATE TABLE `device_point` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'PLC点位' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of device_point
-- ----------------------------
INSERT INTO `device_point` VALUES ('1139430652538703872', '1139430641660118767', '1139430644415823872', '5#StartStop', '5#运行/停止', 'V101.4', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:47:45', '1', '2023-11-01 22:47:45', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430652834844672', '1139430641660118767', '1139430644415823872', '5#Fault', '5#故障', 'V101.5', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:48:57', '1', '2023-11-01 22:48:57', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430653154721792', '1139430641660118767', '1139430644789067776', '6#StartStop', '6#运行/停止', 'V101.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:50:15', '1', '2023-11-01 22:50:15', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430653293719552', '1139430641660118767', '1139430644789067776', '6#Fault', '6#故障', 'V101.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:50:49', '1', '2023-11-01 22:50:49', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430653565784064', '1139430641660118767', '1139430644475174912', '7#StartStop', '7#运行/停止', 'V101.6', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:51:55', '1', '2023-11-01 22:51:55', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430653695045632', '1139430641660118767', '1139430644475174912', '7#Fault', '7#故障', 'V101.7', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:52:27', '1', '2023-11-01 22:52:27', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430653912072192', '1139430641660118767', '1139430644855181312', '8#StartStop', '8#运行/停止', 'V101.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:53:20', '1', '2023-11-01 22:53:20', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430654035652608', '1139430641660118767', '1139430644855181312', '8#Fault', '8#故障', 'V101.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:53:50', '1', '2023-11-01 22:53:50', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430654315429888', '1139430641660118767', '1139430644904493056', '10#StartStop', '10#运行/停止', 'V100.6', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:54:58', '1', '2023-11-01 22:54:58', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430654377500672', '1139430641660118767', '1139430644904493056', '10#Fault', '10#故障', 'V100.7', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:55:14', '1', '2023-11-01 22:55:14', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430654608003072', '1139430641660118767', '1139430644494802944', '27#StartStop', '27#运行/停止', 'V102.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:56:10', '1', '2023-11-01 22:56:10', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430654678110208', '1139430641660118767', '1139430644494802944', '27#Fault', '27#故障', 'V102.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:56:27', '1', '2023-11-01 22:56:27', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430655076130816', '1139430641660118767', '1139430644963524608', '11#StartStop', '11#运行/停止', 'V100.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 22:58:04', '1', '2023-11-01 22:58:04', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430655186042880', '1139430641660118767', '1139430644963524608', '11#Fault', '11#故障', 'V100.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 22:58:31', '1', '2023-11-01 22:58:31', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430655586398208', '1139430641660118767', '1139430644997632000', '14#StartStop', '14#运行/停止', 'V102.6', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:00:09', '1', '2023-11-01 23:00:09', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430655924822016', '1139430641660118767', '1139430644997632000', '14#Fault', '14#故障', 'V102.7', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:01:31', '1', '2023-11-01 23:01:31', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430656266252288', '1139430641660118767', '1139430645041299456', '15#StartStop', '15#运行/停止', 'V103.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:02:55', '1', '2023-11-01 23:02:55', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430656341700608', '1139430641660118767', '1139430645041299456', '15#Fault', '15#故障', 'V103.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:03:13', '1', '2023-11-01 23:03:13', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430656716185600', '1139430641660118767', '1139430645079994368', '17#StartStop', '17#运行/停止', 'V103.4', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:04:44', '1', '2023-11-01 23:04:44', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430656809283584', '1139430641660118767', '1139430645079994368', '17#Fault', '17#故障', 'V103.5', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:05:07', '1', '2023-11-01 23:05:07', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430657076408320', '1139430641660118767', '1139430645119148032', '18#StartStop', '18#运行/停止', 'V103.6', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:06:12', '1', '2023-11-01 23:06:12', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430657259327488', '1139430641660118767', '1139430645119148032', '18#Fault', '18#故障', 'V103.7', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:06:57', '1', '2023-11-01 23:06:57', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430657605267456', '1139430641660118767', '1139430645193863168', '20#StartStop', '20#运行/停止', 'V104.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:08:22', '1', '2023-11-01 23:08:22', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430657710931968', '1139430641660118767', '1139430645193863168', '20#Fault', '20#故障', 'V104.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:08:47', '1', '2023-11-01 23:08:47', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430658076295168', '1139430641660118767', '1139430645247967232', '21#StartStop', '21#运行/停止', 'V104.4', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:10:17', '1', '2023-11-01 23:10:17', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430658207510528', '1139430641660118767', '1139430645247967232', '21#Fault', '21#故障', 'V104.5', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:10:49', '1', '2023-11-01 23:10:49', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430658817884160', '1139430641660118767', '1139430645508157440', '9#StartStop', '9#运行/停止', 'V100.4', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:13:18', '1', '2023-11-01 23:13:18', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430658905145344', '1139430641660118767', '1139430645508157440', '9#Fault', '9#故障', 'V100.5', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:13:39', '1', '2023-11-01 23:13:39', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659161649152', '1139430641660118767', '1139430645547446272', '12#StartStop', '12#运行/停止', 'V100.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:14:42', '1', '2023-11-01 23:14:42', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659252658176', '1139430641660118767', '1139430645547446272', '12#Fault', '12#故障', 'V100.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:15:04', '1', '2023-11-01 23:15:04', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659591573504', '1139430641660118767', '1139430645575229440', '13#StartStop', '13#运行/停止', 'V102.4', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:16:26', '1', '2023-11-01 23:16:26', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659657920512', '1139430641660118767', '1139430645575229440', '13#Fault', '13#故障', 'V102.5', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:16:43', '1', '2023-11-01 23:16:43', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659835154432', '1139430641660118767', '1139430645601857536', '16#StartStop', '16#运行/停止', 'V103.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:17:26', '1', '2023-11-01 23:17:26', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430659901124608', '1139430641660118767', '1139430645601857536', '16#Fault', '16#故障', 'V103.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:17:42', '1', '2023-11-01 23:17:42', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430660127326208', '1139430641660118767', '1139430645630369792', '19#StartStop', '19#运行/停止', 'V104.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:18:37', '1', '2023-11-01 23:18:37', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430660250324992', '1139430641660118767', '1139430645630369792', '19#Fault', '19#故障', 'V104.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:19:07', '1', '2023-11-01 23:19:07', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430660545531904', '1139430641660118767', '1139430645318582272', '23#StartStop', '23#运行/停止', 'V105.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:20:19', '1', '2023-11-01 23:20:19', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430660641312768', '1139430641660118767', '1139430645318582272', '23#Fault', '23#故障', 'V105.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:20:43', '1', '2023-11-01 23:20:43', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661001457664', '1139430641660118767', '1139430645348077568', '28#StartStop', '28#运行/停止', 'V102.0', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:22:11', '1', '2023-11-01 23:22:11', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661088616448', '1139430641660118767', '1139430645348077568', '28#Fault', '28#故障', 'V102.1', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:22:32', '1', '2023-11-01 23:22:32', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661257043968', '1139430641660118767', '1139430645381705728', '22#StartStop', '22#运行/停止', 'V104.6', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:23:13', '1', '2023-11-01 23:23:13', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661344280576', '1139430641660118767', '1139430645381705728', '22#Fault', '22#故障', 'V104.7', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:23:34', '1', '2023-11-01 23:23:34', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661591023616', '1139430641660118767', '1139430645415247872', '24#StartStop', '24#运行/停止', 'V105.2', 'System.Boolean', 'StartStop', b'1', '', '1', '2023-11-01 23:24:35', '1', '2023-11-01 23:24:35', b'0', NULL, NULL);
INSERT INTO `device_point` VALUES ('1139430661655056384', '1139430641660118767', '1139430645415247872', '24#Fault', '24#故障', 'V105.3', 'System.Boolean', 'Fault', b'1', '', '1', '2023-11-01 23:24:50', '1', '2023-11-01 23:24:50', b'0', NULL, NULL);
-- ----------------------------
-- Table structure for equipment_info
-- ----------------------------
@ -76,6 +129,8 @@ CREATE TABLE `equipment_info` (
`equipment_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备类型：Ionbond，Balzers，Cemecon',
`activated` bit(1) NOT NULL DEFAULT b'1' COMMENT '设备状态,1：启用，0：停用',
`ordrNo` int NULL DEFAULT 0 COMMENT '排序号',
`model` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模式：Auto 自动；Manual手动',
`isAlarm` bit(1) NULL DEFAULT NULL COMMENT '是否报警：true 报警；false 不报警（model为Auto)',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
`create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '创建者',
`create_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
@ -85,7 +140,33 @@ CREATE TABLE `equipment_info` (
`delete_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '删除者',
`delete_at` datetime NULL DEFAULT NULL COMMENT '删除时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备信息' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备信息' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of equipment_info
-- ----------------------------
INSERT INTO `equipment_info` VALUES ('1139430644415823872', '5#', '5#', '', b'1', 13, 'Auto', b'0', NULL, '1', '2023-11-01 22:14:41', '1', '2023-11-20 10:20:38', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644475174912', '7#', '7#', '', b'1', 17, 'Auto', b'0', NULL, '1', '2023-11-01 22:14:56', '1', '2023-11-20 10:20:31', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644494802944', '27#', '27#', '', b'1', 2, 'Auto', b'0', NULL, '1', '2023-11-01 22:15:01', '1', '2023-11-20 10:20:53', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644789067776', '6#', '6#', '', b'1', 7, 'Auto', b'0', NULL, '1', '2023-11-01 22:16:13', '1', '2023-11-20 10:20:35', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644855181312', '8#', '8#', '', b'1', 13, 'Auto', b'0', NULL, '1', '2023-11-01 22:16:29', '1', '2023-11-20 10:20:28', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644904493056', '10#', '10#', '', b'1', 19, 'Auto', b'0', NULL, '1', '2023-11-01 22:16:41', '1', '2023-11-20 10:19:56', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644963524608', '11#', '11#', '', b'1', 25, 'Auto', b'0', NULL, '1', '2023-11-01 22:16:55', '1', '2023-11-20 10:19:59', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430644997632000', '14#', '14#', '', b'1', 2, 'Auto', b'0', NULL, '1', '2023-11-01 22:17:04', '1', '2023-11-20 10:20:09', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645041299456', '15#', '15#', '', b'1', 8, 'Auto', b'0', NULL, '1', '2023-11-01 22:17:14', '1', '2023-11-20 10:20:12', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645079994368', '17#', '17#', '', b'1', 14, 'Auto', b'0', NULL, '1', '2023-11-01 22:17:24', '1', '2023-11-20 10:20:20', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645119148032', '18#', '18#', '', b'1', 20, 'Auto', b'0', NULL, '1', '2023-11-01 22:17:33', '1', '2023-11-20 10:21:36', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645193863168', '20#', '20#', '', b'1', 26, 'Auto', b'0', NULL, '1', '2023-11-01 22:17:51', '1', '2023-11-20 10:21:20', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645247967232', '21#', '21#', '', b'1', 3, 'Auto', b'0', NULL, '1', '2023-11-01 22:18:05', '1', '2023-11-20 10:21:15', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645318582272', '23#', '23#', '', b'1', 9, 'Auto', b'0', NULL, '1', '2023-11-01 22:18:22', '1', '2023-11-20 10:20:59', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645348077568', '28#', '28#', '', b'1', 27, 'Auto', b'0', NULL, '1', '2023-11-01 22:18:29', '1', '2023-11-20 10:21:02', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645381705728', '22#', '22#', '', b'1', 15, 'Auto', b'0', NULL, '1', '2023-11-01 22:18:37', '1', '2023-11-20 10:21:04', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645415247872', '24#', '24#', '', b'1', 21, 'Auto', b'0', NULL, '1', '2023-11-01 22:18:45', '1', '2023-11-20 10:21:07', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645508157440', '9#', '9#', '', b'1', 1, 'Auto', b'0', NULL, '1', '2023-11-01 22:19:08', '1', '2023-11-20 10:20:25', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645547446272', '12#', '12#', '', b'1', 3, 'Auto', b'0', NULL, '1', '2023-11-01 22:19:18', '1', '2023-11-20 10:20:03', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645575229440', '13#', '13#', '', b'1', 5, 'Auto', b'0', NULL, '1', '2023-11-01 22:19:25', '1', '2023-11-20 10:20:06', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645601857536', '16#', '16#', '', b'1', 7, 'Auto', b'0', NULL, '1', '2023-11-01 22:19:31', '1', '2023-11-20 10:20:16', b'0', NULL, NULL);
INSERT INTO `equipment_info` VALUES ('1139430645630369792', '19#', '19#', '', b'1', 9, 'Auto', b'0', NULL, '1', '2023-11-01 22:19:38', '1', '2023-11-20 10:21:28', b'0', NULL, NULL);
-- ----------------------------
-- Table structure for equipment_record
@ -102,7 +183,11 @@ CREATE TABLE `equipment_record` (
`update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '修改者',
`update_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录明显' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录明显' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of equipment_record
-- ----------------------------
-- ----------------------------
-- Table structure for equipment_record_day_total
@ -121,7 +206,11 @@ CREATE TABLE `equipment_record_day_total` (
`update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '修改者',
`update_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录日统计\r\n' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录日统计\r\n' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of equipment_record_day_total
-- ----------------------------
-- ----------------------------
-- Table structure for equipment_record_total
@ -139,7 +228,11 @@ CREATE TABLE `equipment_record_total` (
`update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '修改者',
`update_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录统计\r\n' ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备状态记录统计\r\n' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of equipment_record_total
-- ----------------------------
-- ----------------------------
-- Table structure for sys_config
@ -162,6 +255,16 @@ CREATE TABLE `sys_config` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of sys_config
-- ----------------------------
INSERT INTO `sys_config` VALUES ('1139430640712261632', 'Ionbond开炉时间', 'Ionbond', '200', 'Y', '单位分钟', '1', '2023-11-01 21:59:37', '1', '2023-11-01 21:59:37', b'0', NULL, NULL);
INSERT INTO `sys_config` VALUES ('1139430640965279744', 'Balzers开炉时间', 'Balzers', '200', 'Y', '单位分钟', '1', '2023-11-01 22:00:39', '1', '2023-11-01 22:00:39', b'0', NULL, NULL);
INSERT INTO `sys_config` VALUES ('1139430641060597760', 'CemeCon开炉时间', 'CemeCon', '300', 'Y', '单位分钟', '1', '2023-11-01 22:01:02', '1', '2023-11-01 22:01:02', b'0', NULL, NULL);
INSERT INTO `sys_config` VALUES ('1139439143692111872', 'Ionbond补偿时间', 'IonbondOffset', '0', 'Y', '单位分钟', '1', '2023-11-25 22:38:20', '1', '2023-11-25 22:38:20', b'0', NULL, NULL);
INSERT INTO `sys_config` VALUES ('1139439143779528704', 'Balzers补偿时间', 'BalzersOffset', '0', 'Y', '单位分钟', '1', '2023-11-25 22:38:41', '1', '2023-11-25 22:38:41', b'0', NULL, NULL);
INSERT INTO `sys_config` VALUES ('1139439143903055872', 'CemeCon补偿时间', 'CemeConOffset', '0', 'Y', '单位分钟', '1', '2023-11-25 22:39:12', '1', '2023-11-25 22:39:12', b'0', NULL, NULL);
-- ----------------------------
-- Table structure for sys_user
-- ----------------------------
@ -191,4 +294,9 @@ CREATE TABLE `sys_user` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of sys_user
-- ----------------------------
INSERT INTO `sys_user` VALUES ('1139431320438677504', NULL, 'admin', 'admin', 'admin', '', '', '1', '', '0HN/nOGAJC/ri0W4pEtXj7U/mtZtlLfVTLRjbzC8Usg=', b'1', '', '', '2023-11-03 12:01:10', '1', '2023-11-03 20:05:26', '1', '2023-11-03 20:08:09', b'0', NULL, NULL);
SET FOREIGN_KEY_CHECKS = 1;

Write Preview
Loading…
Cancel
Save