From dba54bf8c8f9299d61c05bf3a941708ea399c998 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 26 Apr 2020 15:20:22 +0800
Subject: [PATCH] update excel多个工作表导出
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 77dca20..7d0c013 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -1,27 +1,34 @@
package com.moral.service.impl;
-import com.moral.common.bean.PageBean;
-import com.moral.common.util.MyBatisBaseMapUtil;
-import com.moral.entity.Sensor;
-import com.moral.mapper.SensorMapper;
-import com.moral.service.SensorService;
-
-import org.springframework.stereotype.Service;
-
-import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.moral.common.bean.PageBean;
+import com.moral.common.util.MyBatisBaseMapUtil;
+import com.moral.entity.Device;
+import com.moral.entity.MonitorPoint;
+import com.moral.entity.Sensor;
+import com.moral.mapper.SensorMapper;
+import com.moral.service.MonitorPointService;
+import com.moral.service.SensorService;
+
+import tk.mybatis.mapper.entity.Example;
+
@Service
public class SensorServiceImpl implements SensorService {
@Resource
SensorMapper sensorMapper;
+
+ @Resource
+ MonitorPointService monitorPointService;
private static Class ENTITY_CLASS = Sensor.class;
@@ -142,4 +149,23 @@
return sensorsMapList;
}
+ @Override
+ public List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters) {
+ List<String> macList = new ArrayList<>();
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
+ for (MonitorPoint m : monitorPoints) {
+ for (Device d : m.getDevices()) {
+ macList.add(d.getMac());
+ }
+ }
+ parameters.put("macs", macList);
+ List<Sensor> sensors = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(macList)) {
+ sensors = sensorMapper.selectSenosrsByOrgId(parameters);
+ } else {
+ sensors = sensorMapper.selectAll();
+ }
+ return sensors;
+ }
+
}
--
Gitblit v1.8.0