From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
index 0c495db..98c461c 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
@@ -19,6 +19,7 @@
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.UnitConversionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.CacheUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -51,8 +52,6 @@
SysDictDataService sysDictDataService;
@Autowired
RedisTemplate redisTemplate;
- @Autowired
- LogUtils logUtils;
@Autowired
SensorService sensorService;
@@ -211,6 +210,8 @@
/*������������*/
@Override
public void refreshCache(){
+ //������������������
+ CacheUtils.refreshDeviceAlarmInfo();
redisTemplate.delete((RedisConstants.UNIT_CONVERSION));
QueryWrapper<UnitConversion> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete",Constants.NOT_DELETE);
@@ -249,7 +250,7 @@
content.append("���������������"+sensor.getName()+";");
}
- logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
}
/**
@@ -282,7 +283,7 @@
if(sensor!=null)
content.append("���������������"+sensor.getName()+";");
}
- logUtils.saveOperationForManage(content.toString(),Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(),Constants.DELETE_OPERATE_TYPE);
}
/**
@@ -318,6 +319,6 @@
if(sensor!=null)
content.append("���������������"+sensor.getName()+";");
}
- logUtils.saveOperationForManage(content.toString(),Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(),Constants.UPDATE_OPERATE_TYPE);
}
}
--
Gitblit v1.8.0