From 9c73489b111ef0107dc837c59370d20edc190c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9B=90=ED=98=95?= <147372294+blissyou@users.noreply.github.com> Date: Thu, 26 Jun 2025 15:18:46 +0900 Subject: [PATCH] =?UTF-8?q?front-end=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/device/DeviceDTO.java | 3 + .../model/device/WifiSSIDS.java | 6 + .../model/device/subDTO/Lte.java | 14 + .../service/SettingService.java | 3 +- src/main/resources/static/index.html | 1211 +++++++++++++---- 5 files changed, 950 insertions(+), 287 deletions(-) create mode 100644 src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Lte.java diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java index a74fa08..c0833e0 100644 --- a/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java @@ -33,6 +33,9 @@ public class DeviceDTO { @JsonUnwrapped private Imu imuConfig; + @JsonUnwrapped + private Lte lteConfig; + @JsonProperty("WIFI_SSID") private List wifiSsid; } \ No newline at end of file diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java index 71ba1d9..3485fd7 100644 --- a/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java @@ -1,6 +1,8 @@ package org.mobidgim.mobidigimproject.model.device; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.Data; import org.mobidgim.mobidigimproject.model.device.enums.WiFiSecurity; @@ -8,7 +10,11 @@ import org.mobidgim.mobidigimproject.model.device.enums.WiFiSecurity; @Data public class WifiSSIDS { + + @JsonProperty("wifi_ssid") private String wifiSsid; + @JsonProperty("wifi_password") private String wifiPassword; + private WiFiSecurity wifiSecurity; } diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Lte.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Lte.java new file mode 100644 index 0000000..0e88899 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Lte.java @@ -0,0 +1,14 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Lte { + @JsonProperty("lte_ip") + private String LTEip; + @JsonProperty("lte_subnet") + private String LTEsubnet; + @JsonProperty("lte_gateway") + private String LTEgateway; + @JsonProperty("lte_port") + private int LTEport; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java b/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java index 8e59887..bd5e5bb 100644 --- a/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java +++ b/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java @@ -107,11 +107,10 @@ public class SettingService { Files.write(Paths.get("./temp/registerConfig.json"),json.getBytes(StandardCharsets.UTF_8)); return true; } - catch(Exception e){ + catch(Exception e) { e.printStackTrace(); return false; } - } } diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index e91bc4a..64632a9 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -1,132 +1,667 @@ - - + + Device Configuration UI @@ -165,8 +700,8 @@