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 |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 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 a94e894..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
@@ -1,9 +1,11 @@
 package com.moral.api.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
@@ -13,13 +15,17 @@
 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;
 import com.moral.util.ConvertUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -43,6 +49,13 @@
     UnitConversionMapper unitConversionMapper;
     @Autowired
     SysDictDataService sysDictDataService;
+    @Autowired
+    RedisTemplate redisTemplate;
+    @Autowired
+    LogUtils logUtils;
+    @Autowired
+    SensorService sensorService;
+
 
     @Override
     @Transactional
@@ -75,6 +88,10 @@
         }
         //������������
         unitConversionMapper.insert(unitConversion);
+        //������������
+        refreshCache();
+        //������������
+        insertLog(unitConversion);
         //������������������
         dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -152,6 +169,8 @@
         oldUnitConversion = unitConversionMapper.selectOne(oldWrapper);
         //������
         unitConversionMapper.updateById(unitConversion);
+        //������������
+        refreshCache();
         //������������������
         dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -159,6 +178,7 @@
     }
 
     @Override
+    @Transactional
     public UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form) {
         //������������������
         UnitConversionDTO dto = new UnitConversionDTO();
@@ -176,9 +196,55 @@
         deleteWrapper.set("is_delete", Constants.DELETE);
         deleteWrapper.eq("id", id);
         unitConversionMapper.update(null, deleteWrapper);
+        //������������
+        refreshCache();
         //������������������
         dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
         return dto;
     }
+
+    /*������������*/
+    @Override
+    public void refreshCache(){
+        redisTemplate.delete((RedisConstants.UNIT_CONVERSION));
+        QueryWrapper<UnitConversion> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+        List<UnitConversion> unitConversions = unitConversionMapper.selectList(queryWrapper);
+        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