|
@@ -23,6 +23,7 @@ import com.persagy.dmp.config.DmpParameterStorage;
|
|
|
import com.persagy.dmp.rwd.model.DmpMessage;
|
|
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -301,7 +302,7 @@ public class AlarmConfigService extends AlarmBaseService {
|
|
|
*/
|
|
|
private DmpMessage deleteAll(List<AlarmConfig> deletedAlarmConfigs) {
|
|
|
if (!CollectionUtils.isEmpty(deletedAlarmConfigs)) {
|
|
|
- DmpMessage message = generateMessage(deletedAlarmConfigs, null);
|
|
|
+ DmpMessage message = generateMessage(null, deletedAlarmConfigs);
|
|
|
alarmConfigRepository.deleteAll(deletedAlarmConfigs);
|
|
|
return message;
|
|
|
}
|
|
@@ -738,11 +739,25 @@ public class AlarmConfigService extends AlarmBaseService {
|
|
|
}
|
|
|
configs.add(entity);
|
|
|
}
|
|
|
- configs = alarmConfigRepository.saveAll(configs);
|
|
|
+ // 测试
|
|
|
+ for (int i = 0; i < 1000; i++) {
|
|
|
+ AlarmConfig entity = new AlarmConfig();
|
|
|
+ BeanUtils.copyProperties(configs.get(0), entity);
|
|
|
+ entity.setId(UUID.randomUUID().toString());
|
|
|
+ configs.add(entity);
|
|
|
+ }
|
|
|
+ System.out.println("开始存储报警定义");
|
|
|
+ try {
|
|
|
+ configs = alarmConfigRepository.saveAll(configs);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ Date date1 = new Date();
|
|
|
+ System.out.println("报警定义存储完成,耗时:"+(date1.getTime() - date.getTime()));
|
|
|
DmpMessage msg = generateMessage(configs, null);
|
|
|
messageProcesser.convertAndSend(msg);
|
|
|
List<String> ids = configs.stream().map(AlarmConfig::getId).collect(Collectors.toList());
|
|
|
- Date date1 = new Date();
|
|
|
+ date1 = new Date();
|
|
|
System.out.println("执行时间:" + (date1.getTime() - date.getTime()));
|
|
|
response.add("ids", ids);
|
|
|
return response;
|