|
@@ -6,7 +6,8 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.bosshand.virgo.api.dao.*;
|
|
|
import com.bosshand.virgo.api.model.*;
|
|
|
import com.bosshand.virgo.api.operate.dao.OperateDeviceDao;
|
|
|
-import com.bosshand.virgo.api.operate.model.OperateDevice;
|
|
|
+import com.bosshand.virgo.api.operate.dao.OperateFlowDataDao;
|
|
|
+import com.bosshand.virgo.api.operate.model.OperateFlowData;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -40,6 +41,9 @@ public class WeeklyService {
|
|
|
@Autowired
|
|
|
OperateDeviceDao operateDeviceDao;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ OperateFlowDataDao operateFlowDataDao;
|
|
|
+
|
|
|
@Autowired
|
|
|
ProjectItemTargetRoomDao projectItemTargetRoomDao;
|
|
|
|
|
@@ -144,7 +148,7 @@ public class WeeklyService {
|
|
|
//设备管理
|
|
|
case 4:
|
|
|
if (weeklyType.getData() == null) {
|
|
|
- List<OperateDevice> data = operateDeviceDao.getProjectId(startDate, endDate, projectId);
|
|
|
+ List<OperateFlowData> data = operateFlowDataDao.getProjectId(startDate, endDate, projectId);
|
|
|
weeklyType.setData(JSON.toJSONString(data));
|
|
|
weeklyTypeDao.update(weeklyType);
|
|
|
}
|