From 13bd8b759742f0a654679b0c8e152e7a1fb70db9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 08:55:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java | 11 +++++
screen-manage/src/main/java/com/moral/api/service/SensorService.java | 2 +
screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java | 2 +
screen-manage/src/main/java/com/moral/api/controller/SensorController.java | 11 +++++
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 32 +++++++++++++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 36 +++++++++++++++++
6 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
index 50c9a51..3da1027 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -46,6 +46,17 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "getTimeSlot", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getTimeSlot(HttpServletRequest request) {
+ Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ Map<String,Object> resultMap = deviceAdjustValueService.getTimeSlot(parameters);
+ if (!resultMap.containsKey("code")){
+ return ResultMessage.ok(resultMap);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
@RequestMapping(value = "updateOneDeviceAdjustValue", method = RequestMethod.POST)
@ResponseBody
public ResultMessage updateOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {
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 eca08c3..605a065 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
@@ -72,6 +72,17 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "getAllSensorWithoutPage", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getAllSensorWithoutPage(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String,Object> resultMap = sensorService.getAllSensorWithoutPage();
+ 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) {
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
index b475b42..88c0ea8 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
@@ -28,4 +28,6 @@
@Transactional
Map<String,Object> deleteOne(Map map);
+ Map<String,Object> getTimeSlot(Map map);
+
}
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 7f3d220..f36fe77 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
@@ -26,6 +26,8 @@
Map<String,Object> getAllSensor(Map map);
+ Map<String,Object> getAllSensorWithoutPage();
+
@Transactional
Map<String,Object> deleteSensor(Map map);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index cfb38aa..562c462 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -84,7 +84,7 @@
deviceAdjustValueMapper.insert(deviceAdjustValue);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "���������������:"+deviceAdjustValue+";";
+ String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
@@ -197,4 +197,38 @@
return resultMap;
}
+ @Override
+ public Map<String, Object> getTimeSlot(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(map.get("sensor_code"))||map.get("sensor_code").equals("")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ if (ObjectUtils.isEmpty(map.get("mac"))||map.get("mac").equals("")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<DeviceAdjustValue> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.eq("sensor_code",map.get("sensor_code"));
+ wrapper.eq("mac",map.get("mac"));
+ List<DeviceAdjustValue> deviceAdjustValues = deviceAdjustValueMapper.selectList(wrapper);
+ List<Map<String,Object>> timeSlotList = new ArrayList<>();
+ if (deviceAdjustValues.size()==0){
+ resultMap.put("timeSlotList",timeSlotList);
+ return resultMap;
+ }
+ for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
+ Map timeSlotMap = new HashMap();
+ timeSlotMap.put("id",deviceAdjustValue.getId());
+ timeSlotMap.put("startTime",deviceAdjustValue.getStartTime());
+ timeSlotMap.put("endTime",deviceAdjustValue.getEndTime());
+ timeSlotList.add(timeSlotMap);
+ }
+ resultMap.put("timeSlotList",timeSlotList);
+ return resultMap;
+ }
+
}
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 b003f5f..cd17e63 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
@@ -218,6 +218,36 @@
}
@Override
+ public Map<String, Object> getAllSensorWithoutPage() {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<Sensor> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ List<Sensor> sensors = sensorMapper.selectList(wrapper);
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> sensorList = new ArrayList<>();
+ for (Sensor sensor:sensors) {
+ Map sensorMap = JSON.parseObject(JSON.toJSONString(sensor),Map.class);
+ String createTime = SDF.format(sensor.getCreateTime());
+ String updateTime = SDF.format(sensor.getUpdateTime());
+ sensorMap.put("createTime",createTime);
+ sensorMap.put("updateTime",updateTime);
+ sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
+ }
+ sensorList.add(sensorMap);
+ }
+ resultMap.put("sensors",sensorList);
+ return resultMap;
+ }
+
+ @Override
@Transactional
public Map<String, Object> deleteSensor(Map map) {
Map<String,Object> resultMap = new HashMap<>();
@@ -279,7 +309,7 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
- if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ if (sensor.getDefaultUnitKey()!=null&&!sensor.getDefaultUnitKey().equals("")){
QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
wrapper_VSU.eq("is_delete",0);
wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
--
Gitblit v1.8.0