日志汇总信息

pang.jiabao

2024-06-14 fae1041e58137c61ea1e7075323351e8873fe931

日志汇总信息

 src/main/java/com/zy/system/controller/SaasLogController.java

@@ -1,18 +1,15 @@
package com.zy.system.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.system.entity.SaasLog;
import com.zy.system.service.SaasLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.*;
import com.zy.common.web.BaseController;
import com.zy.system.entity.SaasLog;
import com.zy.system.mapper.SaasLogMapper;
import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -23,6 +20,9 @@

    @Autowired
    private SaasLogService saasLogService;

    @Autowired
    private SaasLogMapper saasLogMapper;

    @RequestMapping(value = "/saasLog/{id}/auth")
    @ManagerAuth
@@ -45,6 +45,132 @@
        return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/saasLogSummary/list/auth")
    @ManagerAuth
    public R saasLogSummarylist(@RequestParam Map<String, Object> param){
        String io_time = (String) param.get("io_time");
        Date sDate = null;
        Date eDate = null;
        if(!Cools.isEmpty(io_time) && io_time.contains(RANGE_TIME_LINK)) {
            String[] dates = io_time.split(RANGE_TIME_LINK);
            sDate = DateUtils.convert(dates[0]);
            eDate = DateUtils.convert(dates[1]);
        }
        String type = (String) param.get("type");
        String owner = (String) param.get("owner");

        ArrayList<SaasLog> list = saasLogMapper.selectListSummary(sDate,eDate,type,owner);
        double sum = list.stream().mapToDouble(SaasLog::getAnfme).sum();
        ListIterator<SaasLog> saasLogListIterator = list.listIterator();
        String a = null;
        while (saasLogListIterator.hasNext()){
            SaasLog next = saasLogListIterator.next();

            if (!next.getOwner().equals(a)){
                if (a != null) {

                    ArrayList<SaasLog> list1 = saasLogMapper.selectListSummaryBySubtotal(a,sDate,eDate,type);
                    for (SaasLog saasLog : list1) {
                        saasLogListIterator.previous();
                        saasLog.setMatnr("小计");
                        saasLogListIterator.add(saasLog);
                        saasLogListIterator.next();
                    }
                    saasLogListIterator.previous();
                    SaasLog saasLog1 = new SaasLog();
                    saasLog1.setOwner(a);
                    saasLog1.setMatnr("合计");
                    saasLog1.setAnfme(list1.stream().mapToDouble(SaasLog::getAnfme).sum());
                    saasLogListIterator.add(saasLog1);
                    saasLogListIterator.next();
                }

                a = next.getOwner();
            }
        }
        ArrayList<SaasLog> list1 = saasLogMapper.selectListSummaryBySubtotal(a,sDate,eDate,type);
        for (SaasLog saasLog : list1) {
            saasLog.setMatnr("小计");
            saasLogListIterator.add(saasLog);
        }
        SaasLog saasLog1 = new SaasLog();
        saasLog1.setOwner(a);
        saasLog1.setMatnr("合计");
        saasLog1.setAnfme(list1.stream().mapToDouble(SaasLog::getAnfme).sum());
        saasLogListIterator.add(saasLog1);

        SaasLog saasLog = new SaasLog();
        saasLog.setOwner("总计");
        saasLog.setAnfme(sum);
        list.add(saasLog);

        return R.ok(list);
    }

    @RequestMapping(value = "/saasLogSummary/export/auth")
    @ManagerAuth
    public R summaryExport(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("saasLog"));
        String io_time = (String) map.get("io_time");
        Date sDate = null;
        Date eDate = null;
        if(!Cools.isEmpty(io_time) && io_time.contains(RANGE_TIME_LINK)) {
            String[] dates = io_time.split(RANGE_TIME_LINK);
            sDate = DateUtils.convert(dates[0]);
            eDate = DateUtils.convert(dates[1]);
        }
        String type = (String) map.get("type");
        String owner = (String) map.get("owner");

        ArrayList<SaasLog> list = saasLogMapper.selectListSummary(sDate,eDate,type,owner);
        double sum = list.stream().mapToDouble(SaasLog::getAnfme).sum();
        ListIterator<SaasLog> saasLogListIterator = list.listIterator();
        String a = null;
        while (saasLogListIterator.hasNext()){
            SaasLog next = saasLogListIterator.next();

            if (!next.getOwner().equals(a)){
                if (a != null) {

                    ArrayList<SaasLog> list1 = saasLogMapper.selectListSummaryBySubtotal(a,sDate,eDate,type);
                    for (SaasLog saasLog : list1) {
                        saasLogListIterator.previous();
                        saasLog.setMatnr("小计");
                        saasLogListIterator.add(saasLog);
                        saasLogListIterator.next();
                    }
                    saasLogListIterator.previous();
                    SaasLog saasLog1 = new SaasLog();
                    saasLog1.setOwner(a);
                    saasLog1.setMatnr("合计");
                    saasLog1.setAnfme(list1.stream().mapToDouble(SaasLog::getAnfme).sum());
                    saasLogListIterator.add(saasLog1);
                    saasLogListIterator.next();
                }

                a = next.getOwner();
            }
        }
        ArrayList<SaasLog> list1 = saasLogMapper.selectListSummaryBySubtotal(a,sDate,eDate,type);
        for (SaasLog saasLog : list1) {
            saasLog.setMatnr("小计");
            saasLogListIterator.add(saasLog);
        }
        SaasLog saasLog1 = new SaasLog();
        saasLog1.setOwner(a);
        saasLog1.setMatnr("合计");
        saasLog1.setAnfme(list1.stream().mapToDouble(SaasLog::getAnfme).sum());
        saasLogListIterator.add(saasLog1);

        SaasLog saasLog = new SaasLog();
        saasLog.setOwner("总计");
        saasLog.setAnfme(sum);
        list.add(saasLog);

        return R.ok(exportSupport(list, fields));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());

 src/main/java/com/zy/system/mapper/SaasLogMapper.java

