From 19cfd37456d6bf42fcb90207b481637f56aedb6d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 23 Jun 2018 11:26:55 +0800
Subject: [PATCH] screencontroller rtm-layout utf-8 更新
---
src/main/java/com/moral/controller/AlarmConfigController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmConfigController.java b/src/main/java/com/moral/controller/AlarmConfigController.java
index 70e1121..3dd8a98 100644
--- a/src/main/java/com/moral/controller/AlarmConfigController.java
+++ b/src/main/java/com/moral/controller/AlarmConfigController.java
@@ -4,10 +4,12 @@
import com.moral.common.bean.ResultBean;
import com.moral.common.util.RedisUtil;
import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.service.AlarmConfigService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Map;
@RestController
@RequestMapping("alarm-config")
@@ -17,7 +19,7 @@
AlarmConfigService alarmConfigService;
@GetMapping("get-by-oid")
public ResultBean<AlarmConfig> getAlarmConfigByOrganizationId(int organizationId){
- AlarmConfig alarmConfig = alarmConfigService.SelectByOrganizationId(organizationId);
+ AlarmConfig alarmConfig = alarmConfigService.queryByOrganizationId(organizationId).get();
ResultBean resultBean = new ResultBean();
resultBean.setCode(ResultBean.SUCCESS);
resultBean.setData(alarmConfig);
--
Gitblit v1.8.0