2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-17 ecf4d66d0e45837adfe1bf8e2d34274bcfed60fd
日志
已修改8个文件
148 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/domain/AliConfigEntity.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/WxConfigEntity.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/UsrAlipayConfigMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/UsrWxPayConfigMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/AliConfigEntity.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
/**
 * 
@@ -41,6 +43,13 @@
    private String pid;
    /**
     * 状态  1启用 / 0未启用
     */
    @JsonIgnore
    private Integer state;
    /**
     * 客户id
     */
    private Long clientId;
dao/src/main/java/com/sandu/ximon/dao/domain/WxConfigEntity.java
@@ -1,22 +1,23 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
/**
 *
 * @TableName wx_config
 */
@TableName(value = "wx_config")
@TableName(value ="wx_config")
@Data
public class WxConfigEntity implements Serializable {
    /**
     *
     *
     */
    @TableId(type = IdType.AUTO)
    private Long configId;
@@ -32,22 +33,28 @@
    private String appappid;
    /**
     *
     *
     */
    private String mchId;
    /**
     *
     *
     */
    private String privateKey;
    /**
     *
     * 状态  1启用 / 0未启用
     */
    @JsonIgnore
    private Integer state;
    /**
     *
     */
    private Long clientId;
    /**
     *
     *
     */
    private Long createUserId;
dao/src/main/resources/mapper/UsrAlipayConfigMapper.xml
@@ -5,17 +5,19 @@
<mapper namespace="com.sandu.ximon.dao.mapper.UsrAlipayConfigMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AliConfigEntity">
            <id property="configId" column="config_id" jdbcType="INTEGER"/>
            <result property="appId" column="app_id" jdbcType="VARCHAR"/>
            <result property="privateKey" column="private_key" jdbcType="VARCHAR"/>
            <result property="publicKey" column="public_key" jdbcType="VARCHAR"/>
            <result property="pid" column="pid" jdbcType="VARCHAR"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="createUserId" column="create_user_id" jdbcType="BIGINT"/>
        <id property="configId" column="config_id" jdbcType="INTEGER"/>
        <result property="appId" column="app_id" jdbcType="VARCHAR"/>
        <result property="privateKey" column="private_key" jdbcType="VARCHAR"/>
        <result property="publicKey" column="public_key" jdbcType="VARCHAR"/>
        <result property="pid" column="pid" jdbcType="VARCHAR"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="clientId" column="client_id" jdbcType="BIGINT"/>
        <result property="createUserId" column="create_user_id" jdbcType="BIGINT"/>
    </resultMap>
    <sql id="Base_Column_List">
        config_id,app_id,private_key,
        config_id
        ,app_id,private_key,
        public_key,pid,client_id,
        create_user_id
    </sql>
dao/src/main/resources/mapper/UsrWxPayConfigMapper.xml
@@ -5,17 +5,19 @@
<mapper namespace="com.sandu.ximon.dao.mapper.UsrWxPayConfigMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AliConfigEntity">
            <id property="configId" column="config_id" jdbcType="BIGINT"/>
            <result property="appid" column="appid" jdbcType="VARCHAR"/>
            <result property="appappid" column="appappid" jdbcType="VARCHAR"/>
            <result property="mchId" column="mch_id" jdbcType="VARCHAR"/>
            <result property="privateKey" column="private_key" jdbcType="VARCHAR"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="createUserId" column="create_user_id" jdbcType="BIGINT"/>
        <id property="configId" column="config_id" jdbcType="BIGINT"/>
        <result property="appid" column="appid" jdbcType="VARCHAR"/>
        <result property="appappid" column="appappid" jdbcType="VARCHAR"/>
        <result property="mchId" column="mch_id" jdbcType="VARCHAR"/>
        <result property="privateKey" column="private_key" jdbcType="VARCHAR"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="clientId" column="client_id" jdbcType="BIGINT"/>
        <result property="createUserId" column="create_user_id" jdbcType="BIGINT"/>
    </resultMap>
    <sql id="Base_Column_List">
        config_id,appid,appappid,
        config_id
        ,appid,appappid,
        mch_id,private_key,client_id,
        create_user_id
    </sql>
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -1,16 +1,17 @@
package com.sandu.ximon.admin.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.FileOperationRecordService;
import com.sandu.ximon.admin.service.LedSFileService;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.FileOperationRecord;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -80,6 +81,15 @@
        BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
        fileOperationRecord.setDataType(dateType);
        fileOperationRecordService.save(fileOperationRecord);
        /**
         * 文件上传 日志记录开始
         */
        String content = "文件内容:"+ JSON.toJSONString(fileUploadDto);
        StoreOperationRecordsUtils.storeOperationData(null, null, "文件上传", content);
        /**
         * 文件上传 日志记录结束
         */
        return ResponseUtil.success(fileUploadDto);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -13,6 +14,7 @@
import com.sandu.ximon.admin.minio.utils.MinIoUtil;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
@@ -48,6 +50,15 @@
        file.setFileName(fileParam.getFileName());
        file.setFileUrl(fileParam.getFileUrl());
        file.setOriginSize(fileParam.getOriginSize());
        /**
         * 音柱文件新增 日志记录开始
         */
        String content = "音柱文件名称:" + fileParam.getFileName() + ",文件大小:" + fileParam.getOriginSize() + ",文件路径:" + fileParam.getFileUrl();
        StoreOperationRecordsUtils.storeOperationData(null, null, "音柱文件新增", content);
        /**
         * 音柱文件新增 日志记录结束
         */
        return save(file);
    }
