1.监测点半月报

2.数据中心bug修改
This commit is contained in:
wr
2023-08-30 08:45:55 +08:00
parent d0d33b5b22
commit 7fa9b9c407
8 changed files with 214 additions and 14 deletions

View File

@@ -362,7 +362,7 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
vo = BeanUtil.copyProperties(datum, OnlineUsersVO.class);
Long integer = time.get(datum.getId());
DateTime date = DateUtil.date(integer * 1000);
vo.setTime(date.toDateStr());
vo.setTime(date.toString());
info.add(vo);
}
}

View File

@@ -1,5 +1,6 @@
package com.njcn.system.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -132,15 +133,21 @@ public class EventTemplateServiceImpl extends ServiceImpl<EventTemplateMapper, E
boolean flag = this.updateById(eventTemplate);
// 先删除字典表
templateRelMapper.deleteByRtId(id);
List<TemplateRel> list = new ArrayList<>();
eventTemplateUpdateParam.getIds().forEach(rdId -> {
TemplateRel relevancy = new TemplateRel();
// 模版id
relevancy.setRtId(id);
relevancy.setRdId(rdId);
list.add(relevancy);
});
flag = templateRelMapper.batchInsert(list);
if(CollUtil.isNotEmpty(eventTemplateUpdateParam.getIds())){
List<TemplateRel> list = new ArrayList<>();
eventTemplateUpdateParam.getIds().forEach(rdId -> {
TemplateRel relevancy = new TemplateRel();
// 模版id
relevancy.setRtId(id);
relevancy.setRdId(rdId);
list.add(relevancy);
});
if(CollUtil.isNotEmpty(list)){
flag = templateRelMapper.batchInsert(list);
}
}
return flag;
}