Explorar o código

隔开网关备份

xhj hai 3 semanas
pai
achega
3e41b0159b

+ 0 - 159
.cmake/api/v1/reply/codemodel-v2-6bdcc71ea41d470fab1b.json

@@ -1,159 +0,0 @@
-{
-	"configurations" : 
-	[
-		{
-			"directories" : 
-			[
-				{
-					"build" : ".",
-					"childIndexes" : 
-					[
-						1,
-						2,
-						3
-					],
-					"jsonFile" : "directory-.-d0094a50bb2071803777.json",
-					"minimumCMakeVersion" : 
-					{
-						"string" : "3.13"
-					},
-					"projectIndex" : 0,
-					"source" : "."
-				},
-				{
-					"build" : "modules/gateway-basic",
-					"jsonFile" : "directory-modules.gateway-basic-0cd18c0b274ae7603186.json",
-					"minimumCMakeVersion" : 
-					{
-						"string" : "3.13"
-					},
-					"parentIndex" : 0,
-					"projectIndex" : 1,
-					"source" : "modules/gateway-basic",
-					"targetIndexes" : 
-					[
-						0
-					]
-				},
-				{
-					"build" : "modules/gateway-scheduler",
-					"jsonFile" : "directory-modules.gateway-scheduler-d719f3c53bdee7fd76b3.json",
-					"minimumCMakeVersion" : 
-					{
-						"string" : "3.13"
-					},
-					"parentIndex" : 0,
-					"projectIndex" : 2,
-					"source" : "modules/gateway-scheduler",
-					"targetIndexes" : 
-					[
-						1
-					]
-				},
-				{
-					"build" : "modules/gateway-server",
-					"jsonFile" : "directory-modules.gateway-server-ff8eb450b6b9e59ddd8a.json",
-					"minimumCMakeVersion" : 
-					{
-						"string" : "3.13"
-					},
-					"parentIndex" : 0,
-					"projectIndex" : 3,
-					"source" : "modules/gateway-server",
-					"targetIndexes" : 
-					[
-						2
-					]
-				}
-			],
-			"name" : "",
-			"projects" : 
-			[
-				{
-					"childIndexes" : 
-					[
-						1,
-						2,
-						3
-					],
-					"directoryIndexes" : 
-					[
-						0
-					],
-					"name" : "embedded-gateway"
-				},
-				{
-					"directoryIndexes" : 
-					[
-						1
-					],
-					"name" : "gateway-basic",
-					"parentIndex" : 0,
-					"targetIndexes" : 
-					[
-						0
-					]
-				},
-				{
-					"directoryIndexes" : 
-					[
-						2
-					],
-					"name" : "gateway-scheduler",
-					"parentIndex" : 0,
-					"targetIndexes" : 
-					[
-						1
-					]
-				},
-				{
-					"directoryIndexes" : 
-					[
-						3
-					],
-					"name" : "gateway-server",
-					"parentIndex" : 0,
-					"targetIndexes" : 
-					[
-						2
-					]
-				}
-			],
-			"targets" : 
-			[
-				{
-					"directoryIndex" : 1,
-					"id" : "gateway-basic::@26444984b35057cfdfd9",
-					"jsonFile" : "target-gateway-basic-5afc96412c78d600d60f.json",
-					"name" : "gateway-basic",
-					"projectIndex" : 1
-				},
-				{
-					"directoryIndex" : 2,
-					"id" : "gateway-scheduler::@b14a20826b83cb04503c",
-					"jsonFile" : "target-gateway-scheduler-bf9a3e9a4f7736ff7da9.json",
-					"name" : "gateway-scheduler",
-					"projectIndex" : 2
-				},
-				{
-					"directoryIndex" : 3,
-					"id" : "gateway-server::@91cbd3ecfdd0686d89cc",
-					"jsonFile" : "target-gateway-server-d661293cbb986b12ad22.json",
-					"name" : "gateway-server",
-					"projectIndex" : 3
-				}
-			]
-		}
-	],
-	"kind" : "codemodel",
-	"paths" : 
-	{
-		"build" : "E:/embedded-gateway",
-		"source" : "E:/embedded-gateway"
-	},
-	"version" : 
-	{
-		"major" : 2,
-		"minor" : 7
-	}
-}

+ 0 - 108
.cmake/api/v1/reply/index-2024-12-20T08-56-57-0696.json

@@ -1,108 +0,0 @@
-{
-	"cmake" : 
-	{
-		"generator" : 
-		{
-			"multiConfig" : false,
-			"name" : "Ninja"
-		},
-		"paths" : 
-		{
-			"cmake" : "D:/xhj/CLion 2024.3/bin/cmake/win/x64/bin/cmake.exe",
-			"cpack" : "D:/xhj/CLion 2024.3/bin/cmake/win/x64/bin/cpack.exe",
-			"ctest" : "D:/xhj/CLion 2024.3/bin/cmake/win/x64/bin/ctest.exe",
-			"root" : "D:/xhj/CLion 2024.3/bin/cmake/win/x64/share/cmake-3.30"
-		},
-		"version" : 
-		{
-			"isDirty" : false,
-			"major" : 3,
-			"minor" : 30,
-			"patch" : 5,
-			"string" : "3.30.5",
-			"suffix" : ""
-		}
-	},
-	"objects" : 
-	[
-		{
-			"jsonFile" : "codemodel-v2-6bdcc71ea41d470fab1b.json",
-			"kind" : "codemodel",
-			"version" : 
-			{
-				"major" : 2,
-				"minor" : 7
-			}
-		},
-		{
-			"jsonFile" : "cache-v2-6518418f9a2e812db9fa.json",
-			"kind" : "cache",
-			"version" : 
-			{
-				"major" : 2,
-				"minor" : 0
-			}
-		},
-		{
-			"jsonFile" : "cmakeFiles-v1-ac00f54fecb9c1c3ff53.json",
-			"kind" : "cmakeFiles",
-			"version" : 
-			{
-				"major" : 1,
-				"minor" : 1
-			}
-		},
-		{
-			"jsonFile" : "toolchains-v1-17dfc565a27f22afc832.json",
-			"kind" : "toolchains",
-			"version" : 
-			{
-				"major" : 1,
-				"minor" : 0
-			}
-		}
-	],
-	"reply" : 
-	{
-		"cache-v2" : 
-		{
-			"jsonFile" : "cache-v2-6518418f9a2e812db9fa.json",
-			"kind" : "cache",
-			"version" : 
-			{
-				"major" : 2,
-				"minor" : 0
-			}
-		},
-		"cmakeFiles-v1" : 
-		{
-			"jsonFile" : "cmakeFiles-v1-ac00f54fecb9c1c3ff53.json",
-			"kind" : "cmakeFiles",
-			"version" : 
-			{
-				"major" : 1,
-				"minor" : 1
-			}
-		},
-		"codemodel-v2" : 
-		{
-			"jsonFile" : "codemodel-v2-6bdcc71ea41d470fab1b.json",
-			"kind" : "codemodel",
-			"version" : 
-			{
-				"major" : 2,
-				"minor" : 7
-			}
-		},
-		"toolchains-v1" : 
-		{
-			"jsonFile" : "toolchains-v1-17dfc565a27f22afc832.json",
-			"kind" : "toolchains",
-			"version" : 
-			{
-				"major" : 1,
-				"minor" : 0
-			}
-		}
-	}
-}

+ 0 - 472
.cmake/api/v1/reply/target-gateway-scheduler-bf9a3e9a4f7736ff7da9.json

