From d6ca891b09de6095308a5d948ff4de8b7dde78b1 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 16 Jun 2021 15:54:28 +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 | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 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..4b7ca0c 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; @@ -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,34 @@ 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; + } + } -- Gitblit v1.8.0