From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 26 Aug 2021 11:33:56 +0800
Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
index 0e40019..1a73868 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.entity.Sensor;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.UnitConversion;
import com.moral.api.mapper.UnitConversionMapper;
@@ -14,9 +15,11 @@
import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
+import com.moral.api.service.SensorService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.UnitConversionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
@@ -48,6 +51,11 @@
SysDictDataService sysDictDataService;
@Autowired
RedisTemplate redisTemplate;
+ @Autowired
+ LogUtils logUtils;
+ @Autowired
+ SensorService sensorService;
+
@Override
@Transactional
@@ -82,6 +90,8 @@
unitConversionMapper.insert(unitConversion);
//������������
refreshCache();
+ //������������
+ insertLog(unitConversion);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -168,6 +178,7 @@
}
@Override
+ @Transactional
public UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form) {
//������������������
UnitConversionDTO dto = new UnitConversionDTO();
@@ -203,4 +214,37 @@
if(!ObjectUtils.isEmpty(unitConversions))
redisTemplate.opsForList().leftPushAll(RedisConstants.UNIT_CONVERSION,unitConversions);
}
+
+ /**
+ * @Description: ������������������������
+ * @Param: [unitConversion]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/8/26
+ */
+ private void insertLog(UnitConversion unitConversion){
+ //������������������������
+ Map<String, SysDictData> units = sysDictDataService.getDictDatasByType("unit");
+ String originalUnitKey = unitConversion.getOriginalUnitKey();
+ String targetUnitKey = unitConversion.getTargetUnitKey();
+ SysDictData originalData = units.get(originalUnitKey);
+ SysDictData targetData = units.get(targetUnitKey);
+ String formula = unitConversion.getFormula();
+ //������������������
+ formula = formula.replace(Constants.FORMULA_PLACEHOLDER, "���������");
+ formula = "������������"+" = "+formula;
+ String sensorCode = unitConversion.getSensorCode();
+ StringBuilder content = new StringBuilder();
+ content.append("���������������������������;");
+ content.append("������������"+originalData.getDataValue()+";");
+ content.append("���������������"+targetData.getDataValue()+";");
+ content.append("���������������"+formula+";");
+ if(sensorCode!=null){
+ Sensor sensor = sensorService.getSensorByCode(sensorCode);
+ if(sensor!=null)
+ content.append("���������������"+sensor.getName()+";");
+ }
+
+ logUtils.saveOperationForManage(content.toString(),Constants.INSERT_OPERATE_TYPE);
+ }
}
--
Gitblit v1.8.0