From ee9899d1fa2752efdee6cbd8f2df250971aaf3d7 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Thu, 17 Jun 2021 15:59:07 +0800 Subject: [PATCH] 时间段中添加id --- screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 66 ++++++++++++++++++++++++++++++++ 1 files changed, 65 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 4b7ca0c..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()); @@ -167,4 +167,68 @@ 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("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