修复告警列表，新增0x11报警恢复，新增联动控制箱控制联动，优化设备导出，修增设备安装记录
小鱼干
3 weeks ago
parent
24971d96a4
commit
b9346d635a
Binary file not shown.
@ -0,0 +1,129 @@
|
||||
/*
|
||||
*
|
||||
* * | Licensed 未经许可不能去掉「OPENIITA」相关版权
|
||||
* * +----------------------------------------------------------------------
|
||||
* * | Author: xw2sy@163.com
|
||||
* * +----------------------------------------------------------------------
|
||||
*
|
||||
* Copyright [2024] [OPENIITA]
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
package cc.iotkit.manager.dto.bo.device;
|
||||
|
||||
import cc.iotkit.common.api.BaseDto;
|
||||
import cc.iotkit.model.device.DeviceInfo;
|
||||
import cc.iotkit.model.device.DeviceInstallInfo;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.Size;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@ApiModel(value = "DeviceInfoAddBo")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = DeviceInfo.class, reverseConvertGenerate = false)
|
||||
public class DeviceInfoAddBo extends BaseDto {
|
||||
|
||||
private static final long serialVersionUID = -1L;
|
||||
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Long createAt;
|
||||
|
||||
@ApiModelProperty(value = "设备id")
|
||||
@Size(max = 255, message = "设备id长度不正确")
|
||||
private String deviceId;
|
||||
|
||||
@ApiModelProperty(value = "设备名称")
|
||||
@Size(max = 255, message = "设备名称长度不正确")
|
||||
private String deviceName;
|
||||
|
||||
@ApiModelProperty(value = "设备类型")
|
||||
@Size(max = 255, message = "设备类型长度不正确")
|
||||
private String model;
|
||||
|
||||
@ApiModelProperty(value = "设备离线时间")
|
||||
private Long offlineTime;
|
||||
|
||||
@ApiModelProperty(value = "设备在线时间")
|
||||
private Long onlineTime;
|
||||
|
||||
@ApiModelProperty(value = "父级id")
|
||||
@Size(max = 255, message = "父级id长度不正确")
|
||||
private String parentId;
|
||||
|
||||
@ApiModelProperty(value = "产品key")
|
||||
@Size(max = 255, message = "产品key长度不正确")
|
||||
// @NotBlank(message = "产品Key不能为空")
|
||||
private String productKey;
|
||||
|
||||
@ApiModelProperty(value = "设备描述")
|
||||
@Size(max = 255, message = "设备描述长度不正确")
|
||||
private String secret;
|
||||
|
||||
@ApiModelProperty(value = "经度")
|
||||
private String longitude;
|
||||
|
||||
@ApiModelProperty(value = "纬度")
|
||||
private String latitude;
|
||||
@ApiModelProperty(value = "详细地址")
|
||||
private String site;
|
||||
private String name;
|
||||
@ApiModelProperty(value="部门表-区域id")
|
||||
private Long deptAreaId;
|
||||
@ApiModelProperty(value = "用户id")
|
||||
@Size(max = 255, message = "用户id长度不正确")
|
||||
private String uid;
|
||||
private Long tenantId;
|
||||
private String groupId;
|
||||
|
||||
private DeviceInstallInfo deviceInstallInfo;
|
||||
private String nodeOne;
|
||||
private String nodeTwo;
|
||||
private String nodeThree;
|
||||
private String nodeFour;
|
||||
private String nodeFive;
|
||||
private String nodeOneStatus;
|
||||
private String nodeTwoStatus;
|
||||
private String nodeThreeStatus;
|
||||
private String nodeFourStatus;
|
||||
private String nodeFiveStatus;
|
||||
private String nodeOneDevice;
|
||||
private String nodeTwoDevice;
|
||||
private String nodeThreeDevice;
|
||||
private String nodeFourDevice;
|
||||
private String nodeFiveDevice;
|
||||
/**
|
||||
* 设备所属分组
|
||||
*/
|
||||
/* private Map<String, DeviceInfo.Group> group = new HashMap<>();
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public static class Group {
|
||||
private String id;
|
||||
private String name;
|
||||
}*/
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
/*
|
||||
*
|
||||
* * | Licensed 未经许可不能去掉「OPENIITA」相关版权
|
||||
* * +----------------------------------------------------------------------
|
||||
* * | Author: xw2sy@163.com
|
||||
* * +----------------------------------------------------------------------
|
||||
*
|
||||
* Copyright [2024] [OPENIITA]
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
package cc.iotkit.manager.dto.vo.deviceinfo;
|
||||
|
||||
|
||||
import cc.iotkit.model.device.DeviceInstallInfo;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = DeviceInstallInfoVo.class, convertGenerate = false)
|
||||
public class DeviceInstallInfoExpordVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/* // @ApiModelProperty(value = "申请人")
|
||||
private String proposer;
|
||||
// @ApiModelProperty(value = "申请班组")
|
||||
private String proposerTeam;
|
||||
// @ApiModelProperty(value = "小区名称")
|
||||
private String communityName;*/
|
||||
// @ApiModelProperty(value = "用户名称")
|
||||
@ExcelProperty(value = "序号")
|
||||
private Integer xuhao;
|
||||
@ExcelProperty(value = "姓名")
|
||||
private String userName;
|
||||
// @ApiModelProperty(value = "用户电话")
|
||||
@ExcelProperty(value = "电话")
|
||||
private String userIpone;
|
||||
// @ApiModelProperty(value = "切断阀编号")
|
||||
@ExcelProperty(value = "地址")
|
||||
private String site;
|
||||
// @ApiModelProperty(value = "燃气表号")
|
||||
@ExcelProperty(value = "表号")
|
||||
private String gasMeterNumber;
|
||||
@ExcelProperty(value = "安装人")
|
||||
private String proposer;
|
||||
@ExcelProperty(value = "安装时间")
|
||||
// @ApiModelProperty(value = "申请时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date proposerTime;
|
||||
@ExcelProperty(value = "厂家")
|
||||
private String manufacturer;
|
||||
@ExcelProperty(value = "安装情况")
|
||||
private String position;
|
||||
/* // @ApiModelProperty(value = "备注")
|
||||
private String remarks;
|
||||
|
||||
private Integer state;*/
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
/*
|
||||
*
|
||||
* * | Licensed 未经许可不能去掉「OPENIITA」相关版权
|
||||
* * +----------------------------------------------------------------------
|
||||
* * | Author: xw2sy@163.com
|
||||
* * +----------------------------------------------------------------------
|
||||
*
|
||||
* Copyright [2024] [OPENIITA]
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* /
|
||||
*/
|
||||
|
||||
package cc.iotkit.manager.dto.vo.deviceinfo;
|
||||
|
||||
|
||||
import cc.iotkit.model.Owned;
|
||||
import cc.iotkit.model.TenantModel;
|
||||
import cc.iotkit.model.device.DeviceInfo;
|
||||
import cc.iotkit.model.device.DeviceInstallInfo;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import lombok.*;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@ApiModel(value = "DeviceInstallInfoVo")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = DeviceInstallInfo.class, convertGenerate = false)
|
||||
public class DeviceInstallInfoVo implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
/* // @ApiModelProperty(value = "申请人")
|
||||
private String proposer;
|
||||
// @ApiModelProperty(value = "申请班组")
|
||||
private String proposerTeam;
|
||||
// @ApiModelProperty(value = "小区名称")
|
||||
private String communityName;*/
|
||||
// @ApiModelProperty(value = "用户名称")
|
||||
@ExcelProperty(value = "序号")
|
||||
private Integer xuhao;
|
||||
@ExcelProperty(value = "姓名")
|
||||
private String userName;
|
||||
// @ApiModelProperty(value = "用户电话")
|
||||
@ExcelProperty(value = "电话")
|
||||
private String userIpone;
|
||||
// @ApiModelProperty(value = "切断阀编号")
|
||||
@ExcelProperty(value = "地址")
|
||||
private String site;
|
||||
// @ApiModelProperty(value = "燃气表号")
|
||||
@ExcelProperty(value = "表号")
|
||||
private String gasMeterNumber;
|
||||
@ExcelProperty(value = "安装人")
|
||||
private String proposer;
|
||||
@ExcelProperty(value = "安装时间")
|
||||
// @ApiModelProperty(value = "申请时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date proposerTime;
|
||||
@ExcelProperty(value = "厂家")
|
||||
private String manufacturer;
|
||||
@ExcelProperty(value = "安装情况")
|
||||
private String position;
|
||||
/* // @ApiModelProperty(value = "备注")
|
||||
private String remarks;
|
||||
|
||||
private Integer state;*/
|
||||
}
|
||||
Binary file not shown.
Loading…
Reference in New Issue