@@ -1,472 +0,0 @@
-{
-	"artifacts" : 
-	[
-		{
-			"path" : "deploy/bin/gateway-scheduler"
-		}
-	],
-	"backtrace" : 1,
-	"backtraceGraph" : 
-	{
-		"commands" : 
-		[
-			"add_executable",
-			"link_directories",
-			"add_library",
-			"add_definitions",
-			"include_directories"
-		],
-		"files" : 
-		[
-			"modules/gateway-scheduler/CMakeLists.txt",
-			"modules/gateway-basic/CMakeLists.txt",
-			"CMakeLists.txt"
-		],
-		"nodes" : 
-		[
-			{
-				"file" : 0
-			},
-			{
-				"command" : 0,
-				"file" : 0,
-				"line" : 40,
-				"parent" : 0
-			},
-			{
-				"command" : 1,
-				"file" : 0,
-				"line" : 24,
-				"parent" : 0
-			},
-			{
-				"file" : 1
-			},
-			{
-				"command" : 2,
-				"file" : 1,
-				"line" : 37,
-				"parent" : 3
-			},
-			{
-				"file" : 2
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 44,
-				"parent" : 5
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 43,
-				"parent" : 5
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 41,
-				"parent" : 5
-			},
-			{
-				"command" : 4,
-				"file" : 0,
-				"line" : 18,
-				"parent" : 0
-			}
-		]
-	},
-	"compileGroups" : 
-	[
-		{
-			"compileCommandFragments" : 
-			[
-				{
-					"fragment" : "-std=gnu++1z -fdiagnostics-color=always"
-				}
-			],
-			"defines" : 
-			[
-				{
-					"backtrace" : 6,
-					"define" : "DATABASE_JSON_DIR=\"/usr/local/bin/database/json\""
-				},
-				{
-					"backtrace" : 7,
-					"define" : "DATABASE_SQLITE_DIR=\"/usr/local/bin/database/sqlite\""
-				},
-				{
-					"backtrace" : 8,
-					"define" : "DEBUG"
-				}
-			],
-			"includes" : 
-			[
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/include"
-				},
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/library/include"
-				},
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/modules"
-				},
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/deploy/library"
-				}
-			],
-			"language" : "CXX",
-			"languageStandard" : 
-			{
-				"backtraces" : 
-				[
-					1
-				],
-				"standard" : "17"
-			},
-			"sourceIndexes" : 
-			[
-				0,
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-				10,
-				11,
-				12,
-				13,
-				14,
-				15,
-				16,
-				17,
-				18,
-				19,
-				20,
-				21,
-				22,
-				23,
-				24,
-				25,
-				26,
-				27,
-				28
-			]
-		}
-	],
-	"dependencies" : 
-	[
-		{
-			"backtrace" : 1,
-			"id" : "gateway-basic::@26444984b35057cfdfd9"
-		}
-	],
-	"id" : "gateway-scheduler::@b14a20826b83cb04503c",
-	"link" : 
-	{
-		"commandFragments" : 
-		[
-			{
-				"fragment" : "",
-				"role" : "flags"
-			},
-			{
-				"backtrace" : 2,
-				"fragment" : "-LE:\\embedded-gateway\\library\\lib",
-				"role" : "libraryPath"
-			},
-			{
-				"fragment" : "-Wl,-rpath,E:/embedded-gateway/library/lib:E:/embedded-gateway/deploy/library",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lsqlite3",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lboost_filesystem",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lmodbus",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lpthread",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lpaho-mqttpp3",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lpaho-mqtt3as",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-liec61850",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "deploy\\library\\libgateway-basic.so",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lsqlite3",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lboost_filesystem",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 4,
-				"fragment" : "-lhiredis",
-				"role" : "libraries"
-			}
-		],
-		"language" : "CXX"
-	},
-	"name" : "gateway-scheduler",
-	"nameOnDisk" : "gateway-scheduler",
-	"paths" : 
-	{
-		"build" : "modules/gateway-scheduler",
-		"source" : "modules/gateway-scheduler"
-	},
-	"sourceGroups" : 
-	[
-		{
-			"name" : "Source Files",
-			"sourceIndexes" : 
-			[
-				0,
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-				10,
-				11,
-				12,
-				13,
-				14,
-				15,
-				16,
-				17,
-				18,
-				19,
-				20,
-				21,
-				22,
-				23,
-				24,
-				25,
-				26,
-				27,
-				28
-			]
-		}
-	],
-	"sources" : 
-	[
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/executant/BasicExecutant.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/executant/GPIOExecutant.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/executant/ModbusExecutant.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/main.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/report/MyIec61850Server.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/report/TaskReportService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleCommunicationRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleDeviceCommunicationRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleDeviceProtocolRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleDeviceRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleProtocolRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleTaskFormatterRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/repository/ScheduleTaskRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/BasicExecutorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/CalculateService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/FlowerExecutorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/FormatterExecutorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/QueueService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleCommunicationService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleDeviceCommunicationService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleDeviceProtocolService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleDeviceService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleProtocolService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleTaskFormatterService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/ScheduleTaskService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/service/TaskExecutorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/tcp_server/TcpServer.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-scheduler/src/utils/HashUtils.cpp",
-			"sourceGroupIndex" : 0
-		}
-	],
-	"type" : "EXECUTABLE"
-}

+ 0 - 589
.cmake/api/v1/reply/target-gateway-server-d661293cbb986b12ad22.json

@@ -1,589 +0,0 @@
-{
-	"artifacts" : 
-	[
-		{
-			"path" : "deploy/bin/gateway-server"
-		}
-	],
-	"backtrace" : 1,
-	"backtraceGraph" : 
-	{
-		"commands" : 
-		[
-			"add_executable",
-			"link_directories",
-			"add_library",
-			"add_definitions",
-			"include_directories"
-		],
-		"files" : 
-		[
-			"modules/gateway-server/CMakeLists.txt",
-			"modules/gateway-basic/CMakeLists.txt",
-			"CMakeLists.txt"
-		],
-		"nodes" : 
-		[
-			{
-				"file" : 0
-			},
-			{
-				"command" : 0,
-				"file" : 0,
-				"line" : 35,
-				"parent" : 0
-			},
-			{
-				"command" : 1,
-				"file" : 0,
-				"line" : 23,
-				"parent" : 0
-			},
-			{
-				"file" : 1
-			},
-			{
-				"command" : 2,
-				"file" : 1,
-				"line" : 37,
-				"parent" : 3
-			},
-			{
-				"file" : 2
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 44,
-				"parent" : 5
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 43,
-				"parent" : 5
-			},
-			{
-				"command" : 3,
-				"file" : 2,
-				"line" : 41,
-				"parent" : 5
-			},
-			{
-				"command" : 4,
-				"file" : 0,
-				"line" : 17,
-				"parent" : 0
-			}
-		]
-	},
-	"compileGroups" : 
-	[
-		{
-			"compileCommandFragments" : 
-			[
-				{
-					"fragment" : "-std=gnu++1z -fdiagnostics-color=always"
-				}
-			],
-			"defines" : 
-			[
-				{
-					"backtrace" : 6,
-					"define" : "DATABASE_JSON_DIR=\"/usr/local/bin/database/json\""
-				},
-				{
-					"backtrace" : 7,
-					"define" : "DATABASE_SQLITE_DIR=\"/usr/local/bin/database/sqlite\""
-				},
-				{
-					"backtrace" : 8,
-					"define" : "DEBUG"
-				}
-			],
-			"includes" : 
-			[
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/include"
-				},
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/library/include"
-				},
-				{
-					"backtrace" : 9,
-					"path" : "E:/embedded-gateway/modules"
-				}
-			],
-			"language" : "CXX",
-			"languageStandard" : 
-			{
-				"backtraces" : 
-				[
-					1
-				],
-				"standard" : "17"
-			},
-			"sourceIndexes" : 
-			[
-				0,
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-				10,
-				11,
-				12,
-				13,
-				14,
-				15,
-				16,
-				17,
-				18,
-				19,
-				20,
-				21,
-				22,
-				23,
-				24,
-				25,
-				26,
-				27,
-				28,
-				29,
-				30,
-				31,
-				32,
-				33,
-				34,
-				35,
-				36,
-				37,
-				38,
-				39,
-				40,
-				41,
-				42,
-				43,
-				44,
-				45
-			]
-		}
-	],
-	"dependencies" : 
-	[
-		{
-			"backtrace" : 1,
-			"id" : "gateway-basic::@26444984b35057cfdfd9"
-		}
-	],
-	"id" : "gateway-server::@91cbd3ecfdd0686d89cc",
-	"link" : 
-	{
-		"commandFragments" : 
-		[
-			{
-				"fragment" : "",
-				"role" : "flags"
-			},
-			{
-				"backtrace" : 2,
-				"fragment" : "-LE:\\embedded-gateway\\library\\lib",
-				"role" : "libraryPath"
-			},
-			{
-				"backtrace" : 2,
-				"fragment" : "-LE:\\embedded-gateway\\deploy\\library",
-				"role" : "libraryPath"
-			},
-			{
-				"fragment" : "-Wl,-rpath,E:/embedded-gateway/library/lib:E:/embedded-gateway/deploy/library",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lmicrohttpd",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lsqlite3",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lboost_filesystem",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "deploy\\library\\libgateway-basic.so",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lsqlite3",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 1,
-				"fragment" : "-lboost_filesystem",
-				"role" : "libraries"
-			},
-			{
-				"backtrace" : 4,
-				"fragment" : "-lhiredis",
-				"role" : "libraries"
-			}
-		],
-		"language" : "CXX"
-	},
-	"name" : "gateway-server",
-	"nameOnDisk" : "gateway-server",
-	"paths" : 
-	{
-		"build" : "modules/gateway-server",
-		"source" : "modules/gateway-server"
-	},
-	"sourceGroups" : 
-	[
-		{
-			"name" : "Source Files",
-			"sourceIndexes" : 
-			[
-				0,
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-				10,
-				11,
-				12,
-				13,
-				14,
-				15,
-				16,
-				17,
-				18,
-				19,
-				20,
-				21,
-				22,
-				23,
-				24,
-				25,
-				26,
-				27,
-				28,
-				29,
-				30,
-				31,
-				32,
-				33,
-				34,
-				35,
-				36,
-				37,
-				38,
-				39,
-				40,
-				41,
-				42,
-				43,
-				44,
-				45
-			]
-		}
-	],
-	"sources" : 
-	[
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/CommunicationController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/DashboardDeviceController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/DashboardDeviceHistoryController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/DeviceCommunicationController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/DeviceController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/DeviceProtocolController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/ExecutorController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/FlowerNodeController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/FlowerOperatorController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/ProtocolController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/RedisCacheController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/RedisReportCacheController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/TaskController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/TaskFormatterController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/controller/UserController.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/large_screen_display/devices_info.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/main.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/CommunicationRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/DashboardDeviceHistoryRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/DeviceCommunicationRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/DeviceProtocolRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/DeviceRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/ExecutorRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/FlowerNodeRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/FlowerOperatorRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/ProtocolRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/TaskFormatterRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/TaskRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/repository/UserRepository.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/server/BasicRouter.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/server/BasicServer.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/CommunicationService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/DashboardDeviceHistoryService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/DashboardDeviceService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/DeviceCommunicationService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/DeviceProtocolService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/DeviceService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/ExecutorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/FlowerNodeService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/FlowerOperatorService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/ProtocolService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/RedisCacheService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/RedisReportCacheService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/TaskFormatterService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/TaskService.cpp",
-			"sourceGroupIndex" : 0
-		},
-		{
-			"backtrace" : 1,
-			"compileGroupIndex" : 0,
-			"path" : "modules/gateway-server/src/service/UserService.cpp",
-			"sourceGroupIndex" : 0
-		}
-	],
-	"type" : "EXECUTABLE"
-}