@@ -1,12 +1,36 @@
package com.zy.system.mapper;

import com.zy.system.entity.SaasLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.system.entity.SaasLog;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.ArrayList;
import java.util.Date;

@Mapper
@Repository
public interface SaasLogMapper extends BaseMapper<SaasLog> {
    /**
     * 分组统计日志详情
     * @param sDate
     * @param eDate
     * @param type
     * @param owner
     * @return
     */
    ArrayList<SaasLog> selectListSummary(@Param("sDate") Date sDate, @Param("eDate") Date eDate
                                         , @Param("type") String type, @Param("owner") String owner);

    /**
     * 分组统计主体小计
     * @param owner
     * @param sDate
     * @param eDate
     * @param type
     * @return
     */
    ArrayList<SaasLog> selectListSummaryBySubtotal(@Param("owner") String owner,@Param("sDate") Date sDate,@Param("eDate") Date eDate
                                        ,@Param("type") String type);
}

 src/main/resources/mapper/SaasLogMapper.xml

@@ -13,5 +13,57 @@
        <result column="create_by_name" property="createByName" />

    </resultMap>
    <select id="selectListSummary" resultType="com.zy.system.entity.SaasLog">
        select
            ISNULL(owner,
                   '') owner,
            type,
            matnr ,
            sum(ssl.anfme) anfme
        from
            sys_saas_log ssl
        <where>
            <if test="sDate != null">
                and io_time &gt; #{sDate}
            </if>
            <if test="eDate != null">
                and io_time &lt; #{eDate}
            </if>
            <if test="type != null and type != ''">
                and type = #{type}
            </if>
            <if test="owner != null and owner != ''">
                and owner = #{owner}
            </if>
        </where>
        group by
            ssl.owner,
            ssl.type,
            ssl.matnr
        order by
            ssl.owner,
            type
    </select>
    <select id="selectListSummaryBySubtotal" resultType="com.zy.system.entity.SaasLog">
        select owner,type,sum(anfme) anfme from sys_saas_log
        <where>
            <if test="owner == ''">
                owner IS NULL
            </if>
            <if test="owner != ''">
                owner = #{owner}
            </if>
            <if test="sDate != null">
                and io_time &gt; #{sDate}
            </if>
            <if test="eDate != null">
                and io_time &lt; #{eDate}
            </if>
            <if test="type != null and type != ''">
                and type = #{type}
            </if>
        </where>
        group by owner,type order by owner,type
    </select>

</mapper>

 src/main/webapp/static/js/saasLog/saasLogSummary.js

New file
@@ -0,0 +1,265 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var form = layui.form;
    var admin = layui.admin;
    var laydate = layui.laydate;

    // 日期时间范围
    laydate.render({
        elem: '#ID-laydate-range-datetime',
        type: 'datetime',
        range: true
    });

    // 数据渲染
    tableIns = table.render({
        elem: '#saasLog',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/saasLogSummary/list/auth',
        page: false,
        totalRow: false, // 开启合计行
        limit: 16,
        limits: [16, 50, 100, 200, 500,2000,5000,10000],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
             //{type: 'checkbox'}
            ,{field: 'id', align: 'center',title: 'id', hide:true}
            // ,{field: 'locNo', align: 'center',title: '库位'}
            ,{field: 'owner', align: 'center',title: '主体'}
            ,{field: 'type$', align: 'center',title: '操作类型'}
            ,{field: 'matnr', align: 'center',title: '牌号'}
            // ,{field: 'batch', align: 'center',title: '批号'}
            // ,{field: 'packageNo', align: 'center',title: '包号'}
            // ,{field: 'targetLocNo', align: 'center',title: '目标库位'}
            // ,{field: 'workshop', align: 'center',title: '车间'}
            ,{field: 'anfme', align: 'center',title: '数量',totalRow:true}
            // ,{field: 'docType$', align: 'center',title: '单据类型',totalRow:true}
            // ,{field: 'createByName', align: 'center',title: '操作人'}
            // ,{field: 'ioTime$', align: 'center',title: '操作时间'}
            // ,{field: 'createBy', align: 'center',title: '', hide:true}

        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(saasLog)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(saasLog)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'saasLog': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/saasLogSummary/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(saasLog)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/saasLog/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/saasLog/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '#ioTime\\$',
                type: 'datetime',
                value: data!==undefined?data['ioTime\\$']:null
            });

        }, 300);
    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/views/saasLog/saasLogSummary.html

New file
@@ -0,0 +1,150 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>

<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="type">
                                <option value="">操作类型</option>
                                <option value="0">入库</option>
                                <option value="1">出库</option>
                                <option value="2">移库</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="owner" placeholder="主体" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="matnr" placeholder="牌号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="workshop" placeholder="车间" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="package_no" placeholder="包号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline" style="width: 300px">
                        <!--            <div class="layui-input-inline">-->
                        <!--                <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->
                        <!--            </div>-->
                        <div class="layui-input-inline" style="width: 300px">
                            <input type="text" class="layui-input" name="io_time" id="ID-laydate-range-datetime" placeholder="起始时间 - 终止时间">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="saasLog" lay-filter="saasLog"></table>
        </div>
    </div>
</div>

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/saasLog/saasLogSummary.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">id: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="id" placeholder="请输入id" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">{0:入库,1:出库}: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="type" placeholder="请输入{0:入库,1:出库}">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="locNo" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ioTime" id="ioTime$" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createBy" placeholder="请输入">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>