From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 6 ++++++
1 files changed, 6 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 1e3f9d4..dfc648b 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
@@ -324,11 +324,13 @@
@Transactional
public Map<String, Object> updateAllAdjust(List<AdjustForm> paras) {
Map<String,Object> resultMap = new HashMap<>();
+ StringBuffer buffer = new StringBuffer();
for (AdjustForm adjustForm : paras) {
DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
QueryWrapper<DeviceAdjustValue> wrapper1 = new QueryWrapper<>();
wrapper1.eq("mac",adjustForm.getMac());
wrapper1.eq ("sensor_code",adjustForm.getCode());
+ wrapper1.eq("is_delete",0);
Integer integer = deviceAdjustValueMapper.selectCount(wrapper1);
if (integer==0){
deviceAdjustValue.setValue(adjustForm.getAgehou());
@@ -346,12 +348,16 @@
deviceAdjustValue.setId(adjustForm.getId());
deviceAdjustValueMapper.updateById(deviceAdjustValue);
}
+ buffer.append("mac: "+adjustForm.getMac()).append(", value: "+adjustForm.getAgehou()+"; ");
//������������
refreshCache(adjustForm.getMac());
}
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ LogUtils.saveOperationForManage(request,"���������������������: "+buffer.toString(),Constants.UPDATE_OPERATE_TYPE);
return resultMap;
}
--
Gitblit v1.8.0