+ 0 - 114
.cmake/api/v1/reply/toolchains-v1-17dfc565a27f22afc832.json

@@ -1,114 +0,0 @@
-{
-	"kind" : "toolchains",
-	"toolchains" : 
-	[
-		{
-			"compiler" : 
-			{
-				"id" : "GNU",
-				"implicit" : 
-				{
-					"includeDirectories" : 
-					[
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0/include",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0/include-fixed",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/include",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/usr/include"
-					],
-					"linkDirectories" : 
-					[
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/lib64",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/lib",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/lib",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/usr/lib"
-					],
-					"linkFrameworkDirectories" : [],
-					"linkLibraries" : 
-					[
-						"gcc",
-						"gcc_s",
-						"c",
-						"gcc",
-						"gcc_s"
-					]
-				},
-				"path" : "E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc.exe",
-				"version" : "7.5.0"
-			},
-			"language" : "C",
-			"sourceFileExtensions" : 
-			[
-				"c",
-				"m"
-			]
-		},
-		{
-			"compiler" : 
-			{
-				"id" : "GNU",
-				"implicit" : 
-				{
-					"includeDirectories" : 
-					[
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/include/c++/7.5.0",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/include/c++/7.5.0/aarch64-linux-gnu",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/include/c++/7.5.0/backward",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0/include",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0/include-fixed",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/include",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/usr/include"
-					],
-					"linkDirectories" : 
-					[
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.5.0",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/lib/gcc",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/lib64",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/lib",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/lib",
-						"E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/aarch64-linux-gnu/libc/usr/lib"
-					],
-					"linkFrameworkDirectories" : [],
-					"linkLibraries" : 
-					[
-						"stdc++",
-						"m",
-						"gcc_s",
-						"gcc",
-						"c",
-						"gcc_s",
-						"gcc"
-					]
-				},
-				"path" : "E:/xhj/gcc-linaro-7.5.0-2019/gcc-linaro-7.5.0-2019.12-i686-mingw32_aarch64-linux-gnu/bin/aarch64-linux-gnu-g++.exe",
-				"version" : "7.5.0"
-			},
-			"language" : "CXX",
-			"sourceFileExtensions" : 
-			[
-				"C",
-				"M",
-				"c++",
-				"cc",
-				"cpp",
-				"cxx",
-				"mm",
-				"mpp",
-				"CPP",
-				"ixx",
-				"cppm",
-				"ccm",
-				"cxxm",
-				"c++m"
-			]
-		}
-	],
-	"version" : 
-	{
-		"major" : 1,
-		"minor" : 0
-	}
-}

BIN=BIN
.ninja_deps


+ 94 - 130
.ninja_log

@@ -1,131 +1,95 @@
 # ninja log v6
