From 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java b/src/main/java/com/moral/task/DeviceAdjustValueTimingTask.java
index f8ea0d4..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) {
@@ -70,6 +80,22 @@
}else {
deviceAdjustValueService.updateValueByDeviceID(device_id,value);
}
+ 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