From ea5c9d2cd28be2bbf050872cd9746368456bad42 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 05 Nov 2020 14:32:10 +0800
Subject: [PATCH] 查询、插入校准值
---
src/main/java/com/moral/mapper/DeviceAdjustValueMapper.java | 6 ++
src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java | 3 +
src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java | 7 +++
src/main/java/com/moral/service/DeviceAdjustValueTimingService.java | 3 +
src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml | 6 +++
src/main/resources/mapper/DeviceAdjustValueMapper.xml | 20 +++++++++
src/main/java/com/moral/service/DeviceAdjustValueService.java | 8 +++-
src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java | 19 +++++++--
src/main/java/com/moral/util/LengthOfTimeUtils.java | 12 ++++++
9 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceAdjustValueMapper.java b/src/main/java/com/moral/mapper/DeviceAdjustValueMapper.java
index 222f15f..14aff36 100644
--- a/src/main/java/com/moral/mapper/DeviceAdjustValueMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceAdjustValueMapper.java
@@ -9,7 +9,11 @@
public interface DeviceAdjustValueMapper {
Map<String, Object> selectAllByid(@Param("id") Integer id);
+ List<Map<String, Object>> selectAllByDeviceid(@Param("device_id") Integer device_id);
+
void updateValueByID(@Param("id") Integer id,@Param("value") String value);
- List<Map<String, Object>> selectDataByTimesolt(@Param("startTime")String startTime, @Param("endTime")String endTime);
+ void updateValueByDeviceID(@Param("device_id") Integer device_id,@Param("value") String value);
+
+ void insertData(@Param("device_id") Integer device_id,@Param("value") String value,@Param("create_time") String create_time);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java b/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
index 3ccdd71..6a2998b 100644
--- a/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
@@ -3,8 +3,11 @@
import org.apache.ibatis.annotations.Param;
+import java.util.List;
import java.util.Map;
public interface DeviceAdjustValueTimingMapper {
Map<String, Object> selectAllByDeviceid(@Param("device_id") Integer device_id);
+
+ List<Map<String, Object>> selectDataBySecondSolt(@Param("startTime")Integer startTime,@Param("endTime")Integer endTime);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/DeviceAdjustValueService.java b/src/main/java/com/moral/service/DeviceAdjustValueService.java
index 00956b3..89fccf3 100644
--- a/src/main/java/com/moral/service/DeviceAdjustValueService.java
+++ b/src/main/java/com/moral/service/DeviceAdjustValueService.java
@@ -6,7 +6,11 @@
public interface DeviceAdjustValueService {
Map<String, Object> getDataByid(Integer id);
- void uudateValueByID(int id,String value);
+ List<Map<String, Object>> getDataByDevice_id(Integer device_id);
- List<Map<String, Object>> selectDataByTimesolt(String startTime,String endTime);
+ void updateValueByID(int id,String value);
+
+ void updateValueByDeviceID(int device_id,String value);
+
+ void insertData(int device_id,String value,String create_time);
}
diff --git a/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java b/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
index 06a6ca7..c2624a8 100644
--- a/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
+++ b/src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
@@ -1,7 +1,10 @@
package com.moral.service;
+import java.util.List;
import java.util.Map;
public interface DeviceAdjustValueTimingService {
Map<String, Object> getDataByDeviceid(Integer device_id);
+
+ List<Map<String, Object>> selectDataBySecondSolt(int startTime,int endTime);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
index c297237..8abb4d2 100644
--- a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
@@ -21,13 +21,24 @@
}
@Override
- public void uudateValueByID(int id, String value) {
+ public List<Map<String, Object>> getDataByDevice_id(Integer device_id) {
+ List<Map<String, Object>> result = deviceAdjustValueMapper.selectAllByDeviceid(device_id);
+ return result;
+ }
+
+ @Override
+ public void updateValueByID(int id, String value) {
deviceAdjustValueMapper.updateValueByID(id,value);
}
@Override
- public List<Map<String, Object>> selectDataByTimesolt(String startTime, String endTime) {
- List<Map<String, Object>> result = deviceAdjustValueMapper.selectDataByTimesolt(startTime,endTime);
- return result;
+ public void updateValueByDeviceID(int device_id, String value) {
+ deviceAdjustValueMapper.updateValueByDeviceID(device_id,value);
}
+
+ @Override
+ public void insertData(int device_id, String value, String create_time) {
+ deviceAdjustValueMapper.insertData(device_id,value,create_time);
+ }
+
}
diff --git a/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
index 58cfebc..526cf67 100644
--- a/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
@@ -5,6 +5,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
@Service
@@ -18,4 +19,10 @@
Map<String, Object> result = deviceAdjustValueTimingMapper.selectAllByDeviceid(device_id);
return result;
}
+
+ @Override
+ public List<Map<String, Object>> selectDataBySecondSolt(int startTime, int endTime) {
+ List<Map<String, Object>> result = deviceAdjustValueTimingMapper.selectDataBySecondSolt(startTime,endTime);
+ return result;
+ }
}
diff --git a/src/main/java/com/moral/util/LengthOfTimeUtils.java b/src/main/java/com/moral/util/LengthOfTimeUtils.java
new file mode 100644
index 0000000..da3dd14
--- /dev/null
+++ b/src/main/java/com/moral/util/LengthOfTimeUtils.java
@@ -0,0 +1,12 @@
+package com.moral.util;
+
+public class LengthOfTimeUtils {
+
+ public static int Seconds(String time){
+ String hour_minute_second = time.substring(11,19);
+ String[] arr = hour_minute_second.split(":");
+ int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
+ return seconds;
+ }
+
+}
diff --git a/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/src/main/resources/mapper/DeviceAdjustValueMapper.xml
index 428316e..ad3c098 100644
--- a/src/main/resources/mapper/DeviceAdjustValueMapper.xml
+++ b/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -6,17 +6,35 @@
WHERE id = #{id}
</select>
+ <select id="selectAllByDeviceid" resultType="java.util.Map">
+ SELECT * FROM device_adjust_value
+ WHERE device_id = #{device_id}
+ </select>
+
<!--������id������value-->
<update id="updateValueByID">
UPDATE device_adjust_value
SET value = #{value}
WHERE id = #{id}
</update>
+
+ <!--������device_id������value-->
+ <update id="updateValueByDeviceID">
+ UPDATE device_adjust_value
+ SET value = #{value}
+ WHERE device_id = #{device_id}
+ </update>
<!--���������������������������-->
<select id="selectDataByTimesolt" resultType="java.util.Map">
select * FROM device_adjust_value_timing
- WHERE adjusttime BETWEEN #{startTime} AND #{endTime}
+ WHERE seconds BETWEEN #{startTime} AND #{endTime}
</select>
+ <!--������������-->
+ <insert id="insertData">
+ INSERT INTO device_adjust_value (device_id,value,create_time)
+ VALUES(#{device_id},#{value},#{create_time})
+ </insert>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml b/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
index 88c9ea0..1cd9762 100644
--- a/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
+++ b/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
@@ -6,4 +6,10 @@
WHERE device_id = #{device_id}
</select>
+ <!--������������������������-->
+ <select id="selectDataBySecondSolt" resultType="java.util.Map">
+ select * FROM device_adjust_value_timing
+ where seconds between #{startTime} and #{endTime}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0