From b98a61c0c707c9fc3a51e68fe67909cb06aaafcd Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Jun 2021 11:45:17 +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 | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 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 e1c258b..089fde6 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
@@ -22,6 +22,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.sql.Time;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -83,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());
@@ -117,6 +118,10 @@
List<Map<String,Object>> deviceAdjustValueList = new ArrayList<>();
for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
Map deviceAdjustValueMap = JSON.parseObject(JSON.toJSONString(deviceAdjustValue),Map.class);
+ Time startTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("startTime").toString())));
+ deviceAdjustValueMap.put("startTime",new Time(startTime.getTime()));
+ Time endTime = new Time(Long.valueOf(Long.parseLong(deviceAdjustValueMap.get("endTime").toString())));
+ deviceAdjustValueMap.put("endTime",new Time(endTime.getTime()));
deviceAdjustValueList.add(deviceAdjustValueMap);
}
resultMap.put("deviceAdjustValues",deviceAdjustValueList);
@@ -132,4 +137,97 @@
return resultMap;
}
+ @Override
+ public Map<String, Object> updateOne(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(map.get("id"))||map.get("id").equals("")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ DeviceAdjustValue deviceAdjustValueOld = deviceAdjustValueMapper.selectById(Integer.parseInt(map.get("id").toString()));
+ deviceAdjustValueMapper.updateDeviceAdjustValue(map);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������"+deviceAdjustValueOld.getMac()+"������"+deviceAdjustValueOld.getSensorCode()+"������������������������:"+";";
+ for (Object key:map.keySet()) {
+ if (key.toString().equals("start_time")&&map.get(key)!=null){
+ content = content+"������������:"+deviceAdjustValueOld.getStartTime()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("end_time")&&map.get(key)!=null){
+ content = content+"������������:"+deviceAdjustValueOld.getEndTime()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("value")&&map.get(key)!=null){
+ content = content+"������������:"+deviceAdjustValueOld.getValue()+"->"+map.get(key)+";";
+ }
+ }
+ 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> deleteOne(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ if (ObjectUtils.isEmpty(map.get("id"))||map.get("id").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("id",map.get("id"));
+ DeviceAdjustValue deviceAdjustValue = deviceAdjustValueMapper.selectOne(wrapper);
+ if (ObjectUtils.isEmpty(deviceAdjustValue)){
+ resultMap.put("code",ResponseCodeEnum.TARGET_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ return resultMap;
+ }
+ Map<String,Object> deleteMap = new HashMap<>();
+ deleteMap.put("id",map.get("id"));
+ deleteMap.put("is_delete",Constants.DELETE);
+ deviceAdjustValueMapper.updateDeviceAdjustValue(deleteMap);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
+ logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ 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("startTime",deviceAdjustValue.getStartTime());
+ timeSlotMap.put("endTime",deviceAdjustValue.getEndTime());
+ timeSlotList.add(timeSlotMap);
+ }
+ resultMap.put("timeSlotList",timeSlotList);
+ return resultMap;
+ }
+
}
--
Gitblit v1.8.0