diff --git a/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml b/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml
deleted file mode 100644
index 973a5a4..0000000
--- a/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml
+++ /dev/null
@@ -1,483 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- C:\Users\XIOS\AppData\Roaming\Subversion
-
-
-
-
- 1661333758208
-
-
- 1661333758208
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1661504382339
-
-
-
- 1661504382340
-
-
- 1661505205169
-
-
-
- 1661505205169
-
-
- 1663209401377
-
-
-
- 1663209401377
-
-
- 1663925693595
-
-
-
- 1663925693595
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/Utils/GenerateIdUtil.java
- 27
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/DeviceController.java
- 65
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/impl/RequestLogInfoServiceImpl.java
- 36
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
- 7
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
- 8
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/AlarmInfoService.java
- 15
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/Utils/CsvUtils.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/Utils/CsvUtils.java
index 8c4bc3c..121497d 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/Utils/CsvUtils.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/Utils/CsvUtils.java
@@ -20,12 +20,24 @@ public class CsvUtils {
JSONObject items =jsonArray.getJSONObject(i);
stringBuffer.append(items.getString("value_name")).append(",")
.append(items.getString("area_char")).append(",")
- .append(items.getInteger("data_type")).append(",")
- .append(items.getInteger("start_address")).append(",")
- .append(items.getInteger("bit_address")).append(",")
- .append(items.getInteger("data_length")).append("\n");
+ .append(items.getString("data_type")).append(",")
+ .append(items.getString("start_address")).append(",")
+ .append(items.getString("bit_address")).append(",")
+ .append(items.getString("data_length")).append("\n");
}
return stringBuffer;
}
+
+ public static void main(String args[]){
+ double a=67155434.21;
+ double b=98531205.19;
+ while(a/b>0.25){
+ a=a-3.5;
+ b=b+1;
+ }
+ String A=String.format("%.2f", a);
+ String B =String.format("%.2f", b);
+ System.out.println("a="+A+"b="+B);
+ }
}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
index 4e734b1..f2a1820 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
@@ -1,5 +1,7 @@
package com.aiit.xiuos;
+import com.aiit.xiuos.socket.SocketClient;
+import com.aiit.xiuos.socket.SocketServer;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,6 +19,12 @@ public class XiuosApplication {
public static void main(String[] args) {
try {
SpringApplication.run(XiuosApplication.class, args);
+
+ //启动208的客户端
+// Thread clientThread = new Thread(() -> {
+// SocketClient.main(new String[] {}); // 替换成你的 Socket Client 主类
+// });
+// clientThread.start();
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/redis/RedisUtil.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/redis/RedisUtil.java
index 9108231..9e889ad 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/redis/RedisUtil.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/redis/RedisUtil.java
@@ -91,15 +91,15 @@ public class RedisUtil {
/**
* listOperations使用
*/
- public void lset(String key, List