ソースを参照

消息通知修改

xujie 1 年間 前
コミット
37c0dfeb65

+ 2 - 2
project_data/sql/0.1.1/soc/soc.sql

@@ -1201,7 +1201,7 @@ CREATE TABLE `core_notice_rule_item` (
                                          `rule_id` bigint NOT NULL COMMENT '通知规则id',
                                          `org_id` bigint NOT NULL COMMENT '接收消息的组织机构id',
                                          `role_id` bigint DEFAULT NULL COMMENT '角色id',
-                                         `user_ids` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                         `user_ids` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
                                          `send_sms` int DEFAULT NULL COMMENT '是否发送短信:0.否 1.是',
                                          `all_role_user` int NOT NULL DEFAULT '0' COMMENT '是否选择角色下所有用户:0.否 1.是',
                                          `product_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '传感器产品名称',
@@ -1223,7 +1223,7 @@ CREATE TABLE `websocket_notice_log` (
                                         `id` bigint NOT NULL,
                                         `iot_alarm_id` bigint DEFAULT NULL,
                                         `org_id` bigint DEFAULT NULL,
-                                        `user_ids` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+                                        `user_ids` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
                                         `is_do` int DEFAULT NULL COMMENT '是否处理:0.否 1.是',
                                         `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                                         `deal_time` datetime DEFAULT NULL COMMENT '处理时间',

+ 1 - 1
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/notice/service/impl/WebsocketNoticeLogServiceImpl.java

@@ -56,7 +56,7 @@ public class WebsocketNoticeLogServiceImpl extends ServiceImpl<WebsocketNoticeLo
         if(ObjectUtil.isNotEmpty(websocketNoticeLog)){
             WebSocketNoticeVo noticeVo = new WebSocketNoticeVo();
             noticeVo.setIotAlarmDataId(iotAlarmData.getId());
-            noticeVo.setIsDo(0);
+            noticeVo.setIsDo(1);
             noticeVo.setOrgId(deviceInfo.getOrgId());
 
             String userIds = websocketNoticeLog.getUserIds();