2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-16 8b4c0b2fbbad5dfedeaf1c295088d6df243d2cd0
日志
已修改5个文件
109 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -1,10 +1,12 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.C3mChargingChargeParam;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingChargeMapper;
@@ -46,8 +48,15 @@
            c3m.setTimestamp(timestamp);
            save(c3m);
        }
//        LogService.getBean().log(userId,username,"修改C3m费率",null,
//                "{ "+ JSON.toJSONString(chargeEntities)+" }");
        /**
         * c3充电桩费率更改日志记录开始
         */
        String content = "c3充电桩费率更改:" + JSON.toJSONString(chargeEntities);
        StoreOperationRecordsUtils.storeOperationData(null, null, "c3充电桩费率更改", content);
        /**
         * c3充电桩费率更改日志记录结束
         */
        return true;
    }
@@ -62,6 +71,8 @@
        BeanUtil.copyProperties(c3, charge);
        charge.setTimestamp(new Date().getTime());
//        c3mChargingChargeMapper.insertCharge(charge);
        return save(charge);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -14,17 +14,17 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.AdminMapper;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@@ -157,6 +157,14 @@
        client.setLinkMan(updateClientPrarm.getLinkMan());
        client.setMobile(updateClientPrarm.getMobile());
        /**
         * 添加管理员日志记录开始
         */
        String content = "编辑普通用户:" + client.getClientName() + "用户id:" + id;
        StoreOperationRecordsUtils.storeOperationData(null, null, "编辑普通用户", content);
        /**
         * 添加管理员日志记录结束
         */
        return updateById(client);
    }
@@ -215,6 +223,14 @@
        if (list != null && list.size() != 0) {
            throw new BusinessException("删除的用户下有下级用户,不允许删除");
        }
        /**
         * 删除普通用户日志记录开始
         */
        String content = "删除普通用户:" + one.getClientName() + "用户id:" + id;
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除普通用户", content);
        /**
         * 删除普通用户日志记录结束
         */
        return removeById(id);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -334,6 +334,14 @@
                }
        );
        /**
         * 删除控灯任务日志记录开始
         */
        String content = "{控灯任务id:" + taskIdList + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除控灯任务", content);
        /**
         * 删除控灯任务日志记录结束
         */
        return true;
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -9,14 +9,15 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.MonitorMapper;
@@ -162,6 +163,16 @@
            //删除摄像头设备前需要先解绑
            poleBindingService.unBindPole(null, monitor.getDeviceSerial());
        }
        /**
         * 删除摄像头日志记录开始
         */
        String content = "{摄像头Code:" + monitor.getDeviceSerial() + ", 摄像头名称:" + monitor.getDeviceName() + " }";
        List<String> listCode = new ArrayList<>();
        listCode.add(monitor.getDeviceSerial());
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除摄像头", content);
        /**
         * 删除摄像头日志记录结束
         */
        return removeById(Id);
    }
@@ -266,6 +277,7 @@
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
        boolean result;
        if ("200".equals(monitorDto.getCode()) || "20017".equals(monitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(monitorDto.getData().getDeviceSerial());
@@ -275,10 +287,23 @@
            monitor.setIsEncrypt(monitorDto.getData().getIsEncrypt());
            monitor.setDeviceType(monitorDto.getData().getModel());
            monitor.setNetAddress(monitorDto.getData().getNetAddress());
            return addMonitorInfoToTable(monitor);
            result = addMonitorInfoToTable(monitor);
            /**
             * 新增摄像头开始
             */
            String content = "{摄像头Code:" + monitor.getDeviceSerial() + ", 摄像头名称:" + monitor.getDeviceName() + " }";
            List<String> listCode = new ArrayList<>();
            listCode.add(monitor.getDeviceSerial());
            StoreOperationRecordsUtils.storeOperationData(listCode, null, "新增摄像头", content);
            /**
             * 新增摄像头结束
             */
        } else {
            return false;
            result = false;
        }
        return result;
    }
    /**
@@ -406,6 +431,17 @@
        }
        if (one != null) {
            one.setNote(notes);
            /**
             * 添加摄像头备注日志记录开始
             */
            String content = "编辑摄像头:" +deviceSerial+"编辑内容:"+notes;
            List<String> list  = new ArrayList<>();
            list.add(deviceSerial);
            StoreOperationRecordsUtils.storeOperationData(list, null, "编辑摄像头", content);
            /**
             * 添加摄像头备注日志记录结束
             */
            return updateById(one);
        } else {
            throw new BusinessException("摄像头设备不存在!");
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -99,6 +99,14 @@
        Pole update = new Pole();
        BeanUtils.copyProperties(param, update);
        update.setId(poleId);
        /**
         * 修改灯杆日志记录开始
         */
        String content = "编辑灯杆:" + poleId;
        StoreOperationRecordsUtils.storeOperationData(null, null, "编辑灯杆", content);
        /**
         * 修改灯杆日志记录结束
         */
        return updateById(update);
    }
@@ -112,6 +120,16 @@
        }
        // 删除灯杆绑定关系
        poleBindingService.remove(Wrappers.<PoleBinding>lambdaQuery().eq(PoleBinding::getPoleId, poleId));
        /**
         * 删除灯杆日志记录开始
         */
        String content = "{灯杆Code:" + pole.getDeviceCode() + ", 灯杆名称:" + pole.getPoleName() + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "删除灯杆", content);
        /**
         * 删除灯杆日志记录结束
         */
        return removeById(poleId);
    }