-73	9673	7556845209444082	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/report/MyIec61850Server.cpp.o	8c8a43e9c83cbe39
-321	3379	7555032976568547	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/ThreadUtils.cpp.o	5d6f9aa9d944d2fb
-541	10037	7555032978767928	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/GPIOExecutant.cpp.o	893c68b9cd60acae
-28948	38828	7563654112097720	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/FlowerOperatorRepository.cpp.o	233fc5403da47fc5
-392	4198	7555032977269353	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/TimeUtils.cpp.o	95636d2c4ca71b0b
-122	7602	7555032974561827	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/JsonUtils.cpp.o	9cf481573112ce8e
-185	8416	7555032975207376	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/RedisUtils.cpp.o	f7d32068021064aa
-63	9204	7555032973986409	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/service/RedisService.cpp.o	fde1f11b47c774fb
-470	8736	7555032978040748	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/BasicExecutant.cpp.o	d7958f5e095708f6
-28869	38754	7563654111300870	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/FlowerNodeRepository.cpp.o	494298649b2ef9bc
-252	10658	7555032975880601	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/StringUtils.cpp.o	3455906afd556d5d
-56	5484	7556772790554373	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/main.cpp.o	4edd25c30a70ee81
-10660	13953	7555033079951813	deploy/library/libgateway-basic.so	a41b40461b2daf81
-559	28524	7563653828205052	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/FlowerOperatorController.cpp.o	9e70dc771e46a6ed
-1044	14460	7555032983798260	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceCommunicationRepository.cpp.o	2dafd0bf2b8e5e58
-15819	22402	7555033131550618	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleCommunicationService.cpp.o	e5ce0e16cfd3b4d0
-3017	15818	7555033003530118	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceProtocolRepository.cpp.o	5ec11890d69fb2d0
-9205	16936	7555033065401437	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/CalculateService.cpp.o	c90b26f4dff37da2
-14462	27878	7555033117970228	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/QueueService.cpp.o	88acd5ec7d4bacae
-616	23050	7555032979509244	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/ModbusExecutant.cpp.o	b381e1cf0fe99883
-3381	17794	7555033007162504	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceRepository.cpp.o	f1a247a78d6186d7
-25830	28113	7563654080908023	modules/gateway-server/CMakeFiles/gateway-server.dir/src/main.cpp.o	4bd0c13801b7615a
-7606	21267	7555033049419877	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleTaskFormatterRepository.cpp.o	b31a3da0e8ff7f9f
-8441	21399	7555033057766525	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleTaskRepository.cpp.o	c8fce6244c833d55
-28186	38207	7563654104469158	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceRepository.cpp.o	6a9c6dc336f49823
-10038	22274	7555033073737511	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/FlowerExecutorService.cpp.o	99db711d5addf15e
-16937	22973	7555033142722776	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceCommunicationService.cpp.o	6e4ed4e4ef97649f
-22403	27489	7555033197372297	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleTaskService.cpp.o	13abac91e7dbdcfe
-8737	23136	7555033060733103	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/BasicExecutorService.cpp.o	6d274e34e2f48a94
-17451	23218	7555033147872534	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceProtocolService.cpp.o	2b6875a00b33dc78
-21269	26671	7555033186043072	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleProtocolService.cpp.o	de175f9c3841b6ba
-17795	23573	7555033151305612	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceService.cpp.o	2752b0acd445c9c7
-13954	24691	7555033112885863	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/FormatterExecutorService.cpp.o	e19a30a4e763f3d4
-28525	39072	7563654107857589	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/ExecutorRepository.cpp.o	c7a99916ca640505
-945	28384	7555032982802180	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleCommunicationRepository.cpp.o	2f30878c2bf5c9f2
-23137	24979	7555033204725058	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/utils/HashUtils.cpp.o	99a36625c566d329
-857	25950	7555032981923876	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/report/TaskReportService.cpp.o	fdb5dbe067f415ad
-197	26257	7563653824582197	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DashboardDeviceHistoryController.cpp.o	609d7e8616d2e027
-22275	28759	7555033196111827	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleTaskFormatterService.cpp.o	cd4625953f7043b0
-245	29312	7563653825054865	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceCommunicationController.cpp.o	7869e4aafe3f0751
-22974	29752	7555033203095164	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/TaskExecutorService.cpp.o	bcd1dbd7090d01c0
-4200	30241	7555033015353966	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleProtocolRepository.cpp.o	3aaf10c249eda0fa
-117	7138	7556845209888724	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
-21400	35538	7555033187353460	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleService.cpp.o	1eb6b9ea730c9467
-9673	11062	7556845305435190	deploy/bin/gateway-scheduler	6350bd74d9d27d3
-35879	43012	7563654181404377	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/CommunicationService.cpp.o	2041fa7ba093b046
-420	24270	7563653826818740	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/ExecutorController.cpp.o	a7fc8017e09a004f
-30170	41158	7563654124315927	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/TaskRepository.cpp.o	6e0681073bd91793
-703	25829	7563653829638051	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/RedisCacheController.cpp.o	590f8c53ce8621cf
-780	26151	7563653830411320	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/RedisReportCacheController.cpp.o	989a2c9c28564ed7
-153	26330	7563653824137659	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DashboardDeviceController.cpp.o	31ad4be0c512f625
-481	28184	7563653827418005	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/FlowerNodeController.cpp.o	40608f0dbb6a72bf
-295	28868	7563653825570053	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceController.cpp.o	bf3ea8515f11c96f
-28113	37626	7563654103752459	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceProtocolRepository.cpp.o	7eac28e6cf344653
-359	28947	7563653826204199	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceProtocolController.cpp.o	50cbbd9e87268343
-99	30058	7563653823600017	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/CommunicationController.cpp.o	838a5e0d6eb18825
-625	30169	7563653828868450	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/ProtocolController.cpp.o	8335f95c50e52873
-977	32437	7563653832386994	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/TaskFormatterController.cpp.o	e6cbc0e76c930217
-32438	41943	7563654146999923	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/UserRepository.cpp.o	8848a32b5b9e5dd3
-869	32725	7563653831307272	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/TaskController.cpp.o	90d044655ee89d22
-26331	35698	7563654085927534	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceCommunicationRepository.cpp.o	2ec071e68ac3bd88
-26258	35878	7563654085195420	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DashboardDeviceHistoryRepository.cpp.o	2e93b71537372f8
-30059	40891	7563654123204327	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/TaskFormatterRepository.cpp.o	89cfe1dd34b3b8ac
-37627	43758	7563654198889540	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DashboardDeviceHistoryService.cpp.o	fc9e49560a5e31d1
-38755	45087	7563654210161505	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceCommunicationService.cpp.o	bcefd60e0924624c
-38829	45162	7563654210906245	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceProtocolService.cpp.o	5c7ae9502624e799
-39074	45236	7563654213355945	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceService.cpp.o	1385ef52e5633e59
-40892	45785	7563654231533024	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/ExecutorService.cpp.o	c0a13ca6c85a5bf6
-85	5397	7563878654949526	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-45089	55995	7563654273496011	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/RedisReportCacheService.cpp.o	56450d89e102d75c
-41159	47608	7563654234204968	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/FlowerNodeService.cpp.o	de3b010aaccdaf3f
-24273	47873	7563654065345132	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/UserController.cpp.o	59ff219136851c98
-32727	48045	7563654149890098	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicRouter.cpp.o	6b318a01684442a5
-41944	48260	7563654242054022	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/FlowerOperatorService.cpp.o	52d4734515aa9129
-43759	49767	7563654260204836	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/RedisCacheService.cpp.o	728b74b27c194261
-43014	50204	7563654252740586	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/ProtocolService.cpp.o	5666432150f2aa35
-26152	51148	7563654084134371	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/CommunicationRepository.cpp.o	32644d195faed402
-45786	51442	7563654280483142	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/UserService.cpp.o	a1eb9022e1ce919
-45163	52819	7563654274247312	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/TaskFormatterService.cpp.o	2b681b720ee5565d
-29314	53082	7563654115747270	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/ProtocolRepository.cpp.o	c85c732f030cc6f6
-45237	53245	7563654274994287	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/TaskService.cpp.o	e3eabcaf25bac6e2
-38208	53655	7563654204697800	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DashboardDeviceService.cpp.o	7dd237d8a43ca343
-4330	5872	7563882094587122	deploy/bin/gateway-server	c0e96af07d75fc04
-30	337	7563882176303643	build.ninja	6a763902b4018f1
-33	4328	7563882051618450	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-10	403	7563882176303643	build.ninja	6a763902b4018f1
-62	4974	7563884446908224	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-4976	6728	7563884496054322	deploy/bin/gateway-server	c0e96af07d75fc04
-34	5035	7563886766338818	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-5038	6863	7563886816374367	deploy/bin/gateway-server	c0e96af07d75fc04
-38	5444	7563889862501346	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-5449	6958	7563889916606210	deploy/bin/gateway-server	c0e96af07d75fc04
-33	4933	7563891415244685	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-4939	6555	7563891464304451	deploy/bin/gateway-server	c0e96af07d75fc04
-37	4895	7563892624079414	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-4900	6424	7563892672709580	deploy/bin/gateway-server	c0e96af07d75fc04
-50	6022	7566198657121305	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-6024	7765	7566198716849781	deploy/bin/gateway-server	c0e96af07d75fc04
-40	4769	7566200097061947	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-4773	7379	7566200144392825	deploy/bin/gateway-server	c0e96af07d75fc04
-99	5097	7566323825463556	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-142	5358	7566323825898098	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-5359	7263	7566323878060047	deploy/bin/gateway-server	c0e96af07d75fc04
-35	5309	7566331386933056	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5311	6967	7566331439705525	deploy/bin/gateway-server	c0e96af07d75fc04
-53	5241	7566334574983615	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-5244	6892	7566334626888664	deploy/bin/gateway-server	c0e96af07d75fc04
-95	6787	7566350074981811	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-56	6880	7566350074597403	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-6881	9019	7566350142839196	deploy/bin/gateway-server	c0e96af07d75fc04
-35	5102	7566350185220554	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
-5104	6781	7566350235908250	deploy/bin/gateway-server	c0e96af07d75fc04
-38	5300	7566354036347364	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5306	6965	7566354089016587	deploy/bin/gateway-server	c0e96af07d75fc04
-35	5469	7566356190862970	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5472	7210	7566356245236799	deploy/bin/gateway-server	c0e96af07d75fc04
-42	5282	7566357098441945	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5288	7020	7566357150899347	deploy/bin/gateway-server	c0e96af07d75fc04
-37	5355	7566363732720681	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5357	7011	7566363785918230	deploy/bin/gateway-server	c0e96af07d75fc04
-40	5234	7566364397380819	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-5237	6844	7566364449350932	deploy/bin/gateway-server	c0e96af07d75fc04
-49	6273	7567985935570961	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
-6275	8220	7567985997839000	deploy/bin/gateway-server	c0e96af07d75fc04
-45	7957	7626841297153955	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/main.cpp.o	4edd25c30a70ee81
-7960	10798	7626841376299248	deploy/bin/gateway-scheduler	6350bd74d9d27d3
-42	7031	7626844903794741	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
-7033	8248	7626844973708990	deploy/bin/gateway-scheduler	6350bd74d9d27d3
-44	6855	7626846305256059	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
-6857	8016	7626846373386835	deploy/bin/gateway-scheduler	6350bd74d9d27d3
+540	28676	7691620008866687	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/report/MyIec61850Server.cpp.o	8c8a43e9c83cbe39
+249	4681	7691620005960781	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/ThreadUtils.cpp.o	5d6f9aa9d944d2fb
+98	4343	7693223359154902	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/insulated-switch-server/insulated_switch_server.cpp.o	6debb6056819d6de
+112	13421	7693237478779411	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/FlowerOperatorRepository.cpp.o	233fc5403da47fc5
+286	5142	7691620006330796	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/TimeUtils.cpp.o	95636d2c4ca71b0b
+358	9741	7691620007056128	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/GPIOExecutant.cpp.o	893c68b9cd60acae
+129	6628	7691620004759231	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/JsonUtils.cpp.o	9cf481573112ce8e
+168	9496	7691620005149262	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/RedisUtils.cpp.o	f7d32068021064aa
+80	7925	7691620004303970	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/service/RedisService.cpp.o	fde1f11b47c774fb
+86	13556	7693237478529220	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/FlowerNodeRepository.cpp.o	494298649b2ef9bc
+322	9937	7691620006686140	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/BasicExecutant.cpp.o	d7958f5e095708f6
+212	11890	7691620005580642	modules/gateway-basic/CMakeFiles/gateway-basic.dir/src/utils/StringUtils.cpp.o	3455906afd556d5d
+490	26034	7693234381769501	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/FlowerOperatorController.cpp.o	9e70dc771e46a6ed
+11892	13391	7691620122386315	deploy/library/libgateway-basic.so	a41b40461b2daf81
+52	6856	7691622842415479	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/main.cpp.o	4edd25c30a70ee81
+5143	16743	7691620054903649	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceCommunicationRepository.cpp.o	2dafd0bf2b8e5e58
+5215	17164	7691620055629305	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceProtocolRepository.cpp.o	5ec11890d69fb2d0
+18268	25883	7691620186149992	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleCommunicationService.cpp.o	e5ce0e16cfd3b4d0
+13391	20004	7691620137387730	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/CalculateService.cpp.o	c90b26f4dff37da2
+22623	24113	7693234603094503	modules/gateway-server/CMakeFiles/gateway-server.dir/src/main.cpp.o	4bd0c13801b7615a
+6629	18266	7691620069772543	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleDeviceRepository.cpp.o	f1a247a78d6186d7
+394	25452	7691620007416130	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/executant/ModbusExecutant.cpp.o	b381e1cf0fe99883
+17165	33704	7691620175126545	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/QueueService.cpp.o	88acd5ec7d4bacae
+9497	22880	7691620098448378	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleTaskFormatterRepository.cpp.o	b31a3da0e8ff7f9f
+25623	32153	7693234633098131	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceRepository.cpp.o	6a9c6dc336f49823
+9742	23080	7691620100892555	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleTaskRepository.cpp.o	c8fce6244c833d55
+15223	27522	7691620155714566	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/FlowerExecutorService.cpp.o	99db711d5addf15e
+19026	25948	7691620193740028	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceCommunicationService.cpp.o	6e4ed4e4ef97649f
+9939	24659	7691620102861588	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/BasicExecutorService.cpp.o	6d274e34e2f48a94
+25884	32573	7691620262315621	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleTaskService.cpp.o	13abac91e7dbdcfe
+20005	27008	7691620203528285	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceProtocolService.cpp.o	2b6875a00b33dc78
+22882	29779	7691620232289129	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleDeviceService.cpp.o	2752b0acd445c9c7
+23082	30201	7691620234294120	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleProtocolService.cpp.o	de175f9c3841b6ba
+61	13507	7693237478271719	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/ExecutorRepository.cpp.o	c7a99916ca640505
+16744	29045	7691620170914899	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/FormatterExecutorService.cpp.o	e19a30a4e763f3d4
+27524	29344	7691620278703571	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/utils/HashUtils.cpp.o	99a36625c566d329
+4686	35334	7691620050334767	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleCommunicationRepository.cpp.o	2f30878c2bf5c9f2
+574	31290	7691620009206658	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/report/TaskReportService.cpp.o	fdb5dbe067f415ad
+133	22622	7693234378187973	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DashboardDeviceHistoryController.cpp.o	609d7e8616d2e027
+195	25622	7693234378813505	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceCommunicationController.cpp.o	7869e4aafe3f0751
+25453	34238	7691620257999509	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleTaskFormatterService.cpp.o	cd4625953f7043b0
+25949	35387	7691620262971103	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/TaskExecutorService.cpp.o	bcd1dbd7090d01c0
+7926	36428	7691620082729303	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/repository/ScheduleProtocolRepository.cpp.o	3aaf10c249eda0fa
+27009	37923	7691620273560723	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/tcp_server/TcpServer.cpp.o	a1f99320b3b8c883
+24660	43655	7691620250075588	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/service/ScheduleService.cpp.o	1eb6b9ea730c9467
+293	11083	7693237480593128	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/CommunicationService.cpp.o	2041fa7ba093b046
+4345	5749	7693223401627857	deploy/bin/gateway-scheduler	cf4d591547131fa4
+191	15276	7693237479564856	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/TaskRepository.cpp.o	6e0681073bd91793
+365	21180	7693234380520195	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/ExecutorController.cpp.o	a7fc8017e09a004f
+623	22319	7693234383107329	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/RedisCacheController.cpp.o	590f8c53ce8621cf
+687	22890	7693234383750874	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/RedisReportCacheController.cpp.o	989a2c9c28564ed7
+89	23665	7693234377752850	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DashboardDeviceController.cpp.o	31ad4be0c512f625
+422	26024	7693234381119309	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/FlowerNodeController.cpp.o	40608f0dbb6a72bf
+257	26130	7693234379438543	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceController.cpp.o	bf3ea8515f11c96f
+25568	31778	7693234632552893	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceProtocolRepository.cpp.o	7eac28e6cf344653
+319	25567	7693234380087887	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/DeviceProtocolController.cpp.o	50cbbd9e87268343
+50	26659	7693234377358677	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/CommunicationController.cpp.o	838a5e0d6eb18825
+557	26601	7693234382448718	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/ProtocolController.cpp.o	8335f95c50e52873
+217	13696	7693237479825949	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/UserRepository.cpp.o	8848a32b5b9e5dd3
+824	28361	7693234385106085	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/TaskFormatterController.cpp.o	e6cbc0e76c930217
+756	29480	7693234384434539	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/TaskController.cpp.o	90d044655ee89d22
+24114	30895	7693234618004503	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DeviceCommunicationRepository.cpp.o	2ec071e68ac3bd88
+23666	30893	7693234613528271	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/DashboardDeviceHistoryRepository.cpp.o	2e93b71537372f8
+165	15157	7693237479307511	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/TaskFormatterRepository.cpp.o	89cfe1dd34b3b8ac
+319	10605	7693237480853071	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DashboardDeviceHistoryService.cpp.o	fc9e49560a5e31d1
+370	10815	7693237481363335	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceCommunicationService.cpp.o	bcefd60e0924624c
+10608	16910	7693237583744507	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceProtocolService.cpp.o	5c7ae9502624e799
+10816	16990	7693237585829003	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DeviceService.cpp.o	1385ef52e5633e59
+11085	15547	7693237588517311	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/ExecutorService.cpp.o	c0a13ca6c85a5bf6
+15158	25660	7693237629253438	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/RedisReportCacheService.cpp.o	56450d89e102d75c
+69	6496	7693328365551542	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicServer.cpp.o	3a059b9bc50684e9
+13422	19258	7693237611878386	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/FlowerNodeService.cpp.o	de3b010aaccdaf3f
+21183	37230	7693234588695689	modules/gateway-server/CMakeFiles/gateway-server.dir/src/controller/UserController.cpp.o	59ff219136851c98
+242	18913	7693237480079505	modules/gateway-server/CMakeFiles/gateway-server.dir/src/server/BasicRouter.cpp.o	6b318a01684442a5
+13508	19365	7693237612751093	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/FlowerOperatorService.cpp.o	52d4734515aa9129
+13697	19358	7693237614634081	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/RedisCacheService.cpp.o	728b74b27c194261
+13557	20253	7693237613232217	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/ProtocolService.cpp.o	5666432150f2aa35
+22891	39137	7693234605765311	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/CommunicationRepository.cpp.o	32644d195faed402
+15548	20990	7693237633138437	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/UserService.cpp.o	a1eb9022e1ce919
+15277	22541	7693237630437118	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/TaskFormatterService.cpp.o	2b681b720ee5565d
+137	25667	7693237479032802	modules/gateway-server/CMakeFiles/gateway-server.dir/src/repository/ProtocolRepository.cpp.o	c85c732f030cc6f6
+15424	22892	7693237631909631	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/TaskService.cpp.o	e3eabcaf25bac6e2
+345	21002	7693237481111927	modules/gateway-server/CMakeFiles/gateway-server.dir/src/service/DashboardDeviceService.cpp.o	7dd237d8a43ca343
+9040	11055	7693328455274321	deploy/bin/gateway-server	ce0929752e1db5b2
+12	366	7693346908107038	build.ninja	6a763902b4018f1
+40	9040	7693328365272250	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
+472	5214	7691620008191376	modules/gateway-scheduler/CMakeFiles/gateway-scheduler.dir/src/lora_server/LoRaServer.cpp.o	fc2812624c6741a
+13	152	7691619997487718	clean	92ade73078083541
+87	9211	7693349289438694	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
+9213	11382	7693349380687840	deploy/bin/gateway-server	ce0929752e1db5b2
+44	8054	7693350181897087	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
+8056	10428	7693350262007631	deploy/bin/gateway-server	ce0929752e1db5b2
+40	8105	7693359068066780	modules/gateway-server/CMakeFiles/gateway-server.dir/src/large_screen_display/devices_info.cpp.o	690840fd0b4fbc98
+8107	9806	7693359148732464	deploy/bin/gateway-server	ce0929752e1db5b2

