From 7928995b3f8508a50d594a91e195655826a47740 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 16:52:03 +0800
Subject: [PATCH] 合并最大值最小值到同一Mapper
---
src/main/java/com/moral/controller/MobileController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 7319f8a..69d12d8 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -13,6 +13,7 @@
import org.springframework.cglib.beans.BeanMap;
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;
@@ -20,6 +21,7 @@
import com.moral.common.bean.AppData;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.Crypto;
+import com.moral.common.util.WebUtils;
import com.moral.entity.Account;
import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
@@ -117,7 +119,8 @@
*/
@RequestMapping("reportDevice")
public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {
- deviceService.addOrModify(equDeviceAdapter.toDevice());
+ //deviceService.addOrModify(equDeviceAdapter.toDevice());
+ deviceService.saveOrUpdate4Mobile(equDeviceAdapter.toDevice(), equDeviceAdapter.getDeviceProperty());
return new AppData<String>("");
}
@@ -305,9 +308,9 @@
@GetMapping("sensors")
@ApiOperation(value = "���������������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "deviceVersionId", value = "������������Id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "deviceVersionId", value = "������������Id", required = true, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "deviceId", value = "������id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "deviceId", value = "������id", required = true, paramType = "query", dataType = "int"),
})
public ResultBean<List<Map<String, Object>>> getSensorsDataByDevice(HttpServletRequest request){
Map<String, Object> parameters = getParametersStartingWith(request, null);
@@ -320,11 +323,38 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "sensorKey", value = "���������key", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "size", value = "������������������", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������������", required = true, paramType = "query", dataType = "int"),
})
public ResultBean<List<Map<String, Object>>> getSensorDataBySensorKey(HttpServletRequest request){
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> sensors = historyService.getSensorDataBySensorKey(parameters);
return new ResultBean<List<Map<String, Object>>>(sensors);
}
+
+ @GetMapping("profession-provincecode")
+ @ApiOperation(value = "���������code������������������", notes = "���������code������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "provinceCode", value = "���code", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Profession>> getProfessionByProvinceCode(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ List<Profession> professions = professionService.getProfessiontList(parameters);
+ return new ResultBean<List<Profession>>(professions);
+ }
+
+ @PostMapping("update-maintenance")
+ @ApiOperation(value = "������������������������������������", notes = "������������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "������ID", required = true, paramType = "query", dataType = "int") ,
+ @ApiImplicitParam(name = "old_state", value = "������������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "new_state", value = "������������������", required = true, paramType = "query", dataType = "String")
+
+ })
+ public ResultBean offLinToMaintenance(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ deviceService.offLinToMaintenance(parameters);
+ ResultBean resultBean = new ResultBean(parameters);
+ return resultBean;
+ }
+
}
--
Gitblit v1.8.0