2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-18 f03159b37465b246141abaa2fb2f1f725f398278
日志
已修改9个文件
81 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -191,7 +191,7 @@
    @GetMapping(value = "/logout")
    public ResponseVO<Object> LogOut() {
        String content = "用户名:" + SecurityUtils.getUsername();
        StoreOperationRecordsUtils.storeOperationData(null, null, "用户退出登录", content);
        StoreOperationRecordsUtils.storeOperationData(null, null, "用管理员退出登录", content);
        String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
        redisService.set(key, null);
        return ResponseUtil.success("退出登录成功");
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -8,7 +8,6 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.entity.ProgramPro;
@@ -408,13 +407,13 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        /**
         * 熙汛定时删除
         * 熙汛定时删除 日志记录开始
         */
        String content = "{删除的熙汛定时id:" + ids + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛定时删除", content);
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛定时任务删除", content);
        /**
         * 熙汛定时删除
         * 熙汛定时删除 日志记录结束
         */
        return ResponseUtil.success(scheduleService.removeByIds(ids));
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
@@ -16,11 +15,13 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.AdminRoleRelation;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,7 +82,7 @@
        /**
         * 添加管理员日志记录开始
         */
        String content = "新注册用户:" + param.getUsername();
        String content = "新注册管理员:" + param.getUsername();
        StoreOperationRecordsUtils.storeOperationData(null, null, "添加管理员", content);
        /**
         * 添加管理员日志记录结束
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java
@@ -50,12 +50,12 @@
        }
        /**
         * c3充电桩费率更改日志记录开始
         * c3充电桩费率更改 日志记录开始
         */
        String content = "c3充电桩费率更改:" + JSON.toJSONString(chargeEntities);
        StoreOperationRecordsUtils.storeOperationData(null, null, "c3充电桩费率更改", content);
        /**
         * c3充电桩费率更改日志记录结束
         * c3充电桩费率更改 日志记录结束
         */
        return true;
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -97,12 +97,12 @@
        }
        /**
         * 添加管理员日志记录开始
         * 添加普通用户 日志记录开始
         */
        String content = "新注册用户:" + addClientPrarm.getClientName();
        StoreOperationRecordsUtils.storeOperationData(null, null, "添加普通用户", content);
        /**
         * 添加管理员日志记录结束
         * 添加普通用户 日志记录结束
         */
        return flag;
@@ -158,12 +158,12 @@
        client.setMobile(updateClientPrarm.getMobile());
        /**
         * 添加管理员日志记录开始
         * 编辑普通用户 日志记录开始
         */
        String content = "编辑普通用户:" + client.getClientName() + "用户id:" + id;
        StoreOperationRecordsUtils.storeOperationData(null, null, "编辑普通用户", content);
        /**
         * 添加管理员日志记录结束
         * 编辑普通用户 日志记录结束
         */
        return updateById(client);
    }
@@ -224,12 +224,12 @@
            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/IpVolumeMissionService.java
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,7 +7,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -18,7 +16,10 @@
import com.sandu.ximon.admin.vo.TaskTerminalVO;
import com.sandu.ximon.admin.vo.TaskVO;
import com.sandu.ximon.dao.bo.IpVolumeMissionBo;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.IpVolumeMission;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -28,7 +29,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
/**
 * @Author liuhaonan
@@ -315,7 +315,7 @@
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
        }
        /**
         * IP音柱任务修改日志记录开始
         * IP音柱任务修改 日志记录开始
         */
        String content = "{任务ID:" + taskId
                + ",任务名:" + taskName
@@ -324,7 +324,7 @@
                + " }";
        StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP音柱任务修改", content);
        /**
         * IP音柱任务修改日志记录结束
         * IP音柱任务修改 日志记录结束
         */
        return result;
@@ -350,14 +350,14 @@
        }
        /**
         * IP音柱任务删除日志记录开始
         * IP音柱任务删除 日志记录开始
         */
        String content = "{删除的任务ID:" + taskId
                + ",任务删除结果:" + del
                + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱任务删除", content);
        /**
         * IP音柱任务删除日志记录结束
         * IP音柱任务删除 日志记录结束
         */
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -15,7 +14,6 @@
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class IpVolumeService extends BaseServiceImpl<IPBroadcastMapper, BroadcastTerminalV2Entity> {
@@ -61,11 +58,11 @@
            }
        });
        /**
         * IP音柱同步日志记录开始
         * IP音柱同步 日志记录开始
         */
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱同步", "IP音柱同步设备");
        /**
         * IP音柱同步日志记录结束
         * IP音柱同步 日志记录结束
         */
    }
@@ -164,12 +161,12 @@
        boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
        /**
         * IP音柱修改设备名称日志记录开始
         * IP音柱音量修改 日志记录开始
         */
        String content = "{设备Id:" + params.getId() + ",修改后音量:" + params.getDefaultVolumn() + "}";
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱音量修改", content);
//        String content = "{设备Id:" + params.getId() + ",修改后音量:" + params.getDefaultVolumn() + "}";
//        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱音量修改", content);
        /**
         * IP音柱改设备名称日志记录结束
         * IP音柱音量修改 日志记录结束
         */
        return flag;
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -95,12 +95,12 @@
        }
        /**
         * 熙汛定时更改
         * 熙汛定时更改 日志记录开始
         */
        String content = "{熙汛定时id:" + ledScheduleEntity.getId() + ",熙汛定时名称:" + ledScheduleEntity.getName() + "熙汛定时内容:" + JSON.toJSONString(ledScheduleEntity.getSchedule()) + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛定时更改", content);
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛定时任务更改", content);
        /**
         * 熙汛定时更改
         * 熙汛定时更改 日志记录结束
         */
        return this.save(ledScheduleEntity);
    }
@@ -132,7 +132,7 @@
        }
        /**
         * 熙汛定时新增
         * 熙汛定时推送 日志记录开始
         */
        String message = "";
        List<String> listCode = new ArrayList<>();
@@ -143,9 +143,9 @@
            message += "[屏幕Code:" + entity.getLightemitControlCode() + "屏幕名称:" + entity.getLightemitName() + "],";
        }
        String content = "{熙汛定时id:" + ledScheduleEntity.getId() + ",熙汛定时名称:" + ledScheduleEntity.getName() + "熙汛屏幕信息:" + message + " }";
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "熙汛定时更改", content);
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "推送熙汛定时任务", content);
        /**
         * 熙汛定时新增
         * 熙汛定时任务推送 日志记录结束
         */
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -245,7 +245,7 @@
                + ", 节目名称:" + byId.getName()
                + "}," + " 推送结果:" + result
                + " }";
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦推送定时任务", content);
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦推送播放计划", content);
        /**
         * 诺瓦推送节目日志记录结束
         */
@@ -313,7 +313,7 @@
                + ", 节目名称:" + one.getName()
                + "}," + " 推送结果:" + result
                + " }";
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦推送定时任务", content);
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦推送定时开关屏", content);
        /**
         * 诺瓦推送定时日志记录结束
         */