#

Junjie

2025-04-29 af27c2aa0946c633e78b2ce2cfb23116d13519be

#

 src/main/java/com/zy/asrs/controller/DeviceDataLogController.java

New file
@@ -0,0 +1,125 @@
package com.zy.asrs.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.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.DeviceDataLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;

@RestController
public class DeviceDataLogController extends BaseController {

    @Autowired
    private DeviceDataLogService deviceDataLogService;

    @RequestMapping(value = "/deviceDataLog/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(deviceDataLogService.selectById(String.valueOf(id)));
    }

    @RequestMapping(value = "/deviceDataLog/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<DeviceDataLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(DeviceDataLog.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(deviceDataLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    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());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/deviceDataLog/add/auth")
    @ManagerAuth
    public R add(DeviceDataLog deviceDataLog) {
        deviceDataLogService.insert(deviceDataLog);
        return R.ok();
    }

    @RequestMapping(value = "/deviceDataLog/update/auth")
    @ManagerAuth
    public R update(DeviceDataLog deviceDataLog){
        if (Cools.isEmpty(deviceDataLog) || null==deviceDataLog.getId()){
            return R.error();
        }
        deviceDataLogService.updateById(deviceDataLog);
        return R.ok();
    }

    @RequestMapping(value = "/deviceDataLog/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            deviceDataLogService.deleteById(id);
        }
        return R.ok();
    }

    @RequestMapping(value = "/deviceDataLog/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<DeviceDataLog> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("deviceDataLog"));
        convert(map, wrapper);
        List<DeviceDataLog> list = deviceDataLogService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/deviceDataLogQuery/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<DeviceDataLog> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        Page<DeviceDataLog> page = deviceDataLogService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (DeviceDataLog deviceDataLog : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", deviceDataLog.getId());
            map.put("value", deviceDataLog.getId());
            result.add(map);
        }
        return R.ok(result);
    }

    @RequestMapping(value = "/deviceDataLog/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<DeviceDataLog> wrapper = new EntityWrapper<DeviceDataLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != deviceDataLogService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(DeviceDataLog.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

}

 src/main/java/com/zy/asrs/entity/DeviceDataLog.java

New file
@@ -0,0 +1,86 @@
package com.zy.asrs.entity;

import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;

@Data
@TableName("wcs_device_data_log")
public class DeviceDataLog implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value= "")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 设备类型
     */
    @ApiModelProperty(value= "设备类型")
    private String type;

    /**
     * 设备号
     */
    @ApiModelProperty(value= "设备号")
    @TableField("device_no")
    private Integer deviceNo;

    /**
     * 源数据
     */
    @ApiModelProperty(value= "源数据")
    @TableField("origin_data")
    private String originData;

    /**
     * 源数据解析后得到的wcs数据
     */
    @ApiModelProperty(value= "源数据解析后得到的wcs数据")
    @TableField("wcs_data")
    private String wcsData;

    /**
     * 采集时间
     */
    @ApiModelProperty(value= "采集时间")
    @TableField("create_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    public DeviceDataLog() {}

    public DeviceDataLog(String type,Integer deviceNo,String originData,String wcsData,Date createTime) {
        this.type = type;
        this.deviceNo = deviceNo;
        this.originData = originData;
        this.wcsData = wcsData;
        this.createTime = createTime;
    }

//    DeviceDataLog deviceDataLog = new DeviceDataLog(
//            null,    // 设备类型
//            null,    // 设备号
//            null,    // 源数据
//            null,    // 源数据解析后得到的wcs数据
//            null    // 采集时间
//    );

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }


}

 src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.DeviceDataLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@Mapper
@Repository
public interface DeviceDataLogMapper extends BaseMapper<DeviceDataLog> {

}

 src/main/java/com/zy/asrs/service/DeviceDataLogService.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.DeviceDataLog;
import com.baomidou.mybatisplus.service.IService;

public interface DeviceDataLogService extends IService<DeviceDataLog> {

}

 src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;

import com.zy.asrs.mapper.DeviceDataLogMapper;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.DeviceDataLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

@Service("deviceDataLogService")
public class DeviceDataLogServiceImpl extends ServiceImpl<DeviceDataLogMapper, DeviceDataLog> implements DeviceDataLogService {

}

 src/main/java/com/zy/common/CodeBuilder.java

