From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
index 8044083..0573bb1 100644
--- a/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import com.moral.entity.DeviceAdjustValueTiming;
import com.moral.mapper.DeviceAdjustValueTimingMapper;
import com.moral.service.DeviceAdjustValueTimingService;
import org.springframework.stereotype.Service;
@@ -7,6 +8,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.List;
import java.util.Map;
@Service
public class DeviceAdjustValueTimingServiceImpl implements DeviceAdjustValueTimingService {
@@ -15,8 +17,8 @@
private DeviceAdjustValueTimingMapper deviceAdjustValueTimingMapper;
@Override
- public Map<String, Object> getDataByDeviceid(Integer device_id) {
- Map<String, Object> result = deviceAdjustValueTimingMapper.selectAllByDeviceid(device_id);
+ public List<DeviceAdjustValueTiming> getDataByDeviceid(Integer device_id) {
+ List<DeviceAdjustValueTiming> result = deviceAdjustValueTimingMapper.selectAllByDeviceid(device_id);
return result;
}
@@ -35,4 +37,9 @@
deviceAdjustValueTimingMapper.upDataByDeviceid(value,nowTime,device_id);
}
}
+
+ @Override
+ public int delete(String id) {
+ return deviceAdjustValueTimingMapper.delete(id);
+ }
}
--
Gitblit v1.8.0