From fb1932ed607f0aa5474a6339ea86a83ae5a5089e Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 17 Jun 2021 11:41:01 +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 | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 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 4b7ca0c..cfb38aa 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 @@ -167,4 +167,34 @@ 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; + } + } -- Gitblit v1.8.0