From a740220c647a1bd4dd83f0751e5e1a73fb00226f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 04 Aug 2021 08:57:06 +0800
Subject: [PATCH] 中间小时表update
---
screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml | 2 --
screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml | 16 +++-------------
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 21 ++++++---------------
screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 7 +------
screen-api/src/main/java/com/moral/api/controller/WebController.java | 8 ++++----
screen-common/src/main/java/com/moral/constant/Constants.java | 5 +++++
6 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/WebController.java b/screen-api/src/main/java/com/moral/api/controller/WebController.java
index 4f3ecfc..a398bca 100644
--- a/screen-api/src/main/java/com/moral/api/controller/WebController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/WebController.java
@@ -114,7 +114,7 @@
}
/**
- * @param request ������������
+ * @param params ������������
* @return ������������������������������������
*/
@PostMapping("getMacSensors")
@@ -132,16 +132,16 @@
}
/**
- * @param request ������������
+ * @param params ������������
* @return ������������������������������������
*/
@PostMapping("getTrendChartData")
@ApiOperation(value = "���������������������������������", notes = "���������������������������������.")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
- @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "body", dataType = "String"),
+ @ApiImplicitParam(name = "macs", value = "������mac���������������������", required = true, paramType = "body", dataType = "list"),
@ApiImplicitParam(name = "sensorCode", value = "������code", required = true, paramType = "body", dataType = "String"),
- @ApiImplicitParam(name = "type", value = "���������������������day���,������month���,������year���", required = true, paramType = "body", dataType = "List"),
+ @ApiImplicitParam(name = "type", value = "���������������������day���,������month���,������year���", required = true, paramType = "body", dataType = "String"),
@ApiImplicitParam(name = "times", value = "���������������������2021-07-29������������2021-07������������2021������������������������", required = true, paramType = "body", dataType = "List")
})
public ResultMessage getTrendChartData(@RequestBody Map<String,Object> params) {
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index 246e402..116acc7 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -120,6 +120,11 @@
public static final String UN_ADJUST = "unadjust";
/*
+ * ���������������������
+ * */
+ public static final String TRANSITION = "transition";
+
+ /*
* ���������������������
* */
public static final String DEVICE_STATE_OFFLINE = "0";
diff --git a/screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml b/screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
index 13de990..175931e 100644
--- a/screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml
@@ -7,8 +7,6 @@
`mac` VARCHAR (20) DEFAULT NULL COMMENT '������mac',
`time` datetime DEFAULT NULL COMMENT '������������',
`value` json DEFAULT NULL COMMENT '������',
- KEY `idx_mac` (`mac`),
- KEY `idx_time` (`time`),
KEY `idx_mac_time` (`mac`,`time`)
) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT '5���������������'
</update>
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
index 793721b..9a0cb22 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java
@@ -18,11 +18,6 @@
*/
public interface HistoryHourlyMapper extends BaseMapper<HistoryHourly> {
- void insertHistoryHourlyUnAdjust(Map<String, Object> params);
+ void insertHistoryHourly(Map<String, Object> params);
- int getCountByMacAndTime(@Param("mac") String mac, @Param("time") String time);
-
- void insertHistoryHourlyTransition(Map<String, Object> params);
-
- void updateHistoryTransition(@Param("mac") String mac, @Param("time") String time);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index ba88b76..8265b20 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -48,26 +48,17 @@
result.put("version", version);
result.put("timeUnits", Constants.UN_ADJUST);
result.put("value", JSONObject.toJSONString(data));
- //���������������������������
- historyHourlyMapper.insertHistoryHourlyUnAdjust(result);
+ //������������������insert
+ historyHourlyMapper.insertHistoryHourly(result);
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
dataAdjust.remove("mac");
dataAdjust.remove("DataTime");
dataAdjust.remove("ver");
-
- int count = historyHourlyMapper.getCountByMacAndTime(mac, DateUtils.dateToDateString(time));
-
- //���������������������������mac,���������������������������������������������������
- if (count == 0) {
- //������������������������������������������
- result.put("value", JSONObject.toJSONString(dataAdjust));
- //������
- historyHourlyMapper.insertHistoryHourlyTransition(result);
- } else {
- //������
- historyHourlyMapper.updateHistoryTransition(mac, DateUtils.dateToDateString(time));
- }
+ result.put("timeUnits", Constants.TRANSITION);
+ result.put("value", JSONObject.toJSONString(dataAdjust));
+ //������������������������insert
+ historyHourlyMapper.insertHistoryHourly(result);
}
}
diff --git a/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
index 104b6bf..13bc1fe 100644
--- a/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -10,19 +10,9 @@
<result column="version" property="version"/>
</resultMap>
- <insert id="insertHistoryHourlyUnAdjust">
- INSERT INTO history_hourly_${timeUnits} VALUES (#{mac}, #{time}, #{value}, #{version})
+ <insert id="insertHistoryHourly">
+ INSERT INTO history_hourly_${timeUnits}
+ VALUES (#{mac}, #{time}, #{value}, #{version})
</insert>
- <select id="getCountByMacAndTime" resultType="java.lang.Integer">
- SELECT count(1) FROM history_hourly_transition WHERE mac = #{mac} AND `time` = #{time}
- </select>
-
- <insert id="insertHistoryHourlyTransition">
- INSERT INTO history_hourly_transition (mac, `time`, `value`, version) VALUES (#{mac}, #{time}, #{value}, #{version})
- </insert>
-
- <update id="updateHistoryTransition">
- UPDATE history_hourly_transition SET update_time = now() WHERE mac = #{mac} AND `time` = {time}
- </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0