From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 7 ++++++-
1 files changed, 6 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 f287939..b238e39 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
@@ -293,7 +293,7 @@
map.put("cel",1);
}
}else {
- if (code.equals("a99054")){
+ if (code.equals("a99054")&& !value.contains("+")){
String[] split = value.split("\\*");
map.put("cel",Double.parseDouble(split[1]));
}else {
@@ -324,6 +324,7 @@
@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<>();
@@ -346,12 +347,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