#

Junjie

3 天以前 cdbf5aeade2d18adf96657e51bfb9a3dcc471b3e

#

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

@@ -77,6 +77,13 @@
    @TableField("fake_init_status")
    private String fakeInitStatus;

    /**
     * 网关编号
     */
    @ApiModelProperty(value= "网关编号")
    @TableField("gateway_id")
    private Integer gatewayId;

    public DeviceConfig() {}

    public DeviceConfig(String ip,Integer port,String threadImpl,Date createTime,String deviceType,Integer deviceNo) {

 src/main/resources/mapper/DeviceConfigMapper.xml

@@ -13,6 +13,7 @@
        <result column="device_no" property="deviceNo" />
        <result column="fake" property="fake" />
        <result column="fake_init_status" property="fakeInitStatus" />
        <result column="gateway_id" property="gatewayId" />

    </resultMap>


 src/main/webapp/static/js/deviceConfig/deviceConfig.js

@@ -27,6 +27,7 @@
            ,{field: 'ip', align: 'center',title: '设备ip'}
            ,{field: 'port', align: 'center',title: '设备端口'}
            ,{field: 'threadImpl', align: 'center',title: '实现类'}
            ,{field: 'gatewayId', align: 'center',title: '网关编号'}
            ,{field: 'fake$', align: 'center',title: '虚拟设备'}
            ,{field: 'fakeInitStatus', align: 'center',title: '虚拟设备初始化设备状态'}
            ,{field: 'createTime$', align: 'center',title: '创建时间'}

 src/main/webapp/views/admin/deviceConfig/deviceConfig.html

@@ -103,6 +103,12 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">网关编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="gatewayId" placeholder="请输入网关编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">虚拟设备: </label>
                    <div class="layui-input-block">
                        <select name="fake">