Explorar el Código

fix: 通讯组件

jay hace 2 años
padre
commit
38e0f41957

BIN
data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.3-SNAPSHOT.jar → data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.5-SNAPSHOT.jar


BIN
data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-http-biz-component-0.4.3-SNAPSHOT.jar → data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-http-biz-component-0.4.5-SNAPSHOT.jar


BIN
data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-DLT645-component-0.4.3-SNAPSHOT.jar → data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-DLT645-component-0.4.5-SNAPSHOT.jar


BIN
data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.3-SNAPSHOT.jar → data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.5-SNAPSHOT.jar


BIN
data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.3-SNAPSHOT.jar → data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.5-SNAPSHOT.jar


+ 5 - 5
data/init/protocolComponent.json

@@ -5,7 +5,7 @@
     "name": "MQTT标准协议组件",
     "type": "device",
     "protocol": "mqtt",
-    "jarFile": "iot-mqtt-component-0.4.3-SNAPSHOT.jar",
+    "jarFile": "iot-mqtt-component-0.4.5-SNAPSHOT.jar",
     "config": "{\"port\":1883,\"ssl\":false,\"type\":\"server\"}",
     "converter": "6260396d67aced2696184053",
     "converType": "custom",
@@ -18,7 +18,7 @@
     "name": "EMQX标准协议组件",
     "type": "device",
     "protocol": "mqtt",
-    "jarFile": "iot-emqx-component-0.4.3-SNAPSHOT.jar",
+    "jarFile": "iot-emqx-component-0.4.5-SNAPSHOT.jar",
     "config": "{\"port\":\"1884\",\"ssl\":false,\"type\":\"client\",\"subscribeTopics\":[\"/sys/+/+/s/#\",\"/sys/client/connected\",\"/sys/client/disconnected\",\"/sys/session/subscribed\",\"/sys/session/unsubscribed\"],\"authPort\":\"8088\",\"broker\":\"127.0.0.1\",\"clientId\":\"test\",\"username\":\"test\",\"password\":\"123\"}",
     "converter": "6260396d67aced2696184053",
     "converType": "custom",
@@ -31,7 +31,7 @@
     "name": "小度音箱接入组件",
     "type": "biz",
     "protocol": "http",
-    "jarFile": "iot-http-biz-component-0.4.3-SNAPSHOT.jar",
+    "jarFile": "iot-http-biz-component-0.4.5-SNAPSHOT.jar",
     "config": "{\"port\":\"8084\"}",
     "converter": "",
     "converType": "",
@@ -44,7 +44,7 @@
     "name": "WEBSOCKET服务端",
     "type": "device",
     "protocol": "websocket",
-    "jarFile": "iot-websocket-component-0.4.3-SNAPSHOT.jar",
+    "jarFile": "iot-websocket-component-0.4.5-SNAPSHOT.jar",
     "config": "{\"port\":\"2454\",\"ssl\":false,\"type\":\"server\",\"ip\":\"\",\"url\":\"\",\"heartBeatTime\":10000,\"heartBeatData\":\"\",\"accessTokens\":[{\"id\":\"b4f02276-13d8-499d-89b3-8acd6330b310\",\"tokenName\":\"tokrn\",\"tokenStr\":\"NxW4nPt2SPnc87pdFXAQmCZY4Kb0nRsPDC6z4Qzpp1AtRWDJxg8iZMqFpcwZ2igi\"}]}",
     "converter": "d7e84930-5460-4638-aa3f-e0c2015628f4",
     "converType": "custom",
@@ -58,7 +58,7 @@
     "name": "DLT645电表通讯组件",
     "type": "device",
     "protocol": "tcp",
-    "jarFile": "iot-DLT645-component-0.4.3-SNAPSHOT.jar",
+    "jarFile": "iot-DLT645-component-0.4.5-SNAPSHOT.jar",
     "config": "{\"port\":2424,\"ssl\":false,\"type\":\"server\",\"parserType\":\"不处理\",\"parserConfiguration\":{\"delimited\":\"\",\"fix\":1,\"script\":\"\"},\"host\":\"127.0.0.1\"}",
     "converType": "static",
     "state": "stopped",

+ 3 - 2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java

@@ -51,8 +51,9 @@ public class ProtocolController {
 
     @ApiOperation("修改组件")
     @PostMapping("/editComponent")
-    public String saveComponent(@RequestBody @Validated Request<ProtocolComponentBo> bo) {
-       return protocolService.saveComponent(bo.getData());
+    public boolean saveComponent(@RequestBody @Validated Request<ProtocolComponentBo> bo) {
+        protocolService.saveComponent(bo.getData());
+        return true;
     }
 
     @ApiOperation("获取组件详情")

+ 1 - 2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolcomponent/ProtocolComponentBo.java

@@ -29,12 +29,11 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProtocolComponent.class, reverseConvertGenerate = false)
 public class ProtocolComponentBo extends BaseDto {
+    private static final long serialVersionUID = -1L;
 
     @ApiModelProperty(value = "")
     private String id;
 
-    private static final long serialVersionUID = -1L;
-
     @ApiModelProperty(value = "")
     @Size(max = 65535, message = "长度不正确")
     private String config;