From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/SensorController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/SensorController.java b/src/main/java/com/moral/controller/SensorController.java
index 67bc1d1..dd004ca 100644
--- a/src/main/java/com/moral/controller/SensorController.java
+++ b/src/main/java/com/moral/controller/SensorController.java
@@ -1,13 +1,23 @@
package com.moral.controller;
-import com.moral.common.bean.PageBean;
-import com.moral.common.bean.ResultBean;
-import com.moral.entity.Sensor;
-import com.moral.service.SensorService;
-import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
-import java.util.List;
+
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.ResultBean;
+import com.moral.common.util.StringUtils;
+import com.moral.entity.Sensor;
+import com.moral.service.SensorService;
@RestController
@RequestMapping("sensor")
@@ -15,27 +25,52 @@
public class SensorController {
@Resource
SensorService sensorService;
+
@GetMapping("page-list")
public PageBean pageList(PageBean pageBean) {
return sensorService.queryByPageBean(pageBean);
}
+
+ @GetMapping("list-by-vid")
+ public PageBean pageListByVersionId(Integer versionId) {
+ return sensorService.queryByVersionId(versionId);
+ }
+
@PostMapping("delete-by-ids")
- public ResultBean deleteByIds(@RequestBody Integer [] ids){
+ public ResultBean deleteByIds(@RequestBody Integer[] ids) {
sensorService.deleteByIds(ids);
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
@PostMapping("add-or-modify")
- public ResultBean addOrModify(@RequestBody Sensor sensor){
+ public ResultBean addOrModify(@RequestBody Sensor sensor) {
sensorService.addOrModify(sensor);
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
-
+
@GetMapping("all")
public ResultBean<List<Sensor>> getAllSensors() {
- List<Sensor> sensors = sensorService.getAllSensors();
+ List<Sensor> sensors = sensorService.getAllSensors();
return new ResultBean<List<Sensor>>(sensors);
}
+ @GetMapping("allById")
+ public ResultBean<List<Map<String, Object>>> getAllSensorsById() {
+ List<Map<String, Object>> sensors = sensorService.getSensorByDId("1230");
+ return new ResultBean<List<Map<String, Object>>>(sensors);
+ }
+
+ @GetMapping("getSenosrsByOrgId")
+ public ResultBean<List<Sensor>> getSenosrsByOrgId(Integer organizationId, String regionCode) {
+ Map<String, Object> parameters = new HashMap<>();
+ parameters.put("organizationId", organizationId);
+ if (!StringUtils.isNullOrEmpty(regionCode)) {
+ parameters.put("regionCode", Long.valueOf(regionCode));
+ }
+ List<Sensor> sensors = sensorService.selectSenosrsByOrgId(parameters);
+ return new ResultBean<>(sensors);
+ }
+
}
--
Gitblit v1.8.0