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/controller/DeviceAdjustValueController.java | 12 ++++++++++++
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 3 ++-
screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java | 3 +++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 30 ++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index 110da4b..8f51aad 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -58,7 +58,8 @@
URL_IS_EXIST(-43,"���������������"),
ORGANIZATION_EXIST_MONITORPOINT(-44,"���������������������������������"),
CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������"),
- DEVICE_IS_NULL(-46, "���������������")
+ DEVICE_IS_NULL(-46, "���������������"),
+ TARGET_IS_NULL(-47, "���������������������")
;
private final Integer code;
private final String msg;
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
index dd7fc86..50c9a51 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -58,4 +58,16 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ @RequestMapping(value = "deleteOneDeviceAdjustValue", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage deleteOneDeviceAdjustValue(@RequestBody Map<String, Object> parameters) {
+ Map<String,Object> resultMap = deviceAdjustValueService.deleteOne(parameters);
+ String msg = resultMap.get("msg").toString();
+ int code = Integer.parseInt(resultMap.get("code").toString());
+ if (code == 0){
+ return ResultMessage.ok(msg);
+ }
+ return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
index cc03e7e..b475b42 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
@@ -25,4 +25,7 @@
@Transactional
Map<String,Object> updateOne(Map map);
+ @Transactional
+ Map<String,Object> deleteOne(Map map);
+
}
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