最新版本541200007最新版本541200007

doum

7 天以前 d71e3a495a125811889fdf7c2a2ec0650e28262d

最新版本541200007最新版本541200007

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceData.java

@@ -31,7 +31,6 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -40,7 +39,6 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -90,8 +88,8 @@
    @ExcelColumn(name="属性值7")
    private String val7;

    @ApiModelProperty(value = "数据来源 0mqtt上报 1其他", example = "1")
    @ExcelColumn(name="数据来源 0mqtt上报 1其他")
    @ApiModelProperty(value = "数据来源 0mqtt上报综合状态 1远程控制 ", example = "1")
    @ExcelColumn(name="数据来源 0mqtt上报综合状态 1远程控制")
    private Integer dataType;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java

@@ -403,6 +403,21 @@
                .set(Device::getEditDate,new Date())
                .set(Device::getEdirot,param.getLoginUserInfo().getId())
                .eq(Device::getId,param.getId()));

        DeviceData data = new DeviceData();
        data.setCreateDate(new Date());
        data.setEditDate(new Date());
        data.setCreator(param.getLoginUserInfo().getId());
        data.setEditor(param.getLoginUserInfo().getId());
        data.setDeviceId(param.getId()+"");
        data.setDataType(Constants.ONE);//
        data.setVal1("远程控制");
        data.setVal2(curremak);
        data.setHappenTime(DateUtil.getPlusTime2(data.getCreateDate()));
        data.setVal3((Constants.equalsInteger(param.getStatus(),Constants.ONE)?"【开闸】":"【关闸】"));
        data.setVal4(param.getLoginUserInfo().getRealname());
        data.setVal5(param.getChannelNo());
        deviceDataMapper.insert(data);
    }

    private MqttConfig getMqttConfigByParam(Device model,String index) {
@@ -625,6 +640,7 @@
                        String[] btns = device.getChannelInfo().split(",");
                        Date startDate = new Date((System.currentTimeMillis()-time*1000));//查询开始时间
                        List<DeviceData> dataList = deviceDataMapper.selectList(new QueryWrapper<DeviceData>().lambda()
                                .eq(DeviceData::getDataType,Constants.ZERO)
                                .eq(DeviceData::getDeviceId,device.getId())
                                .in(DeviceData::getVal1,btns)
                                .ge(DeviceData::getHappenTime,DateUtil.getPlusTime2(startDate))