From b28a5002a58d8d0b37082da12e5b218f0951de47 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 04 Dec 2017 16:46:44 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/controller/ScreenController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 893bd61..f752dc3 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -12,11 +12,10 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -43,24 +42,24 @@
public class ScreenController {
/** The screen service. */
- @Autowired
+ @Resource
private HistoryService historyService;
/** The account service. */
- @Autowired
+ @Resource
private AccountService accountService;
/** The device service. */
- @Autowired
+ @Resource
private DeviceService deviceService;
/** The resource. */
@Value(value = "classpath:system/alarmLevels.json")
- private Resource resource;
+ private org.springframework.core.io.Resource resource;
/** The redis template. */
- @javax.annotation.Resource
- RedisTemplate<String, String> redisTemplate;
+ @Resource
+ private RedisTemplate<String, String> redisTemplate;
/** The level key. */
private String levelKey = "alarm_level_config";
--
Gitblit v1.8.0