From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 8 +++++++-
1 files changed, 7 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..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
@@ -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,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