From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加
---
src/main/java/com/moral/controller/DeviceVersionController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index 2980ebb..a4a3563 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -1,4 +1,53 @@
package com.moral.controller;
+
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.ResultBean;
+import com.moral.entity.DeviceVersion;
+import com.moral.service.DeviceVersionService;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+@RestController
+@RequestMapping("device-version")
+@CrossOrigin(origins = "*", maxAge = 3600)
public class DeviceVersionController {
+ @Resource
+ private DeviceVersionService deviceVersionService;
+
+ @GetMapping("page-list")
+ public PageBean<DeviceVersion> pageList(PageBean pageBean) throws NoSuchMethodException, UnsupportedEncodingException {
+ return deviceVersionService.queryByPageBean(pageBean);
+ }
+ @PostMapping("delete-by-ids")
+ public ResultBean deleteByIds(@RequestBody Integer [] ids){
+ deviceVersionService.deleteByIds(ids);
+ ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
+ return resultBean;
+ }
+ @PostMapping("add-or-modify")
+ public ResultBean addOrModify(@RequestBody DeviceVersion deviceVersion){
+ deviceVersionService.addOrModify(deviceVersion);
+ ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
+ return resultBean;
+ }
+ @GetMapping("get-sensor-ids")
+ public List<Integer> getSensorIds(Integer deviceVersionId){
+ return deviceVersionService.getSensorIds(deviceVersionId);
+ }
+ @PostMapping("version-sensor-config/{id}")
+ public ResultBean versionSensorConfig(@PathVariable("id") Integer deviceVersionId,@RequestBody Integer [] sensorIds){
+ ResultBean resultBean = new ResultBean();
+ if(deviceVersionId==null){
+ resultBean.setCode(ResultBean.NO_PERMISSION);
+ resultBean.setMessage("������������ID���������null");
+ return resultBean;
+ }else{
+ deviceVersionService.versionSensorConfig(deviceVersionId,sensorIds);
+ resultBean.setCode(ResultBean.SUCCESS);
+ }
+ return resultBean;
+ }
}
--
Gitblit v1.8.0