+ 2 - 2
Testing/Temporary/LastTest.log

@@ -1,3 +1,3 @@
-Start testing: Mar 04 13:21 中国标准时间
+Start testing: May 22 15:15 中国标准时间
 ----------------------------------------------------------
-End testing: Mar 04 13:21 中国标准时间
+End testing: May 22 15:15 中国标准时间

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 16 - 0
build.ninja


+ 1 - 0
modules/gateway-scheduler/CMakeLists.txt

@@ -33,6 +33,7 @@ link_libraries(
         paho-mqttpp3
         paho-mqtt3as
         iec61850
+        libloragw.a
 )
 
 

+ 17 - 6
modules/gateway-scheduler/src/main.cpp

@@ -7,6 +7,8 @@
 #include "gateway-scheduler/src/report/TaskReportService.h"
 #include "gateway-scheduler/src/tcp_server/TcpServer.h"
 #include "gateway-scheduler/src/report/MyIec61850Server.h"
+#include "gateway-scheduler/src/lora_server/LoRaServer.h"
+#include "gateway-scheduler/src/insulated-switch-server/insulated_switch_server.h"
 
 void terminate() { std::exit(1); }
 
@@ -17,14 +19,23 @@ int main(int argc, char* argv[]) {
   MESSAGE_PRINT(" scheduler starting");
   try {
 
-    int port = 512;
-    // if(argc == 2){
-    //   port = std::stoi(argv[1]);
-    // }
-    TcpServer server(port);
-    server.start_server();
+//    int port = 512;
+//    // if(argc == 2){
+//    //   port = std::stoi(argv[1]);
+//    // }
+//    TcpServer server(port);
+//    server.start_server();
 
 
+    SerialPortReader reader("/dev/ttyS9");
+    if (!reader.start()) {
+      std::cerr << "Failed to start serial reader" << std::endl;
+      return 1;
+    }
+
+    while(true){
+      sleep(1);
+    }
 
 
 //    int tcpPort = 102;

+ 1 - 1
modules/gateway-scheduler/src/tcp_server/TcpServer.cpp

@@ -232,7 +232,7 @@ void TcpServer::handle_client(int client_socket) {
             smoke_data["format_id"] = 0;
             json_save["data"].push_back(smoke_data);
         }
-//        else if (dev_type == 7) { // 烟感
+//        else if (dev_type == 7) {
 //          device_name = "空调-" + std::to_string(dev_addr);
 //          json_save["device_name"] = "空调-" + std::to_string(dev_addr);
 //          json_save["device_id"] = dev_addr;

+ 1 - 2
modules/gateway-server/CMakeLists.txt

@@ -6,7 +6,6 @@ project (gateway-server)
 # CMAKE_SOURCE_DIR path to CMakeLists.txt directory
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/deploy/bin)
 
-
 set(INCLUDE_SUBDIRECTORIES 
         ${CMAKE_SOURCE_DIR}/include
         ${CMAKE_SOURCE_DIR}/library/include
@@ -35,6 +34,6 @@ link_libraries(
 add_executable(${PROJECT_NAME} ${SRC_FILES})
 
 
-target_link_libraries(${PROJECT_NAME} PUBLIC gateway-basic)
+target_link_libraries(${PROJECT_NAME} PUBLIC gateway-basic stdc++fs)
 
 

+ 357 - 94
modules/gateway-server/src/large_screen_display/devices_info.cpp

@@ -3,43 +3,217 @@
 
 #include "devices_info.h"
 
+#include <iostream>
+#include <string>
+#include <vector>
+#include <experimental/filesystem>
+
+#include <algorithm>
+#include <map>
+#include <fstream>
+#include <sstream>
+
+
+
+namespace fs = std::experimental::filesystem;  // 使用实验性版本
+
+string device_info_path = "./res";
+
+
+std::string formatTimestamp(const std::string& filename) {
+  // 提取时间部分(假设固定格式)
+  std::string time_str = filename.substr(8, 19); // 跳过"1_"
+
+  // 转换为tm结构
+  struct tm tm = {0};
+  std::istringstream iss(time_str);
+  char delim;
+  iss >> tm.tm_year >> delim >> tm.tm_mon >> delim >> tm.tm_mday
+      >> delim >> tm.tm_hour >> delim >> tm.tm_min >> delim >> tm.tm_sec;
+
+  // 调整tm结构(年份从1900开始,月份0-11)
+  tm.tm_year -= 1900;
+  tm.tm_mon -= 1;
+
+  // 格式化为目标字符串
+  char buf[20];
+  strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tm);
+
+  return buf;
+}
+
+
+
+std::vector<string> readSingleLineCSV(const std::string& filename) {
+  std::ifstream file(filename);
+  if (!file.is_open()) {
+    throw std::runtime_error("无法打开文件: " + filename);
+  }
+
+  std::string line;
+  if (!std::getline(file, line)) {
+    return {};  // 返回空向量表示文件为空
+  }
+
+  std::vector<string> row;
+  std::stringstream ss(line);
+  std::string cell;
+
+  while (std::getline(ss, cell, ',')) {
+//    std::cout << cell << std::endl;
+    try {
+      // 移除首尾空格
+      cell.erase(0, cell.find_first_not_of(" \t"));
+      cell.erase(cell.find_last_not_of(" \t") + 1);
+
+      // 移除引号(如果有)
+      if (cell.size() >= 2 && cell.front() == '"' && cell.back() == '"') {
+        cell = cell.substr(1, cell.size() - 2);
+      }
+
+      // 转换为double
+//      row.push_back(std::stod(cell));
+      row.push_back(cell);
+    } catch (const std::exception& e) {
+      throw std::runtime_error("转换失败: '" + cell + "' 不是有效的浮点数");
+    }
+  }
+
+  return row;
+}
+
+
+std::vector<fs::directory_entry> getMatchFileWithPrefix(const std::string& path, int id){
+  std::vector<fs::directory_entry> matching_files;
+  // 遍历目录,收集所有匹配前缀的文件
+  for (const auto& entry : fs::directory_iterator(path)) {
+    std::string filename = entry.path().filename().string();
+    if (filename.rfind(to_string(id) + "_", 0) == 0) { // 检查是否以prefix开头
+      matching_files.push_back(entry);
+    }
+  }
+  return matching_files;
+}
+
+
+// 获取指定路径下以特定前缀开头的最新文件
+std::string getLatestFileWithPrefix(const std::string& path, const std::string& prefix) {
+  std::vector<fs::directory_entry> matching_files;
+
+  // 遍历目录,收集所有匹配前缀的文件
+  for (const auto& entry : fs::directory_iterator(path)) {
+    std::string filename = entry.path().filename().string();
+    if (filename.rfind(prefix, 0) == 0) { // 检查是否以prefix开头
+      matching_files.push_back(entry);
+    }
+  }
+
+  if (matching_files.empty()) {
+    return ""; // 没有找到匹配的文件
+  }
+
+  // 按最后修改时间排序(最新的排在前面)
+  std::sort(matching_files.begin(), matching_files.end(),
+            [](const fs::directory_entry& a, const fs::directory_entry& b) {
+              return fs::last_write_time(a) > fs::last_write_time(b);
+            });
+
+  return matching_files.front().path().string();
+}
+
+
+
 // 创建模拟数据
 std::vector<Device> createDeviceInfo() {
-  return {
-          {"水浸-1", {{ "水浸状态", "正常" }}},
-          {"温湿度-1", {{ "温度", "28℃" }, { "湿度", "56%" }}},
-          {"水浸-2", {{ "水浸状态", "正常" }}},
-          {"温湿度-2", {{ "温度", "28℃" }, { "湿度", "56%" }}},
-          {"水浸-3", {{ "水浸状态", "正常" }}},
-          {"温湿度-3", {{ "温度", "28℃" }, { "湿度", "56%" }}},
-          {"水浸-4", {{ "水浸状态", "正常" }}},
-          {"温湿度-4", {{ "温度", "28℃" }, { "湿度", "56%" }}},
-          {"水浸-5", {{ "水浸状态", "正常" }}},
-          {"温湿度-5", {{ "温度", "28℃" }, { "湿度", "56%" }}},
-          {"空调-1",{
-                  {"开关", "0"},
-                  {"模式", "0"},
-                  {"设定温度", "30"},
-                  {"风速", "40"},
-                  {"风向", "0"}}
-      },
-  };
+  // 检查目录是否存在
+  if (!fs::exists(device_info_path) || !fs::is_directory(device_info_path)) {
+    std::cerr << "Error: Directory '" << device_info_path << "' does not exist or is not a directory." << std::endl;
+//    return new std::vector<Device>;
+  }
+
+  // 正确做法(栈上分配)
+  std::vector<Device> devices;
+
+  // 获取以不同前缀开头的最新文件
+  std::map<std::string, std::string> latest_files;
+
+  std::string file = getLatestFileWithPrefix(device_info_path, "1_");
+  if (!file.empty()) {
+//    std::cout << "Latest file with prefix '" << "1_" << "': " << file << std::endl;
+    auto data = readSingleLineCSV(file);
+    Measure measure1 = {"温度", (data[0])};
+    Measure measure2 = {"压力", (data[1])};
+    Measure measure3 = {"电池电压", (data[2])};
+    std::vector<Measure> measures = {measure1, measure2, measure3};
+    devices.push_back({"触头感知监测终端A",measures});
+  } else {
+    std::cout << "No file found with prefix '" << "1_" << "'" << std::endl;
+  }
+
+  file = getLatestFileWithPrefix(device_info_path, "2_");
+  if (!file.empty()) {
+//    std::cout << "Latest file with prefix '" << "2_" << "': " << file << std::endl;
+    auto data = readSingleLineCSV(file);
+    Measure measure1 = {"温度", (data[0])};
+    Measure measure2 = {"压力", (data[1])};
+    Measure measure3 = {"电池电压", (data[2])};
+    std::vector<Measure> measures = {measure1, measure2, measure3};
+    devices.push_back({"触头感知监测终端B",measures});
+  } else {
+    std::cout << "No file found with prefix '" << "2_" << "'" << std::endl;
+  }
+
+  file = getLatestFileWithPrefix(device_info_path, "3_");
+  if (!file.empty()) {
+//    std::cout << "Latest file with prefix '" << "3_" << "': " << file << std::endl;
+    auto data = readSingleLineCSV(file);
+    Measure measure1 = {"温度", (data[0])};
+    Measure measure2 = {"压力", (data[1])};
+    Measure measure3 = {"电池电压", (data[2])};
+    std::vector<Measure> measures = {measure1, measure2, measure3};
+    devices.push_back({"触头感知监测终端C",measures});
+  } else {
+    std::cout << "No file found with prefix '" << "3_" << "'" << std::endl;
+  }
+  return devices;
+
+
+//  return {
+//          {"水浸-1", {{ "水浸状态", "正常" }}},
+//          {"温湿度-1", {{ "温度", "28℃" }, { "湿度", "56%" }}},
+//          {"水浸-2", {{ "水浸状态", "正常" }}},
+//          {"温湿度-2", {{ "温度", "28℃" }, { "湿度", "56%" }}},
+//          {"水浸-3", {{ "水浸状态", "正常" }}},
+//          {"温湿度-3", {{ "温度", "28℃" }, { "湿度", "56%" }}},
+//          {"水浸-4", {{ "水浸状态", "正常" }}},
+//          {"温湿度-4", {{ "温度", "28℃" }, { "湿度", "56%" }}},
+//          {"水浸-5", {{ "水浸状态", "正常" }}},
+//          {"温湿度-5", {{ "温度", "28℃" }, { "湿度", "56%" }}},
+//          {"空调-1",{
+//                  {"开关", "0"},
+//                  {"模式", "0"},
+//                  {"设定温度", "30"},
+//                  {"风速", "40"},
+//                  {"风向", "0"}}
+//      },
+//  };
 }
 
 std::vector<AllowDevice> allowDevice() {
-  return {
-      {"水浸-1"},
-      {"温湿度-1"},
-      {"水浸-2"},
-      {"温湿度-2"},
-      {"水浸-3"},
-      {"温湿度-3"},
-      {"水浸-4"},
-      {"温湿度-4"},
-      {"水浸-5"},
-      {"温湿度-5"},
-      {"空调-1"},
-  };
+  return {{"ABCDEF1234A1"}, {"ABCDEF1234B1"}, {"ABCDEF1234C1"}};
+//  return {
+//      {"水浸-1"},
+//      {"温湿度-1"},
+//      {"水浸-2"},
+//      {"温湿度-2"},
+//      {"水浸-3"},
+//      {"温湿度-3"},
+//      {"水浸-4"},
+//      {"温湿度-4"},
+//      {"水浸-5"},
+//      {"温湿度-5"},
+//      {"空调-1"},
+//  };
 }
 
 std::vector<Device> control_devices_status() {
@@ -76,47 +250,136 @@ std::vector<Device> control_devices_status() {
   };
 }
 
-std::vector<DeviceHistory> createDeviceHistoryData() {
-    return {
-        {
-            "温湿度-1",
-            {
-                {"湿度", {{"12:00", 56.0f}, {"13:00", 58.0f}, {"14:00", 60.0f}, {"15:00", 79.0f}, {"16:00", 72.0f}}},
-                {"温度", {{"12:00", 72.0f}, {"13:00", 74.0f}, {"14:00", 76.0f}, {"15:00", 79.0f}, {"16:00", 72.0f}}}
-            }
-        },
-        {
-            "温湿度-2",
-            {
-                {"湿度", {{"12:00", 56.0f}, {"13:00", 58.0f}, {"14:00", 60.0f}}},
-                {"温度", {{"12:00", 72.0f}, {"13:00", 74.0f}, {"14:00", 76.0f}}}
-            }
-        },
-        {
-            "水浸-1",
-            {
-                {"水浸状态", {{"12:00", 0}, {"13:00", 0}, {"14:00", 0}}}
-            }
-        },
-        {
-            "水浸-2",
-            {
-                {"水浸状态", {{"12:00", 0}, {"13:00", 0}, {"14:00", 0}}}
-            }
-        },
-        {
-            "烟感-1",
-            {
-                {"烟雾状态", {{"12:00", 0}, {"13:00", 0}, {"14:00", 0}}}
-            }
-        },
-        {
-            "烟感-2",
-            {
-                {"烟雾状态", {{"12:00", 0}, {"13:00", 0}, {"14:00", 1}}}
-            }
-        },
-    };
+//json createDeviceHistoryData() {
+//  // 创建根数组
+//  json root = json::array();
+//
+//  // 设备列表
+//  std::vector<std::string> devices = {"温湿度-1", "温湿度-2", "水浸-1", "水浸-2", "烟感-1", "烟感-2"};
+//  std::vector<std::string> timestamps = {"2025-04-02 12:00:00", "2025-04-02 12:15:00", "2025-04-02 12:30:00"};
+//
+//  for (const auto& device : devices) {
+//    // 创建设备对象
+//    json device_obj;
+//    device_obj["device_name"] = device;
+//
+//    // 创建 measurements 数组
+//    json measurements = json::array();
+//
+//    for (size_t j = 0; j < timestamps.size(); ++j) {
+//      // 创建时间点对象
+//      json timestamp_obj;
+//      timestamp_obj["timestamp"] = timestamps[j];
+//
+//      // 创建 values 数组
+//      json values_array = json::array();
+//
+//      if (device.find("温湿度") != std::string::npos) {
+//        // 湿度和温度数据
+//        json humidity;
+//        humidity["name"] = "湿度";
+//        humidity["value"] = 56.0 + j * 2.5; // 动态值
+//        values_array.push_back(humidity);
+//
+//        json temperature;
+//        temperature["name"] = "温度";
+//        temperature["value"] = 72.0 + j * 1.5; // 动态值
+//        values_array.push_back(temperature);
+//      } else if (device.find("水浸") != std::string::npos) {
+//        // 水浸状态数据
+//        json water_leak;
+//        water_leak["name"] = "水浸状态";
+//        water_leak["value"] = (j % 2 == 0) ? 1 : 0; // 动态值
+//        values_array.push_back(water_leak);
+//      } else if (device.find("烟感") != std::string::npos) {
+//        // 烟雾状态数据
+//        json smoke;
+//        smoke["name"] = "烟雾状态";
+//        smoke["value"] = (j % 2 == 0) ? 1 : 0; // 动态值
+//        values_array.push_back(smoke);
+//      }
+//
+//      // 将 values 数组添加到时间点对象
+//      timestamp_obj["values"] = values_array;
+//
+//      // 将时间点对象添加到 measurements 数组
+//      measurements.push_back(timestamp_obj);
+//    }
+//
+//    // 将 measurements 数组添加到设备对象
+//    device_obj["measurements"] = measurements;
+//
+//    // 将设备对象添加到根数组
+//    root.push_back(device_obj);
+//  }
+//
+//  // 打印生成的 JSON 数据
+//  std::cout << root.dump(4) << std::endl; // 格式化输出,缩进为 4 个空格
+//
+//  return root;
+//}
+
+json createDeviceHistoryJson(int id){
+
+  json measurements = json::array();
+
+
+  std::vector<fs::directory_entry> files = getMatchFileWithPrefix(device_info_path, id);
+  for(const auto file :files){
+    json timestamp_obj;
+    timestamp_obj["timestamp"] = formatTimestamp(file.path().string());
+
+    std::cout << "file : " << file.path().string() << std::endl;
+    auto data = readSingleLineCSV(file.path().string());
+
+    json values_array = json::array();
+    // 温度数据
+    json temperature;
+    temperature["name"] = "温度";
+    temperature["value"] = data[0]; // 动态值
+    values_array.push_back(temperature);
+    // 压力数据
+    json pressure;
+    pressure["name"] = "压力";
+    pressure["value"] = data[1]; // 动态值
+    values_array.push_back(pressure);
+    // 电池电压数据
+    json battery_voltage;
+    battery_voltage["name"] = "电池电压";
+    battery_voltage["value"] = data[2]; // 动态值
+    values_array.push_back(battery_voltage);
+    // 将 values 数组添加到时间点对象
+    timestamp_obj["values"] = values_array;
+    // 将时间点对象添加到 measurements 数组
+    measurements.push_back(timestamp_obj);
+  }
+  return measurements;
+}
+
+json createDeviceHistoryData() {
+  // 创建根数组
+  json root = json::array();
+
+  json device_obj;
+  device_obj["device_name"] = "触头感知监测终端A";
+  // 将 measurements 数组添加到设备对象
+  device_obj["measurements"] = createDeviceHistoryJson(1);
+  root.push_back(device_obj);
+
+  device_obj["device_name"] = "触头感知监测终端B";
+  // 将 measurements 数组添加到设备对象
+  device_obj["measurements"] = createDeviceHistoryJson(2);
+  root.push_back(device_obj);
+
+  device_obj["device_name"] = "触头感知监测终端C";
+  // 将 measurements 数组添加到设备对象
+  device_obj["measurements"] = createDeviceHistoryJson(3);
+  root.push_back(device_obj);
+
+  // 打印生成的 JSON 数据
+  std::cout << root.dump(4) << std::endl; // 格式化输出,缩进为 4 个空格
+
+  return root;
 }
 
 
@@ -147,24 +410,24 @@ json deviceInfoToJson(const std::vector<Device>& devices) {
   return j;
 }
 
-json deviceHistoryToJson(const std::vector<DeviceHistory>& devices_history) {
-    json j;
-
-    for (const auto& device : devices_history) {
-        json device_data = json::object();
-        for (const auto& measurement : device.measurements) {
-            json measurement_data = json::array();
-            for (const auto& item : measurement.historyItems) {
-                json data_point = {
-                    {"time", item.time},
-                    {"value", item.value}
-                };
-                measurement_data.push_back(data_point);
-            }
-            device_data[measurement.name] = measurement_data;
-        }
-        j[device.device_name] = device_data;
-    }
-
-    return j;
-}
+//json deviceHistoryToJson(const std::vector<DeviceHistory>& devices_history) {
+//    json j;
+//
+//    for (const auto& device : devices_history) {
+//        json device_data = json::object();
+//        for (const auto& measurement : device.measurements) {
+//            json measurement_data = json::array();
+//            for (const auto& item : measurement.historyItems) {
+//                json data_point = {
+//                    {"time", item.time},
+//                    {"value", item.value}
+//                };
+//                measurement_data.push_back(data_point);
+//            }
+//            device_data[measurement.name] = measurement_data;
+//        }
+//        j[device.device_name] = device_data;
+//    }
+//
+//    return j;
+//}

+ 19 - 19
modules/gateway-server/src/large_screen_display/devices_info.h

@@ -10,47 +10,47 @@
 #include <nlohmann/json.hpp>
 #include <vector>
 #include <string>
-
+using namespace std;
 using json = nlohmann::json;
 // 模拟的数据结构
 struct Measure {
-  std::string point;
-  std::string value;
+  string point;
+  string value;
 };
 
 struct Device {
-  std::string device_name;
-  std::vector<Measure> measures;
+  string device_name;
+  vector<Measure> measures;
 };
 struct AllowDevice {
-  std::string device_name;
+  string device_name;
 };
 
 // 定义 HistoryItem 结构体
 struct HistoryItem {
-  std::string time;
-  float value;
+  string time;                  // 时间戳
+  map<string, float> values; // 测点名称 -> 测点值的映射
 };
 
 // 定义 DeviceMeasurement 结构体
 struct DeviceMeasurement {
-  std::string name;
-  std::vector<HistoryItem> historyItems;
+  string name;                 // 测点名称(如 "湿度"、"温度" 等)
+  vector<HistoryItem> historyItems; // 多个时间点的历史数据
 };
 
 // 定义 DeviceHistory 结构体
 struct DeviceHistory {
-  std::string device_name;
-  std::vector<DeviceMeasurement> measurements;
+  string device_name;          // 设备名称(如 "温湿度-1"、"烟感-1" 等)
+  vector<DeviceMeasurement> measurements; // 该设备的所有测点数据
 };
 
 
 
-std::vector<Device> control_devices_status();
-json deviceInfoToJson(const std::vector<Device>& devices);
-std::vector<Device> createDeviceInfo();
-std::vector<AllowDevice> allowDevice();
-std::vector<DeviceHistory> createDeviceHistoryData();
-json deviceHistoryToJson(const std::vector<DeviceHistory>& devices_history);
-json allowDeviceInfoToJson(const std::vector<AllowDevice>& devices);
+vector<Device> control_devices_status();
+json deviceInfoToJson(const vector<Device>& devices);
+vector<Device> createDeviceInfo();
+vector<AllowDevice> allowDevice();
+json createDeviceHistoryData();
+json deviceHistoryToJson(const vector<DeviceHistory>& devices_history);
+json allowDeviceInfoToJson(const vector<AllowDevice>& devices);
 #endif //DEVICES_INFO_H

+ 21 - 20
modules/gateway-server/src/server/BasicServer.cpp

@@ -52,6 +52,7 @@ BasicRoute generate_route(std::string path, std::string method) { /**/
   return route;
 } /**/
 
+
 MHD_Result BasicServer::requestHandler(void* cls, struct MHD_Connection* connection, const char* url, const char* method, const char* version, const char* upload_data, size_t* upload_data_size, void** req_cls) { /**/
   // 打印 cls
 //  std::cout << "cls: " << cls << std::endl;
@@ -116,8 +117,8 @@ MHD_Result BasicServer::requestHandler(void* cls, struct MHD_Connection* connect
 //        std::cout << "largeScreenDisplay video" << std::endl;
       } else if (url_string.find("/history_data") != std::string::npos) {
         std::cout << "largeScreenDisplay history_data" << std::endl;
-        auto devices_history = createDeviceHistoryData();
-        Json response_json = deviceHistoryToJson(devices_history);
+//        auto devices_history = createDeviceHistoryData();
+        Json response_json = createDeviceHistoryData();
 //        std::cout << response_json.dump(4) << std::endl;
         response = response_json.dump();
       } else if (url_string.find("/devices_info") != std::string::npos) {
@@ -141,24 +142,24 @@ MHD_Result BasicServer::requestHandler(void* cls, struct MHD_Connection* connect
       response = response_json.dump();
     }else if (url_string.find("/add-allow-device") != std::string::npos) {
 
-//      static std::string post_data; // 存储请求体数据
-//      std::cout << post_data << std::endl;
-//
-//      if (*upload_data_size != 0) {
-//        // 拼接上传的数据块
-//        post_data.append(upload_data, *upload_data_size);
-//        *upload_data_size = 0; // 告诉 MicroHTTPD 数据已处理
-//        return MHD_YES; // 继续接收数据
-//      }
-//
-//      if (!post_data.empty()) {
-//        json request_body = json::parse(post_data);
-//        std::string sensorName = request_body["sensorName"];
-//        std::cout << "Received sensorName: " << sensorName << std::endl;
-//
-//        const char* response = "{\"message\":\"添加成功\"}";
-//        post_data.clear();
-//      }
+      std::cout << "largeScreenDisplay add-allow-device" << std::endl;
+      // 获取查询参数
+      const char *query = MHD_lookup_connection_value(
+          connection, MHD_GET_ARGUMENT_KIND, "sensorName");
+      if (query) {
+//        std::string sensorName = urldecode(query); // 解码
+        std::cout << "设备名称: " << query << std::endl; // "空调-3"
+      }
+    }else if (url_string.find("/delete-allow-device") != std::string::npos) {
+
+      std::cout << "largeScreenDisplay delete-allow-device" << std::endl;
+      // 获取查询参数
+      const char *query = MHD_lookup_connection_value(
+          connection, MHD_GET_ARGUMENT_KIND, "sensorName");
+      if (query) {
+        //        std::string sensorName = urldecode(query); // 解码
+        std::cout << "设备名称: " << query << std::endl; // "空调-3"
+      }
     }
     else {
       BasicRoute route = generate_route(url, method);

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio