24282 %!s(int64=2) %!d(string=hai) anos
pai
achega
a397789386

+ 5 - 4
config

@@ -2,7 +2,7 @@
 # serverIp  服务ip
 # deviceId  华为云配置deviceId
 # secret    华为云配置secret
-# connectConfigList 设备配置 {[
+# connectConfigList 设备配置 [
 #   equipmentNo     设备编号
 #   ipAddress       设备ip地址
 #   port            设备ip端口号
@@ -24,7 +24,7 @@
 #           holdingRegistersOffSet          4x开始读取地址 默认:0
 #           holdingRegistersQuantity        4x读取位数 默认:100
 #   }
-# ]}
+# ]
 #
 # configurationUrl       组态软件url
 # configurationUsername  组态软件账号
@@ -35,12 +35,13 @@
 
 {
     "debug": true,
-    "serverIp": "a1625d5cc8.iot-mqtts.cn-north-4.myhuaweicloud.com",
-    "deviceId": "syringe_ipc_syringe_smt",
+    "serverIp": "a0ba517e07.st1.iotda-device.ap-southeast-1.myhuaweicloud.com",
+    "deviceId": "smt_230601_001",
     "secret": "fjhx2012",
 
     "connectConfigList": [
 
+
     ],
 
     "configurationUrl": "http://192.168.1.43:9433/",

+ 1 - 1
src/main/java/com/fjhx/MyMain.java

@@ -41,7 +41,7 @@ public class MyMain {
             EquipmentAbstract equipment = EquipmentEnum.getEquipment(connectConfig);
             if (equipment == null) continue;
 
-            CronUtil.schedule("0/3 * * * * *", (Task) () -> {
+            CronUtil.schedule("0/8 * * * * *", (Task) () -> {
                 String data = equipment.readDataStr();
                 MyUtil.infoLog(data);
 

+ 5 - 1
src/main/java/com/fjhx/emums/EquipmentEnum.java

@@ -57,7 +57,11 @@ public enum EquipmentEnum {
         }
 
         EquipmentAbstract equipmentAbstract = equipmentEnum.equipment.newInstance();
-        equipmentAbstract.init(connectConfig, equipmentEnum.agreementEnum);
+        try {
+            equipmentAbstract.init(connectConfig, equipmentEnum.agreementEnum);
+        } catch (Exception e) {
+            System.out.println("编号为" + connectConfig.getEquipmentNo() + "的设备连接失败");
+        }
         return equipmentAbstract;
     }
 

+ 7 - 3
src/main/java/com/fjhx/equipment/ConfigurationUpload.java

@@ -56,7 +56,11 @@ public class ConfigurationUpload {
     private String token;
 
     public static void execute(ConfigEntity config) {
-        new ConfigurationUpload(config);
+        try {
+            new ConfigurationUpload(config);
+        } catch (Exception e) {
+            System.out.println("组态软件连接失败");
+        }
     }
 
     private ConfigurationUpload(ConfigEntity config) {
@@ -89,7 +93,7 @@ public class ConfigurationUpload {
     private void start() {
         refreshToken();
         for (String device : configurationDeviceNameList) {
-            CronUtil.schedule("0/3 * * * * *", (Task) () -> {
+            CronUtil.schedule("0/8 * * * * *", (Task) () -> {
                 List<ConfigurationData> dataList = getDataList(device);
                 MyUtil.infoLog(JSONObject.toJSONString(dataList));
 
@@ -165,7 +169,7 @@ public class ConfigurationUpload {
         properties.put("DeviceData", JSON.toJSONString(uploadEntity));
 
         Map<String, Object> service = new HashMap<>();
-        service.put("service_id", "Data");
+        service.put("service_id", "data");
         service.put("properties", properties);
 
         Map<Object, Object> services = new HashMap<>();