From efaa96ca645875270668de1ec3a766900847732a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 14 May 2021 17:30:47 +0800
Subject: [PATCH] 设备接口更新
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 138 insertions(+), 37 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index 16691cf..780deaa 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -14,14 +14,11 @@
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.moral.api.entity.Device;
-import com.moral.api.entity.ManageAccount;
-import com.moral.api.entity.Organization;
-import com.moral.api.entity.User;
-import com.moral.api.pojo.vo.device.DeviceVO;
+
import com.moral.api.service.DeviceService;
-import com.moral.api.service.OrganizationService;
+import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
@@ -34,27 +31,113 @@
@Autowired
private DeviceService deviceService;
- @Autowired
- private OrganizationService organizationService;
-
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "insert", method = RequestMethod.POST)
- public ResultMessage insert(@RequestBody Device device) {
+ public ResultMessage insert(Device device) {
deviceService.insert(device);
return ResultMessage.ok();
}
- @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "operators", method = RequestMethod.GET)
- public ResultMessage selectOperators() {
- List<ManageAccount> operators = deviceService.selectAllOperator();
- return ResultMessage.ok(operators);
+ @RequestMapping(value = "delete", method = RequestMethod.GET)
+ public ResultMessage delete(Integer deviceId) {
+ deviceService.delete(deviceId);
+ return ResultMessage.ok();
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "update", method = RequestMethod.POST)
+ public ResultMessage update(Device device) {
+ deviceService.update(device);
+ return ResultMessage.ok();
+ }
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "name", value = "������������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "mac������������", required = false, paramType = "query", dataType = "String"),
+ })
+ @RequestMapping(value = "select", method = RequestMethod.POST)
+ public ResultMessage select(@RequestBody Map<String, Object> parameters) {
+ IPage<Device> page = deviceService.selectDevices(parameters);
+ PageResult<Device> pageResult = new PageResult<>(
+ page.getTotal(), page.getPages(), page.getRecords()
+ );
+ return ResultMessage.ok(pageResult);
+ }
+
+ @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "deviceInfo", method = RequestMethod.GET)
+ public ResultMessage selectDeviceInfoById(Integer deviceId) {
+ Map<String, Object> result = deviceService.selectDeviceInfoById(deviceId);
+ return ResultMessage.ok(result);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "allOrganization", method = RequestMethod.GET)
+ public ResultMessage selectAllOrganization() {
+ List<Map<String, Object>> organizations = deviceService.selectAllOrganization();
+ return ResultMessage.ok(organizations);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "allMonitorPoint", method = RequestMethod.GET)
+ public ResultMessage selectAllMonitorPoint() {
+ List<Map<String, Object>> organizations = deviceService.selectAllMonitorPoint();
+ return ResultMessage.ok(organizations);
+ }
+
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "monitorPoints", method = RequestMethod.GET)
+ public ResultMessage selectMonitorPoints(Integer orgId) {
+ List<Map<String, Object>> monitorPoints = deviceService.selectMonitorsByOrgId(orgId);
+ return ResultMessage.ok(monitorPoints);
+ }
+
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "devicesByOrgId", method = RequestMethod.GET)
+ public ResultMessage selectDevicesByOrg(Integer orgId) {
+ List<Map<String, Object>> devices = deviceService.selectDevicesByOrgId(orgId);
+ return ResultMessage.ok(devices);
+ }
+
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "devicesByMpId", method = RequestMethod.GET)
+ public ResultMessage selectDevicesByMp(Integer mpId) {
+ List<Map<String, Object>> devices = deviceService.selectDevicesByMpId(mpId);
+ return ResultMessage.ok(devices);
}
@ApiOperation(value = "������������", notes = "������������")
@@ -63,34 +146,52 @@
return null;
}
- @ApiOperation(value = "������������", notes = "������������")
+ @ApiOperation(value = "���������������", notes = "���������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "organizations", method = RequestMethod.GET)
- public ResultMessage selectOrganizations() {
- List<Organization> organizations = deviceService.selectAllOrganization();
- return ResultMessage.ok(organizations);
+ @RequestMapping(value = "operators", method = RequestMethod.GET)
+ public ResultMessage selectOperators() {
+ return ResultMessage.ok(deviceService.selectAllOperators());
}
- @ApiOperation(value = "������������������", notes = "������������������")
+ @ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
- @ApiImplicitParam(name = "organizationName", value = "������������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "monitorPointName", value = "������������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "deviceName", value = "������������������������", required = false, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "mac", value = "mac������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "select", method = RequestMethod.POST)
- public ResultMessage select(@RequestBody Map<String, Object> parameters) {
- Page<DeviceVO> userPage = deviceService.selectDevices(parameters);
- PageResult<DeviceVO> pageResult = new PageResult<>(
- userPage.getTotal(), userPage.getPages(), userPage.getRecords()
- );
- return ResultMessage.ok(pageResult);
+ @RequestMapping(value = "professions", method = RequestMethod.GET)
+ public ResultMessage selectProfessions() {
+ List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_PROFESSION);
+ return ResultMessage.ok(professions);
+ }
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "techs", method = RequestMethod.GET)
+ public ResultMessage selectTechs() {
+ List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_TECH);
+ return ResultMessage.ok(professions);
+ }
+
+ @ApiOperation(value = "���������������������", notes = "���������������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "detectors", method = RequestMethod.GET)
+ public ResultMessage selectDetectors() {
+ List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_DETECTOR);
+ return ResultMessage.ok(professions);
+ }
+
+ @ApiOperation(value = "���������������", notes = "���������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "purchasers", method = RequestMethod.GET)
+ public ResultMessage selectPurchasers() {
+ List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_PURCHASER);
+ return ResultMessage.ok(professions);
}
}
--
Gitblit v1.8.0