From f74ecba5f577a41ec3c8d678a18773c8d9748eb8 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 18 Dec 2017 08:44:52 +0800
Subject: [PATCH] 机器激活码 接口
---
src/main/java/com/moral/controller/ScreenController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a140d21..f101ce2 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -18,6 +18,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -29,12 +30,13 @@
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
+import com.moral.service.MachineActivateService;
/**
* The Class ScreenController.������������
*/
@RestController
-@RequestMapping(value = "screen")
+@RequestMapping("screen")
@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
@@ -49,6 +51,9 @@
/** The device service. */
@Resource
private DeviceService deviceService;
+
+ @Resource
+ private MachineActivateService machineActivateService;
/** The resource. */
@Value(value = "classpath:system/alarmLevels.json")
@@ -59,7 +64,7 @@
private RedisTemplate<String, String> redisTemplate;
/** The level key. */
- private String levelKey = "alarm_level_config";
+ private String levelKey = "alarm_";
/**
* Screen login. ������������
@@ -104,16 +109,18 @@
*/
@SuppressWarnings("resource")
@GetMapping("alarm-levels")
- public Map<String, Object> getAlarmLevels(HttpServletRequest request) {
+ public Map<String, Object> getAlarmLevels(HttpServletRequest request,String orgId) {
Map<String, Object> result = new LinkedHashMap<String, Object>();
+ String key = levelKey + orgId;
try {
- if (hasKey(redisTemplate, levelKey)) {
- String levelConfigStr = get(redisTemplate, levelKey);
+ if (hasKey(redisTemplate, key)) {
+ String levelConfigStr = get(redisTemplate, key);
result = JSON.parseObject(levelConfigStr, new TypeReference<Map<String, Object>>() {});
} else {
InputStreamReader reader = new InputStreamReader(resource.getInputStream());
result = new JSONReader(reader).readObject(new TypeReference<LinkedHashMap<String, Object>>() {});
}
+
} catch (IOException e) {
e.printStackTrace();
result.put("msg", "���������������������������������������������������" + e.getMessage());
@@ -188,4 +195,15 @@
return historyService.getMonthAverageBySensor(parameters);
}
+ @GetMapping("check-activate")
+ public Map<String, Object> checkActivate(String macCpuCode) {
+ return machineActivateService.checkActivate(macCpuCode);
+ }
+
+ @PostMapping("activate-machine")
+ public Map<String, Object> activateMachine(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return machineActivateService.activateMachine(parameters);
+ }
+
}
--
Gitblit v1.8.0