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/service/impl/DeviceAdjustValueServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
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;
+ }
+
}
--
Gitblit v1.8.0