From ce910c8cec901b061317d4ccc6373c2b03cdfbf6 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 24 十月 2024 17:41:06 +0800 Subject: [PATCH] 1、修改应用菜单权限等,增加根据应用id查询该应用下的二级菜单,并且转成一级菜单展示 2、数据采集模块增加大华和海康摄像头的sdk工具及相关代码 3、移除data和model模块iailab-common-biz-data-permission依赖重复,解决打包报错的bug 4、data-biz模块左右openscada依赖都需要排除bcprov-jdk15on,否则会导致打包报错 5、其它相关修改 --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointCollectTaskNet10.java | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointCollectTaskNet10.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointCollectTaskNet10.java index ee24b22..ca876dd 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointCollectTaskNet10.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/task/PointCollectTaskNet10.java @@ -1,7 +1,6 @@ package com.iailab.module.data.job.task; import com.iailab.module.data.point.collection.PointCollector; -import com.xxl.job.core.handler.annotation.XxlJob; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.annotation.Resource; @@ -28,9 +27,7 @@ private PointCollector pointCollector; @Override - @XxlJob("pointCollectTaskNet10") public void run(String params){ - // 0/10 * * * * ? logger.debug("PointCollectTaskNet10定时任务正在执行,参数为:{}", params); try { Calendar calendar = Calendar.getInstance(); -- Gitblit v1.9.3