[fix]: fix taos table structure

hellochenpg · Jan 10, 2022 · 6661bb2 · 6661bb2
1 parent 23162cb
commit 6661bb2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/...ava/com/zmops/zeus/iot/server/storage/plugin/jdbc/tdengine/TDEngineDatabaseInstaller.java b/...ava/com/zmops/zeus/iot/server/storage/plugin/jdbc/tdengine/TDEngineDatabaseInstaller.java
@@ -20,7 +20,7 @@ public class TDEngineDatabaseInstaller {
 
     private static final String CREATE_ZEUS_STABLE_HISTORY = "create stable if not exists history(clock TIMESTAMP, value DOUBLE) tags (deviceid BINARY(64), itemid BINARY(20))";
     private static final String CREATE_ZEUS_STABLE_HISTORY_UINT = "create stable if not exists history_uint(clock TIMESTAMP, value BIGINT) tags (deviceid BINARY(64), itemid BINARY(20))";
-    private static final String CREATE_ZEUS_STABLE_HISTORY_TEXT = "create stable if not exists history_text(clock TIMESTAMP, value NCHAR(255)) tags (deviceid BINARY(64), itemid BINARY(20))";
+    private static final String CREATE_ZEUS_STABLE_HISTORY_TEXT = "create stable if not exists history_text(clock TIMESTAMP, value NCHAR(2048)) tags (deviceid BINARY(64), itemid BINARY(20))";
     private static final String CREATE_ZEUS_STABLE_HISTORY_STR = "create stable if not exists history_str(clock TIMESTAMP, value NCHAR(255)) tags (deviceid BINARY(64), itemid BINARY(20))";
 
 

diff --git a/zeus-webapp/src/main/java/com/zmops/iot/web/exception/enums/BizExceptionEnum.java b/zeus-webapp/src/main/java/com/zmops/iot/web/exception/enums/BizExceptionEnum.java
@@ -215,6 +215,7 @@ public enum BizExceptionEnum implements AbstractBaseExceptionEnum {
     PROTOCOL_COMPONENT_HAS_BIND_GATEWAY(2303, "协议组件已绑定协议网关,不能删除"),
     PROTOCOL_SERVICE_EXISTS(2304, "通信服务名称已存在"),
     PROTOCOL_SERVICE_NOT_EXISTS(2305, "通信服务不存在"),
+    PROTOCOL_SERVICE_PORT_EXISTS(2310, "端口已存在"),
     PROTOCOL_SERVICE_HAS_BIND_GATEWAY(2306, "通信服务已绑定协议网关,不能删除"),
     PROTOCOL_GATEWAY_NOT_EXISTS(2307, "协议网关不存在"),
     PROTOCOL_SERVICE_HAS_BIND_COMPONENT(2308, "通信服务已绑定协议协议组件"),

diff --git a/...webapp/src/main/java/com/zmops/iot/web/protocol/controller/ProtocolServiceController.java b/...webapp/src/main/java/com/zmops/iot/web/protocol/controller/ProtocolServiceController.java
@@ -53,6 +53,10 @@ public ResponseData create(@Validated(BaseEntity.Create.class) @RequestBody Prot
         if (count > 0) {
             throw new ServiceException(BizExceptionEnum.PROTOCOL_SERVICE_EXISTS);
         }
+        count = new QProtocolService().ip.eq(protocolServiceParam.getIp()).port.eq(protocolServiceParam.getPort()).findCount();
+        if (count > 0) {
+            throw new ServiceException(BizExceptionEnum.PROTOCOL_SERVICE_PORT_EXISTS);
+        }
         return ResponseData.success(protocolSvrService.create(protocolServiceParam));
     }
 
@@ -65,6 +69,10 @@ public ResponseData update(@Validated(BaseEntity.Update.class) @RequestBody Prot
         if (count > 0) {
             throw new ServiceException(BizExceptionEnum.PROTOCOL_SERVICE_EXISTS);
         }
+        count = new QProtocolService().ip.eq(protocolServiceParam.getIp()).port.eq(protocolServiceParam.getPort()).protocolServiceId.ne(protocolServiceParam.getProtocolServiceId()).findCount();
+        if (count > 0) {
+            throw new ServiceException(BizExceptionEnum.PROTOCOL_SERVICE_PORT_EXISTS);
+        }
         return ResponseData.success(protocolSvrService.update(protocolServiceParam));
     }