@@ -66,7 +77,14 @@
//        if (!b) {
//            throw new BusinessException("服务器删除失败");
//        }
        /**
         * 音柱文件删除 日志记录开始
         */
        String content = "删除文件id:"+fileId+"音柱文件名称:" + byId.getFileName() + ",文件大小:" + byId.getOriginSize() + ",文件路径:" + byId.getFileUrl();
        StoreOperationRecordsUtils.storeOperationData(null, null, "音柱文件删除", content);
        /**
         * 音柱文件删除 日志记录结束
         */
        return removeById(fileId);
    }
@@ -128,6 +146,16 @@
        fileUploadDto.setFileSize(file.getSize());
        fileUploadDto.setFileName(file.getOriginalFilename());
        fileUploadDto.setFileType(file.getContentType());
        /**
         * 音柱文件上传 日志记录开始
         */
        String content = "文件内容:"+ JSON.toJSONString(fileUploadDto);
        StoreOperationRecordsUtils.storeOperationData(null, null, "音柱文件上传", content);
        /**
         * 音柱文件上传 日志记录结束
         */
        return fileUploadDto;
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -1,11 +1,13 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.LEDProgramFileParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.LEDProgramFile;
import com.sandu.ximon.dao.mapper.LEDProgramFileMapper;
import lombok.AllArgsConstructor;
@@ -29,6 +31,15 @@
                file.setClientId(clientService.getClientId());
            }
        }
        /**
         * 诺瓦文件新增 日志记录开始
         */
        String content = "文件内容:"+ JSON.toJSONString(file);
        StoreOperationRecordsUtils.storeOperationData(null, null, "诺瓦文件新增", content);
        /**
         * 诺瓦文件新增 日志记录结束
         */
        return save(file);
    }
@@ -37,6 +48,14 @@
        if (byId == null) {
            throw new BusinessException("未找到该节目");
        }
        /**
         * 诺瓦文件删除 日志记录开始
         */
        String content = "文件id:"+id+"文件内容:"+ JSON.toJSONString(byId);
        StoreOperationRecordsUtils.storeOperationData(null, null, "诺瓦文件删除", content);
        /**
         * 诺瓦文件删除 日志记录结束
         */
        return removeById(id);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedSFileService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
@@ -7,6 +8,7 @@
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.FileOperationRecord;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.mapper.LedSFileMapper;
@@ -49,6 +51,14 @@
                sFile.setCilentId(clientService.getClientId());
            }
        }
        /**
         * 熙汛文件上传 日志记录开始
         */
        String content = "文件内容:"+ JSON.toJSONString(fileUploadDto);
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛文件上传", content);
        /**
         * 熙汛文件上传 日志记录结束
         */
        return save(sFile);
    }
@@ -57,6 +67,15 @@
        if (byId == null) {
            throw new BusinessException("未找到该节目");
        }
        /**
         * 熙汛文件删除 日志记录开始
         */
        String content = "文件内容id:"+ id+"文件内容:"+ JSON.toJSONString(byId);
        StoreOperationRecordsUtils.storeOperationData(null, null, "熙汛文件删除", content);
        /**
         * 熙汛文件删除 日志记录结束
         */
        return removeById(id);
    }