|
@@ -79,12 +79,11 @@ public class NettyMsgHandler {
|
|
|
* @version V1.0 2021/10/25 8:27 下午
|
|
|
*/
|
|
|
public void cacheAllObjConditionRel(Object msg) {
|
|
|
- log.debug("正在同步报警条件与设备的关联关系");
|
|
|
List<ObjConditionRel> content = getObjConditionRelList(msg);
|
|
|
if (CollectionUtils.isEmpty(content)) {
|
|
|
- log.debug("接收到的消息中报警条件与设备的关联关系为空");
|
|
|
+ log.error("接收到的消息中报警条件与设备的关联关系为空");
|
|
|
}
|
|
|
- log.debug("报警条件与设备的关联关系 -> 项目id:[{}], 同步条数[{}]",
|
|
|
+ log.info("正在同步报警条件与设备的关联关系 -> 项目id:[{}], 同步条数[{}]",
|
|
|
content.get(0).getProjectId(), content.size());
|
|
|
try {
|
|
|
LockUtil.getInstance().lock.lock();
|
|
@@ -92,6 +91,8 @@ public class NettyMsgHandler {
|
|
|
alarmConditionService.cacheObjConditionRelList(content);
|
|
|
LockUtil.getInstance().setExecute(true);
|
|
|
LockUtil.getInstance().condition.signalAll();
|
|
|
+ log.info("同步报警条件与设备的关联关系完成 -> 项目id:[{}]",
|
|
|
+ content.get(0).getProjectId());
|
|
|
} catch (Exception e) {
|
|
|
log.error("同步设备与报警条件关联关系发生异常", e);
|
|
|
} finally {
|
|
@@ -124,7 +125,7 @@ public class NettyMsgHandler {
|
|
|
* @version V1.0 2021/10/22 3:21 下午
|
|
|
*/
|
|
|
public void cacheAllAlarmConditions(Object msg) {
|
|
|
- log.debug("开始全量同步报警条件");
|
|
|
+ log.info("开始全量同步报警条件");
|
|
|
List<AlarmCondition> conditionList = getAlarmConditions(msg);
|
|
|
if (CollectionUtil.isNotEmpty(conditionList)) {
|
|
|
try {
|
|
@@ -133,6 +134,7 @@ public class NettyMsgHandler {
|
|
|
//加个等待,保证正在执行的逻辑执行成功
|
|
|
Thread.sleep(4000);
|
|
|
alarmConditionService.cacheAllConditions(conditionList);
|
|
|
+ log.info("全量同步报警条件完成");
|
|
|
LockUtil.getInstance().setExecute(true);
|
|
|
LockUtil.getInstance().condition.signalAll();
|
|
|
} catch (Exception e) {
|