From 33508d2949a4bd64ff5eddb8aa18fe8d86020f1b Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 May 2021 11:51:41 +0800
Subject: [PATCH] sensor接口
---
screen-manage/src/main/resources/application-dev.yml | 1
screen-manage/src/main/java/com/moral/api/service/SensorService.java | 6 +++
screen-manage/src/main/java/com/moral/api/controller/SensorController.java | 29 +++++++++++++-
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 71 +++++++++++++++++++++++++++++++++++
4 files changed, 104 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/SensorController.java b/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
index 649e6ff..574b980 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/SensorController.java
@@ -6,6 +6,7 @@
import com.moral.api.service.ManageRoleMenuService;
import com.moral.api.service.ManageRoleService;
import com.moral.api.service.SensorService;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
import io.swagger.annotations.Api;
@@ -51,7 +52,6 @@
@RequestMapping(value = "updateSensor", method = RequestMethod.POST)
@ResponseBody
public ResultMessage updateSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
- //Sensor sensor = JSON.parseObject(JSON.toJSONString(parameters), Sensor.class);
Map<String,Object> resultMap = sensorService.updateSensor(parameters);
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
@@ -59,6 +59,31 @@
return ResultMessage.ok(msg);
}
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
- //return null;
+ }
+
+ @RequestMapping(value = "getAllSensor", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getAllSensor(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = sensorService.getAllSensor(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
+ @RequestMapping(value = "deleteSensor", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage deleteSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
+ if (!parameters.containsKey("id")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String,Object> resultMap = sensorService.deleteSensor(parameters);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/SensorService.java b/screen-manage/src/main/java/com/moral/api/service/SensorService.java
index 80b9785..c9461ea 100644
--- a/screen-manage/src/main/java/com/moral/api/service/SensorService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/SensorService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
/**
@@ -22,4 +23,9 @@
@Transactional
Map<String,Object> updateSensor(Map<String,Object> updateSensorMap);
+
+ Map<String,Object> getAllSensor(Map map);
+
+ @Transactional
+ Map<String,Object> deleteSensor(Map map);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index 04f093d..1f72e2e 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -1,6 +1,9 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.entity.ManageRole;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.service.SensorService;
@@ -16,6 +19,8 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -74,6 +79,7 @@
}
@Override
+ @Transactional
public Map<String, Object> updateSensor(Map<String,Object> updateSensorMap) {
Map<String,Object> resultMap = new HashMap<>();
if(ObjectUtils.isEmpty(updateSensorMap.get("id"))){
@@ -125,10 +131,73 @@
content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
}
}
- System.out.println(content);
logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
+
+ @Override
+ public Map<String,Object> getAllSensor(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ Page<Sensor> page = new Page(current,size);
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_ASC)){
+ wrapper.orderByAsc("create_time");
+ }else {
+ wrapper.orderByDesc("create_time");
+ }
+ Page resultPage = sensorMapper.selectPage(page,wrapper);
+ List<Sensor> sensors = resultPage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensotList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRoleMap.put("key",sensor.getId());
+ sensotList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",sensotList);
+ int totalNumber = sensors.size();
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
+ }
+
+ @Override
+ @Transactional
+ public Map<String, Object> deleteSensor(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ wrapper.eq("id",map.get("id"));
+ wrapper.eq("is_delete","0");
+ Sensor sensor = sensorMapper.selectOne(wrapper);
+ if(ObjectUtils.isEmpty(sensor)){
+ resultMap.put("code",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
+ return resultMap;
+ }
+ Sensor deleteSensor = new Sensor();
+ deleteSensor.setIsDelete("1");
+ sensorMapper.update(deleteSensor,wrapper);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "������������:"+sensor.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
}
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 6cba84f..78ea25e 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -123,6 +123,7 @@
- /manageMenu/**
- /api/**
- /sensor/**
+ - /monitorPoint/**
AES:
KEY:
AD42F7787B035B7580000EF93BE20BAD
--
Gitblit v1.8.0