@@ -17,14 +17,14 @@
//        generator.table="sys_host";
        // sqlserver
        generator.sqlOsType = SqlOsType.SQL_SERVER;
        generator.url="127.0.0.1:1433;databasename=ghtzasrs";
        generator.url="127.0.0.1:1433;databasename=ynhfasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="man_api_log";
        generator.table="wcs_device_data_log";
        generator.packagePath="com.zy.asrs";
        generator.js = false;
        generator.html = false;
        generator.sql = false;
        generator.js = true;
        generator.html = true;
        generator.sql = true;
        generator.build();
    }


 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -308,6 +308,11 @@
    //指令ID
    private Integer commandId;

    /**
     * 日志采集时间
     */
    private Long deviceDataLog = System.currentTimeMillis();

    public void setMode(Short mode) {
        this.mode = mode;
        this.modeType = CrnModeType.get(mode);

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -37,6 +37,9 @@
    private CrnProtocol crnProtocol;
    private boolean resetFlag = false;

    //原始设备数据
    private Object originDeviceData;

    public SiemensCrnThread(CrnSlave slave) {
        this.slave = slave;
    }
@@ -142,6 +145,7 @@

        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
        if (result.IsSuccess) {
            this.originDeviceData = result.Content;
            if (null == crnProtocol) {
                crnProtocol = new CrnProtocol();
            }
@@ -182,6 +186,27 @@
                }
            }

            if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 5) {
                if (this.originDeviceData != null) {
                    //采集时间超过5s，保存一次数据记录
                    //保存数据记录
                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                    if (deviceDataLogService == null) {
                        return;
                    }
                    DeviceDataLog deviceDataLog = new DeviceDataLog();
                    deviceDataLog.setOriginData(JSON.toJSONString(this.originDeviceData));
                    deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
                    deviceDataLog.setType(String.valueOf(SlaveType.Crn));
                    deviceDataLog.setDeviceNo(slave.getId());
                    deviceDataLog.setCreateTime(new Date());
                    deviceDataLogService.insert(deviceDataLog);

                    //更新采集时间
                    crnProtocol.setDeviceDataLog(System.currentTimeMillis());
                }
            }

            try {
                // 根据实时信息更新数据库
                BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);

 src/main/resources/mapper/DeviceDataLogMapper.xml

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.DeviceDataLogMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DeviceDataLog">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="device_no" property="deviceNo" />
        <result column="origin_data" property="originData" />
        <result column="wcs_data" property="wcsData" />
        <result column="create_time" property="createTime" />

    </resultMap>

</mapper>

 src/main/webapp/static/js/deviceDataLog/deviceDataLog.js

New file
@@ -0,0 +1,255 @@
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 layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#deviceDataLog',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/deviceDataLog/list/auth',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', align: 'center',title: ''}
            ,{field: 'type', align: 'center',title: '设备类型'}
            ,{field: 'deviceNo', align: 'center',title: '设备号'}
            ,{field: 'originData', align: 'center',title: '源数据'}
            ,{field: 'wcsData', align: 'center',title: '源数据解析后得到的wcs数据'}
            ,{field: 'createTime$', align: 'center',title: '采集时间'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(deviceDataLog)', 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(deviceDataLog)', 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 = {
                        'deviceDataLog': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/deviceDataLog/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(deviceDataLog)', 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+"/deviceDataLog/"+(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+"/deviceDataLog/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: '.layui-laydate-range'
                ,type: 'datetime'
                ,range: true
            });
            layDate.render({
                elem: '#createTime\\$',
                type: 'datetime',
                value: data!==undefined?data['createTime\\$']: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/deviceDataLog/deviceDataLog.html

New file
@@ -0,0 +1,116 @@
<!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">
                            <input class="layui-input" type="text" name="id" 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>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">
                        </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="deviceDataLog" lay-filter="deviceDataLog"></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" style="float: right">导出</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/deviceDataLog/deviceDataLog.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">设备类型: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="type" placeholder="请输入设备类型">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">设备号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="deviceNo" placeholder="请输入设备号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源数据: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="originData" placeholder="请输入源数据">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源数据解析后得到的wcs数据: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="wcsData" placeholder="请输入源数据解析后得到的wcs数据">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">采集时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" 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>