From 88e4de4eabe790e97394fd020d96d045991d157e Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 15 Dec 2020 14:08:55 +0800
Subject: [PATCH] AQI数据插入任务update
---
src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java b/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java
index 38a31fe..0d47fa1 100644
--- a/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java
+++ b/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java
@@ -1,9 +1,13 @@
package com.moral.task;
+import com.alibaba.fastjson.JSON;
+import com.moral.entity.Device;
import com.moral.service.DeviceAdjustValueService;
import com.moral.service.DeviceAdjustValueTimingService;
+import com.moral.service.DeviceService;
import com.moral.util.AlarmUtils_2;
import com.moral.util.LengthOfTimeUtils;
+import com.moral.util.RedisUtils;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
@@ -27,6 +31,12 @@
@Resource
private DeviceAdjustValueService deviceAdjustValueService;
+
+ @Resource
+ private DeviceService deviceService;
+
+ @Resource
+ RedisUtils redisUtils;
@XxlJob("DeviceAdjustValueTiming")
public ReturnT DeviceAdjustValueTiming(String params) {
@@ -55,7 +65,7 @@
}
//������deviceAdjustimingList������������������
if (deviceAdjusTimingList.isEmpty()){
- ReturnT returnT = new ReturnT(500, "���������������������������!");
+ ReturnT returnT = new ReturnT(200, "���������������������������!");
return returnT;
}else {
//������deviceAdjustimingList������������������������������������device_adjust_value���������������������������
@@ -70,7 +80,23 @@
}else {
deviceAdjustValueService.updateValueByDeviceID(device_id,value);
}
- ReturnT returnT = new ReturnT(500, "������������������������");
+ try {
+ // ���������redis
+ //Map<String,String> adjustMap = new HashMap<>();
+ if(value!=null&&!value.isEmpty()){
+ Map<String, Object> valueMap = JSON.parseObject(value);
+ System.out.println("valueMap:"+valueMap);
+ if(!valueMap.isEmpty()){
+ Device device = deviceService.getDeviceByID(device_id);
+ String key = RedisUtils.getAdjustKey(device.getMac());
+ redisUtils.set(key,valueMap);
+ }
+ }
+ }catch (Exception e){
+ ReturnT returnT = new ReturnT(500, "������redis���������������");
+ return returnT;
+ }
+ ReturnT returnT = new ReturnT(200, "������������������������");
return returnT;
}
}
--
Gitblit v1.8.0