|
|
@@ -1,6 +1,5 @@
|
|
|
package org.jeecg.modules.homePageData.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.deviceLesm.entity.*;
|
|
|
import org.jeecg.modules.deviceLesm.mapper.DevicePointMapper;
|
|
|
@@ -204,21 +203,6 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
|
|
|
|
|
|
@Override
|
|
|
public List<Map<String, String>> realAlarm() {
|
|
|
-// if(oConvertUtils.listIsNotEmpty(deviceInformations)){
|
|
|
-// String[] alarms = new String[]{"耗电异常","停止运行","运行异常"};
|
|
|
-// String[] levels = new String[]{"高度","轻度","中度"};
|
|
|
-// long time = new Date().getTime();
|
|
|
-// for (int i = 0; i < 10; i++) {
|
|
|
-// time -= Math.random()*60*30+30*60;
|
|
|
-// Map<String,String> map = new HashMap<>();
|
|
|
-// SimpleDateFormat format = new SimpleDateFormat("HH:mm");
|
|
|
-// map.put("time",format.format(new Date(time)));
|
|
|
-// map.put("name",deviceInformations.get((int)(Math.random()*deviceInformations.size())).getDeviceTitle());
|
|
|
-// map.put("alarmInfo",alarms[(int)(Math.random()*3)]);
|
|
|
-// map.put("level",levels[(int)(Math.random()*3)]);
|
|
|
-// res.add(map);
|
|
|
-// }
|
|
|
-// }
|
|
|
List<Map<String, String>> res = new ArrayList<>();
|
|
|
List<LeanEventWarnInfoResult> leanEventWarnInfoResult = leanEventWarnInfoMapper.queryLeanEventWarnInfo();
|
|
|
if(oConvertUtils.listIsNotEmpty(leanEventWarnInfoResult)){
|
