From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:29:36 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/MobileController.java | 140 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 132 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index 5ce114d..23a1a9c 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -9,17 +9,40 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.moral.common.util.Crypto;
-import com.moral.entity.*;
-import com.moral.entity.adapter.EquDeviceAdapter;
-import com.moral.service.*;
-import com.moral.util.MessageUtils;
-import com.taobao.api.ApiException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cglib.beans.BeanMap;
-import org.springframework.web.bind.annotation.*;
+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;
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;
+import com.moral.entity.OperateUser;
+import com.moral.entity.Organization;
+import com.moral.entity.Profession;
+import com.moral.entity.adapter.EquDeviceAdapter;
+import com.moral.service.AccountService;
+import com.moral.service.DeviceService;
+import com.moral.service.HistoryService;
+import com.moral.service.MonitorPointService;
+import com.moral.service.OperateUserService;
+import com.moral.service.OrganizationService;
+import com.moral.service.ProfessionService;
+import com.moral.util.MessageUtils;
+import com.taobao.api.ApiException;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* The Class MobileController.
@@ -27,6 +50,7 @@
@RestController
@RequestMapping("mobile")
@CrossOrigin(origins = "*", maxAge = 3600)
+@Api(tags = "Mobile", description = "APP������")
public class MobileController {
/** The operate user service. */
@@ -47,6 +71,12 @@
@Resource
private ProfessionService professionService;
+
+ @Resource
+ private AccountService accountService;
+
+ @Resource
+ private HistoryService historyService;
/**
* Mobile login.������
@@ -89,7 +119,8 @@
*/
@RequestMapping("reportDevice")
public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {
- deviceService.saveOrUpdateDevice(equDeviceAdapter.toDevice());
+ //deviceService.addOrModify(equDeviceAdapter.toDevice());
+ deviceService.saveOrUpdate4Mobile(equDeviceAdapter.toDevice(), equDeviceAdapter.getDeviceProperty());
return new AppData<String>("");
}
@@ -250,4 +281,97 @@
List<Profession> professions = professionService.getProfessiontList();
return new AppData<List<Profession>>(professions);
}
+
+ @GetMapping("login")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "account", value = "������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "password", value = "������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<Account> companyLogin(HttpServletRequest request){
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Account account = accountService.companyLogin(parameters);
+ return new ResultBean<Account>(account);
+ }
+
+ @GetMapping("devices")
+ @ApiOperation(value = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "organizationId", value = "������Id", required = true, paramType = "query", dataType = "String"),
+ })
+ public ResultBean<List<Device>> getDevicesByOrganizationId(HttpServletRequest request){
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Device> devices = deviceService.getDevicesByOrganizationId(parameters);
+ return new ResultBean<List<Device>>(devices);
+ }
+
+ @GetMapping("sensors")
+ @ApiOperation(value = "���������������������������")
+ @ApiImplicitParams(value = {
+ @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 = "int"),
+ })
+ public ResultBean<List<Map<String, Object>>> getSensorsDataByDevice(HttpServletRequest request){
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String, Object>> sensors = historyService.getSensorsDataByDevice(parameters);
+ return new ResultBean<List<Map<String, Object>>>(sensors);
+ }
+
+ @GetMapping("sensor")
+ @ApiOperation(value = "���������������������������")
+ @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 = "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;
+ }
+
+ @GetMapping("mointorPointRank")
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "accountId", value = "������id", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request){
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ String id = parameters.get("accountId").toString();
+ String sensor = parameters.get("sensor").toString();
+ Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
+ //������������id������������������������������
+ account.put("sensor", sensor);
+ List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account);
+ return new ResultBean<List<Map<String, Object>>>(returnList);
+ }
+
}
--
Gitblit v1.8.0