Skip to content

B
BYOD
Commit 78ba3997 by tutingyin
Options

refactor: 设备详情检索查询 cpu usb 网卡 磁盘信息检索

parent c1a24e62
Showing with 464 additions and 1355 deletions
mdm_bean/pom.xml
......@@ -33,4 +33,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentCpuVO.java
......@@ -12,26 +12,9 @@ import java.util.Date;
@Version:1.0
*/
@Data
@ApiModel("设备详细信息")
@ApiModel("cpu信息")
public class DeviceEquipmentCpuVO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("固件版本")
private String firmwareVersion;
@ApiModelProperty("版本型号")
private String modelNumber;
@ApiModelProperty("版本号码")
private String versionNumber;
@ApiModelProperty("CPU 架构")
private String cpuArch;
......@@ -50,89 +33,6 @@ public class DeviceEquipmentCpuVO {
@ApiModelProperty("CPU 对虚拟化的支持")
private String cpuVirtualization;
@ApiModelProperty("物理内存总大小")
private String totalPhyMem;
@ApiModelProperty("物理内存使用率")
private String phyMemRate;
@ApiModelProperty("物理内存使用大小")
private String usedPhyMem;
@ApiModelProperty("实际可用的物理内存大小")
private String availPhyMem;
@ApiModelProperty("实际空闲的物理内存大小")
private String freePhyMem;
@ApiModelProperty("所有应用申请的虚拟内存总量")
private String totalVirtualMem;
@ApiModelProperty("系统中 Swap 分区总大小")
private String totalSwapSpace;
@ApiModelProperty("Swap 分区使用率")
private String swapRate;
@ApiModelProperty("Swap 分区使用量")
private String usedSwap;
@ApiModelProperty("Swap 分区空闲大小")
private String freeSwap;
@ApiModelProperty("CPU 瞬时使用率")
private String cpuPeak;
@ApiModelProperty("开机时长")
private String upTime;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("厂商信息")
private String biosVendor;
@ApiModelProperty("最后更新时间")
private Date updateTime;
......
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentDiskVO.java
......@@ -12,126 +12,73 @@ import java.util.Date;
@Version:1.0
*/
@Data
@ApiModel("设备详细信息")
@ApiModel("磁盘信息")
public class DeviceEquipmentDiskVO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("固件版本")
private String firmwareVersion;
@ApiModelProperty("版本型号")
private String modelNumber;
@ApiModelProperty("版本号码")
private String versionNumber;
@ApiModelProperty("绝对路径")
private String path;
@ApiModelProperty("制造商")
private String marker;
@ApiModelProperty("型号")
private String model;
@ApiModelProperty("序列号")
private String serial;
@ApiModelProperty("磁盘类型\n" +
"机械\t0\n" +
"固态\t1\n" +
"混合\t2\n" +
"闪存\t3\n" +
"分区盘\t4\n")
private Integer diskType;
@ApiModelProperty("接口类型\n" +
"DISK_INTERFACE_SATA\t0\n" +
"DISK_INTERFACE_SATA2\t1\n" +
"DISK_INTERFACE_SATA3\t2\n" +
"DISK_INTERFACE_mSATA\t3\n" +
"DISK_INTERFACE_SAS\t4\n" +
"DISK_INTERFACE_M2\t5\n" +
"DISK_INTERFACE_NVMe\t6\n" +
"DISK_INTERFACE_PCIE\t7\n" +
"DISK_INTERFACE_NONE\t8\n")
private Integer interfaceType;
@ApiModelProperty("转速")
private String rSpeed;
@ApiModelProperty("扇区数量")
private String numSectors;
@ApiModelProperty("每个扇区的字节数")
private String bytesPerSec;
@ApiModelProperty("磁盘容量，MiB为单位")
private String diskCapMib;
@ApiModelProperty("该磁盘/分区下的子分区数量")
private Integer numSubpart;
@ApiModelProperty("UUID")
private String uuid;
@ApiModelProperty("是否已挂载")
private Integer isMnt;
@ApiModelProperty("挂载路径")
private String mntPath;
@ApiModelProperty("格式化类型\n" +
"DISK_FMT_UNKNOW\t0\n" +
"DISK_FMT_FAT16\t1\n" +
"DISK_FMT_FAT32\t2\n" +
"DISK_FMT_VFAT\t3\n" +
"DISK_FMT_NTFS\t4\n" +
"DISK_FMT_EXT2\t5\n" +
"DISK_FMT_EXT3\t6\n" +
"DISK_FMT_EXT4\t7\n" +
"DISK_FMT_NONE\t8\n")
private Integer fsType;
@ApiModelProperty("分区类型\n" +
"基础硬盘\t0\n" +
"主分区\t1\n" +
"扩展分区\t2\n" +
"逻辑分区\t3\n" +
"RAID分区\t4\n" +
"5")
private Integer partType;
@ApiModelProperty("固件版本信息")
private String fwVer;
@ApiModelProperty("CPU 架构")
private String cpuArch;
@ApiModelProperty("CPU 制造厂商")
private String cpuMaker;
@ApiModelProperty("CPU 型号")
private String cpuModel;
@ApiModelProperty("CPU 额定主频")
private String cpuNominalMainFrequency;
@ApiModelProperty("CPU 核心数量")
private Integer cpuCore;
@ApiModelProperty("CPU 对虚拟化的支持")
private String cpuVirtualization;
@ApiModelProperty("物理内存总大小")
private String totalPhyMem;
@ApiModelProperty("物理内存使用率")
private String phyMemRate;
@ApiModelProperty("物理内存使用大小")
private String usedPhyMem;
@ApiModelProperty("实际可用的物理内存大小")
private String availPhyMem;
@ApiModelProperty("实际空闲的物理内存大小")
private String freePhyMem;
@ApiModelProperty("所有应用申请的虚拟内存总量")
private String totalVirtualMem;
@ApiModelProperty("系统中 Swap 分区总大小")
private String totalSwapSpace;
@ApiModelProperty("Swap 分区使用率")
private String swapRate;
@ApiModelProperty("Swap 分区使用量")
private String usedSwap;
@ApiModelProperty("Swap 分区空闲大小")
private String freeSwap;
@ApiModelProperty("CPU 瞬时使用率")
private String cpuPeak;
@ApiModelProperty("开机时长")
private String upTime;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("厂商信息")
private String biosVendor;
@ApiModelProperty("最后更新时间")
private Date updateTime;
......
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentInfo2VO.java deleted 100644 → 0
package com.skr.mdm.bean.vo.equipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @ClassName:DeviceEquipmentInfo
* @Author:Tty
* @Description:设备详细信息
* @Date:2020/9/1 17:55
* @Version:1.0
*/
@Data
@ApiModel("设备详细信息")
public class DeviceEquipmentInfo2VO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("用户手机号")
private String userPhoneNumber;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("主板名称信息")
private String motherboard;
@ApiModelProperty("生产日期")
private String productionDate;
@ApiModelProperty("序列号")
private String serialNumber;
@ApiModelProperty("厂商信息")
private String vendor;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("bios厂商")
private String biosVendor;
@ApiModelProperty("bios版本")
private String biosVersion;
@ApiModelProperty("客户端版本号")
private String clientVersionCode;
@ApiModelProperty("地理位置纬度")
private String latitude;
@ApiModelProperty("地理位置经度")
private String longitude;
}
\ No newline at end of file
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentInfoVO.java
package com.skr.mdm.bean.vo.equipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @ProjectName: mdm_new
* @Package: com.skr.mdm.pojo.vo.departManage
* @ClassName: DeviceEquipmentInfo
* @Author: Tty
* @Description: 设备详细信息
* @Date: 2020/9/1 17:55
* @Version: 1.0
* @ClassName:DeviceEquipmentInfo
* @Author:Tty
* @Description:设备详细信息
* @Date:2020/9/1 17:55
* @Version:1.0
*/
@Data
@ApiModel("设备详细信息")
public class DeviceEquipmentInfoVO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("固件版本")
private String firmwareVersion;
@ApiModelProperty("版本型号")
private String modelNumber;
@ApiModelProperty("版本号码")
private String versionNumber;
@ApiModelProperty("CPU信息")
private String cpuInfo;
@ApiModelProperty("内存信息")
private String internalInfo;
@ApiModelProperty("存储空间信息")
private String storageInfo;
@ApiModelProperty("IMEI软件版本")
private String imeiVersion;
@ApiModelProperty("IEMI")
private String imei;
@ApiModelProperty("OAID")
private String oaid;
@ApiModelProperty("UUID")
private String uuid;
@ApiModelProperty("SIM状态")
private String simState;
@ApiModelProperty("sms 序列号")
private String simSn;
@ApiModelProperty("sim 供应商")
private String simSupplier;
@ApiModelProperty("网络提供商")
private String networkProviders;
@ApiModelProperty("网络类型")
private String networkType;
@ApiModelProperty("设备制式")
private String phoneType;
@ApiModelProperty("通话状态")
private String callStatus;
@ApiModelProperty("wifi BSSID")
private String wifiBssid;
@ApiModelProperty("wifi IP地址")
private String wifiIpAddr;
@ApiModelProperty("wifiMAC地址")
private String wifiMacAddr;
@ApiModelProperty("wifi wifi RSSI")
private String wifiRssi;
@ApiModelProperty("wifi SSID")
private String wifiSsid;
@ApiModelProperty("wifi网络id")
private String wifiNetworkId;
@ApiModelProperty("wifi连接速度")
private String wifiConnSpeed;
@ApiModelProperty("电源状态")
private String batteryStatus;
@ApiModelProperty("电源当前电量")
private String batteryPower;
@ApiModelProperty("电源电压")
private String batteryVoltage;
@ApiModelProperty("电源温度")
private String batteryTemperature;
@ApiModelProperty("电源类型")
private String batteryTechnology;
@ApiModelProperty("电源寿命")
private String batteryLife;
@ApiModelProperty("数据活动状态")
private String dataActivityStatus;
@ApiModelProperty("数据连接状态")
private String dataConnStatus;
@ApiModelProperty("通话音量")
private String callVolume;
@ApiModelProperty("系统音量")
private String systemVolume;
@ApiModelProperty("响铃音量")
private String ringVolume;
@ApiModelProperty("音乐音量")
private String musicVolume;
@ApiModelProperty("提示音音量")
private String tipSoundVolume;
@ApiModelProperty("纬度")
private String latitude;
@ApiModelProperty("经度")
private String longitude;
@ApiModelProperty("位置更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String posCorrentionTime;
@ApiModelProperty("root 状态 0:未 ROOT 1:已 ROOT")
private String rootStatus;
@ApiModelProperty("蓝牙地址")
private String bluetoothAddr;
@ApiModelProperty("蓝牙是否打开")
private String bluetoothIsOn;
@ApiModelProperty("蓝牙是否可搜索")
private String bluetoothIsSearch;
@ApiModelProperty("蓝牙名称")
private String bluetoothName;
@ApiModelProperty("蓝牙配对设备")
private String bluetoothPairDev;
@ApiModelProperty("蓝牙状态")
private String bluetoothStatus;
@ApiModelProperty("设备品牌型号")
private String equipmentModel;
@ApiModelProperty("当前客户端版本号")
private String clientVersionCode;
@ApiModelProperty("用户手机号")
private String userPhoneNumber;
@ApiModelProperty("设备手机号")
private String equipmentPhoneNumber;
@ApiModelProperty("imei2")
private String imei2;
@ApiModelProperty("SN")
private String sn;
@ApiModelProperty("最后更新时间")
private Date updateTime;
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("用户手机号")
private String userPhoneNumber;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("主板名称信息")
private String motherboard;
@ApiModelProperty("生产日期")
private String productionDate;
@ApiModelProperty("序列号")
private String serialNumber;
@ApiModelProperty("厂商信息")
private String vendor;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("bios厂商")
private String biosVendor;
@ApiModelProperty("bios版本")
private String biosVersion;
@ApiModelProperty("客户端版本号")
private String clientVersionCode;
@ApiModelProperty("地理位置纬度")
private String latitude;
@ApiModelProperty("地理位置经度")
private String longitude;
@ApiModelProperty("位置更新时间")
private Date posCorrentionTime;
private List<DeviceEquipmentUsbVO> usbVOList;
private List<DeviceEquipmentCpuVO> cpuVOList;
private List<DeviceEquipmentSysSourceVO> sysSourceVOList;
private List<DeviceEquipmentNetVO> netVOList;
private List<DeviceEquipmentDiskVO> diskVOList;
}
\ No newline at end of file
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentNetVO.java
......@@ -8,130 +8,26 @@ import java.util.Date;
/**
@Date:2020/9/1 17:55
@Version:1.0
* @Date:2020/9/1 17:55
* @Version:1.0
*/
@Data
@ApiModel("设备详细信息")
@ApiModel("网络信息")
public class DeviceEquipmentNetVO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("固件版本")
private String firmwareVersion;
@ApiModelProperty("版本型号")
private String modelNumber;
@ApiModelProperty("版本号码")
private String versionNumber;
@ApiModelProperty("CPU 架构")
private String cpuArch;
@ApiModelProperty("CPU 制造厂商")
private String cpuMaker;
@ApiModelProperty("CPU 型号")
private String cpuModel;
@ApiModelProperty("CPU 额定主频")
private String cpuNominalMainFrequency;
@ApiModelProperty("CPU 核心数量")
private Integer cpuCore;
@ApiModelProperty("CPU 对虚拟化的支持")
private String cpuVirtualization;
@ApiModelProperty("物理内存总大小")
private String totalPhyMem;
@ApiModelProperty("物理内存使用率")
private String phyMemRate;
@ApiModelProperty("物理内存使用大小")
private String usedPhyMem;
@ApiModelProperty("实际可用的物理内存大小")
private String availPhyMem;
@ApiModelProperty("实际空闲的物理内存大小")
private String freePhyMem;
@ApiModelProperty("所有应用申请的虚拟内存总量")
private String totalVirtualMem;
@ApiModelProperty("系统中 Swap 分区总大小")
private String totalSwapSpace;
@ApiModelProperty("Swap 分区使用率")
private String swapRate;
@ApiModelProperty("Swap 分区使用量")
private String usedSwap;
@ApiModelProperty("Swap 分区空闲大小")
private String freeSwap;
@ApiModelProperty("CPU 瞬时使用率")
private String cpuPeak;
@ApiModelProperty("开机时长")
private String upTime;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("厂商信息")
private String biosVendor;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("mac ")
private String mac;
@ApiModelProperty("ipv4 json数组形式 ")
private String ipv4;
@ApiModelProperty("ipv6 json数组形式 ")
private String ipv6;
@ApiModelProperty("网卡的有线/无线类型 0:有线 1:无线")
private Integer nicType;
@ApiModelProperty("vid")
private String vid;
@ApiModelProperty("pid")
private String pid;
@ApiModelProperty("最后更新时间")
private Date updateTime;
......
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentSysSourceVO.java 0 → 100644
package com.skr.mdm.bean.vo.equipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Date:2020/9/1 17:55
* @Version:1.0
*/
@Data
@ApiModel("系统资源")
public class DeviceEquipmentSysSourceVO {
@ApiModelProperty("物理内存总大小")
private String totalPhyMem;
@ApiModelProperty("物理内存使用率")
private String phyMemRate;
@ApiModelProperty("物理内存使用大小")
private String usedPhyMem;
@ApiModelProperty("实际可用的物理内存大小")
private String availPhyMem;
@ApiModelProperty("实际空闲的物理内存大小")
private String freePhyMem;
@ApiModelProperty("所有应用申请的虚拟内存总量")
private String totalVirtualMem;
@ApiModelProperty("系统中 Swap 分区总大小")
private String totalSwapSpace;
@ApiModelProperty("Swap 分区使用率")
private String swapRate;
@ApiModelProperty("Swap 分区使用量")
private String usedSwap;
@ApiModelProperty("Swap 分区空闲大小")
private String freeSwap;
@ApiModelProperty("CPU 瞬时使用率")
private String cpuPeak;
@ApiModelProperty("开机时长")
private Long up_time;
@ApiModelProperty("最后更新时间")
private Date updateTime;
}
\ No newline at end of file
mdm_bean/src/main/java/com/skr/mdm/bean/vo/equipment/DeviceEquipmentUsbVO.java
......@@ -8,130 +8,26 @@ import java.util.Date;
/**
@Date:2020/9/1 17:55
@Version:1.0
* @Date:2020/9/1 17:55
* @Version:1.0
*/
@Data
@ApiModel("设备详细信息")
@ApiModel("usb信息")
public class DeviceEquipmentUsbVO {
@ApiModelProperty("设备名称")
private String equipmentName;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("激活时间")
private String activationTime;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("离线时间")
private String offlineTime;
@ApiModelProperty("固件版本")
private String firmwareVersion;
@ApiModelProperty("版本型号")
private String modelNumber;
@ApiModelProperty("版本号码")
private String versionNumber;
private String name;
@ApiModelProperty("type 待定")
private String type;
@ApiModelProperty("pid")
private String pid;
@ApiModelProperty("vid")
private String vid;
@ApiModelProperty("序列号")
private String serialNum;
@ApiModelProperty("路径")
private String path;
@ApiModelProperty("CPU 架构")
private String cpuArch;
@ApiModelProperty("CPU 制造厂商")
private String cpuMaker;
@ApiModelProperty("CPU 型号")
private String cpuModel;
@ApiModelProperty("CPU 额定主频")
private String cpuNominalMainFrequency;
@ApiModelProperty("CPU 核心数量")
private Integer cpuCore;
@ApiModelProperty("CPU 对虚拟化的支持")
private String cpuVirtualization;
@ApiModelProperty("物理内存总大小")
private String totalPhyMem;
@ApiModelProperty("物理内存使用率")
private String phyMemRate;
@ApiModelProperty("物理内存使用大小")
private String usedPhyMem;
@ApiModelProperty("实际可用的物理内存大小")
private String availPhyMem;
@ApiModelProperty("实际空闲的物理内存大小")
private String freePhyMem;
@ApiModelProperty("所有应用申请的虚拟内存总量")
private String totalVirtualMem;
@ApiModelProperty("系统中 Swap 分区总大小")
private String totalSwapSpace;
@ApiModelProperty("Swap 分区使用率")
private String swapRate;
@ApiModelProperty("Swap 分区使用量")
private String usedSwap;
@ApiModelProperty("Swap 分区空闲大小")
private String freeSwap;
@ApiModelProperty("CPU 瞬时使用率")
private String cpuPeak;
@ApiModelProperty("开机时长")
private String upTime;
@ApiModelProperty("系统架构信息")
private String sysArch;
@ApiModelProperty("系统名称")
private String sysName;
@ApiModelProperty("系统版本号")
private String sysVersion;
@ApiModelProperty("内核版本号")
private String sysKernelVersion;
@ApiModelProperty("当前登录用户的用户名")
private String sysLoginUser;
@ApiModelProperty("操作系统项目编号名")
private String osProjectNumName;
@ApiModelProperty("操作系统项目子编号名")
private String osSubProjectNumName;
@ApiModelProperty("操作系统产品标识码")
private String osProductId;
@ApiModelProperty("操作系统宿主机的虚拟机类型")
private String osHostVmType;
@ApiModelProperty("操作系统宿主机的云平台类型")
private String osCloudPlatformType;
@ApiModelProperty("操作系统是否为专用机系统")
private String osIsDedicatedSystem;
@ApiModelProperty("系统分辨率信息")
private String sysResolution;
@ApiModelProperty("系统硬件版本类别")
private String sysHwVersionType;
@ApiModelProperty("系统版本号/补丁版本号")
private String sysPatchVersion;
@ApiModelProperty("厂商信息")
private String biosVendor;
@ApiModelProperty("最后更新时间")
private Date updateTime;
......
mdm_client/src/main/java/com/skr/mdm/controller/EquipmentInfoController.java
......@@ -5,7 +5,7 @@ import com.skr.mdm.dto.LoginUserDTO;
import com.skr.mdm.result.ResponseResult;
import com.skr.mdm.service.CmdHandlerService;
import com.skr.mdm.service.StrategyFactory;
import com.skr.mdm.service.impl.equipment.EquipmentInfo2ServiceImpl;
import com.skr.mdm.service.impl.equipment.EquipmentInfoServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......@@ -27,7 +27,7 @@ import springfox.documentation.annotations.ApiIgnore;
public class EquipmentInfoController {
@Autowired
private EquipmentInfo2ServiceImpl equipmentInfo2Service;
private EquipmentInfoServiceImpl equipmentInfo2Service;
@PostMapping("upload")
......
mdm_client_websocket/src/main/java/com/skr/mdm/netty/ChannelInitializerHandler.java
......@@ -5,6 +5,7 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
import io.netty.handler.codec.http.HttpObjectAggregator;
import io.netty.handler.codec.http.HttpServerCodec;
import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
import io.netty.handler.ssl.SslHandler;
import io.netty.handler.stream.ChunkedWriteHandler;
import io.netty.handler.timeout.IdleStateHandler;
......@@ -47,6 +48,8 @@ public class ChannelInitializerHandler extends ChannelInitializer {
.addLast(new ChunkedWriteHandler())
// 心跳机制
.addLast(new IdleStateHandler(15, 10,5, TimeUnit.SECONDS))
// .addLast(new HttpObjectAggregator(65536)) // 聚合HTTP请求
// .addLast(new WebSocketServerProtocolHandler("/websocket", null, true))
.addLast(websocketHandler);
}
}
\ No newline at end of file
mdm_client_websocket/src/main/java/com/skr/mdm/service/impl/equipment/EquipmentInfo2ServiceImpl.java deleted 100644 → 0
package com.skr.mdm.service.impl.equipment;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.skr.mdm.annotation.CmdHandler;
import com.skr.mdm.constant.CmdTypeConstants;
import com.skr.mdm.dao.*;
import com.skr.mdm.dto.*;
import com.skr.mdm.entity.*;
import com.skr.mdm.result.ResponseResult;
import com.skr.mdm.service.CmdHandlerService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import java.util.Objects;
/**
* @author tty
* @date 2024/5/14 17:08
*/
@Slf4j
@CmdHandler(cmdType = CmdTypeConstants.DEV_INFO)
public class EquipmentInfo2ServiceImpl implements CmdHandlerService {
@Autowired
private DeviceEquipmentDao equipmentDao;
@Autowired
private DeviceEquipmentInfoCopyDao equipmentInfoDao;
@Autowired
private DeviceEquipmentCpuDao equipmentCpuDao;
@Autowired
private DeviceEquipmentSysSourceDao equipmentSysSourceDao;
@Autowired
private DeviceEquipmentUsbDao equipmentUsbDao;
@Autowired
private DeviceEquipmentDiskDao equipmentDiskDao;
@Autowired
private DeviceEquipmentNetDao equipmentNetDao;
@Override
public ResponseResult cmdHandler(Integer equipmentId, String data) {
try {
EquipmentInfoCopyDTO equipmentInfoDTO = JSONUtil.toBean(data, EquipmentInfoCopyDTO.class);
operationEquipmentInfo(equipmentId, equipmentInfoDTO);
operationEquipmentCpu(equipmentId, equipmentInfoDTO.getEquipmentCPUDTO());
operationEquipmentSysSource(equipmentId, equipmentInfoDTO.getSysResourceDTO());
operationEquipmentUsb(equipmentId, equipmentInfoDTO.getEquipmentUsbDTOList());
operationEquipmentDisk(equipmentId, equipmentInfoDTO.getEquipmentDiskDTOList());
operationEquipmentNet(equipmentId, equipmentInfoDTO.getEquipmentNetDTOList());
// 更新主板生产商 生产时间 主板名称
new LambdaUpdateChainWrapper<>(equipmentDao)
.set(DeviceEquipmentDO::getVendor, equipmentInfoDTO.getVendor())
.set(DeviceEquipmentDO::getProductionDate, equipmentInfoDTO.getProductionDate())
.set(DeviceEquipmentDO::getMotherboard, equipmentInfoDTO.getMotherboard())
.eq(DeviceEquipmentDO::getId, equipmentId)
.update();
return ResponseResult.success();
} catch (Exception e) {
log.error("上传设备信息异常: {} {} {} ", equipmentId, data, e);
return ResponseResult.failure();
}
}
/**
* 设备详情更新/新增
*
* @param equipmentId
* @param equipmentInfoDTO
*/
private void operationEquipmentInfo(Integer equipmentId, EquipmentInfoCopyDTO equipmentInfoDTO) {
DeviceEquipmentInfoCopyDO equipmentInfoDO = new DeviceEquipmentInfoCopyDO();
BeanUtils.copyProperties(equipmentInfoDTO, equipmentInfoDO);
equipmentInfoDO.setEquipmentId(equipmentId);
DeviceEquipmentInfoCopyDO dbEquipmentInfoDO = new LambdaQueryChainWrapper<>(equipmentInfoDao)
.eq(DeviceEquipmentInfoCopyDO::getEquipmentId, equipmentId)
.one();
if (Objects.isNull(dbEquipmentInfoDO)) {
// 添加设备信息
equipmentInfoDao.insert(equipmentInfoDO);
} else {
// 修改设备信息
equipmentInfoDO.setId(dbEquipmentInfoDO.getId());
equipmentInfoDao.updateById(equipmentInfoDO);
}
}
/**
* CPU详情更新/新增
*
* @param equipmentId
* @param equipmentCPUDTO
*/
public void operationEquipmentCpu(Integer equipmentId, EquipmentCPUDTO equipmentCPUDTO) {
if (Objects.nonNull(equipmentCPUDTO)) {
DeviceEquipmentCpuDO deviceEquipmentCpuDO = new DeviceEquipmentCpuDO();
BeanUtils.copyProperties(equipmentCPUDTO, deviceEquipmentCpuDO);
deviceEquipmentCpuDO.setEquipmentId(equipmentId);
DeviceEquipmentCpuDO dbEquipmentInfoDO = new LambdaQueryChainWrapper<>(equipmentCpuDao)
.eq(DeviceEquipmentCpuDO::getEquipmentId, equipmentId)
.one();
if (Objects.isNull(dbEquipmentInfoDO)) {
// 添加设备信息
equipmentCpuDao.insertSelective(deviceEquipmentCpuDO);
} else {
// 修改设备信息
deviceEquipmentCpuDO.setId(dbEquipmentInfoDO.getId());
equipmentCpuDao.updateByPrimaryKeySelective(deviceEquipmentCpuDO);
}
}
}
/**
* 系统资源详情更新/新增
*
* @param equipmentId
* @param equipmentSysResourceDTO
*/
public void operationEquipmentSysSource(Integer equipmentId, EquipmentSysResourceDTO equipmentSysResourceDTO) {
if (Objects.nonNull(equipmentSysResourceDTO)) {
DeviceEquipmentSysSourceDO equipmentSysSourceDO = new DeviceEquipmentSysSourceDO();
BeanUtils.copyProperties(equipmentSysResourceDTO, equipmentSysSourceDO);
equipmentSysSourceDO.setEquipmentId(equipmentId);
DeviceEquipmentSysSourceDO dbSysSourceDO = new LambdaQueryChainWrapper<>(equipmentSysSourceDao)
.eq(DeviceEquipmentSysSourceDO::getEquipmentId, equipmentId)
.one();
if (Objects.isNull(dbSysSourceDO)) {
// 添加设备信息
equipmentSysSourceDao.insertSelective(equipmentSysSourceDO);
} else {
// 修改设备信息
equipmentSysSourceDO.setId(dbSysSourceDO.getId());
equipmentSysSourceDao.updateByPrimaryKeySelective(equipmentSysSourceDO);
}
}
}
/**
* USB详情更新/新增
*
* @param equipmentId
* @param equipmentUsbDTOList
*/
public void operationEquipmentUsb(Integer equipmentId, List<EquipmentUsbDTO> equipmentUsbDTOList) {
equipmentUsbDao.delete(Wrappers.lambdaQuery(DeviceEquipmentUsbDO.class).eq(DeviceEquipmentUsbDO::getEquipmentId, equipmentId));
if (CollectionUtils.isNotEmpty(equipmentUsbDTOList)) {
for (EquipmentUsbDTO equipmentUsbDTO : equipmentUsbDTOList) {
DeviceEquipmentUsbDO deviceEquipmentUsbDO = new DeviceEquipmentUsbDO();
BeanUtils.copyProperties(equipmentUsbDTO, deviceEquipmentUsbDO);
deviceEquipmentUsbDO.setEquipmentId(equipmentId);
// 添加设备信息
equipmentUsbDao.insertSelective(deviceEquipmentUsbDO);
}
}
}
/**
* 磁盘详情更新/新增
*
* @param equipmentId
* @param equipmentDiskDTOList
*/
public void operationEquipmentDisk(Integer equipmentId, List<EquipmentDiskDTO> equipmentDiskDTOList) {
if (CollectionUtils.isNotEmpty(equipmentDiskDTOList)) {
for (EquipmentDiskDTO equipmentDiskDTO : equipmentDiskDTOList) {
DeviceEquipmentDiskDO deviceEquipmentDiskDO = new DeviceEquipmentDiskDO();
BeanUtils.copyProperties(equipmentDiskDTO, deviceEquipmentDiskDO);
deviceEquipmentDiskDO.setEquipmentId(equipmentId);
DeviceEquipmentDiskDO equipmentDiskDO = new LambdaQueryChainWrapper<>(equipmentDiskDao)
.eq(DeviceEquipmentDiskDO::getEquipmentId, equipmentId)
.one();
if (Objects.isNull(equipmentDiskDO)) {
// 添加设备信息
equipmentDiskDao.insertSelective(deviceEquipmentDiskDO);
} else {
// 修改设备信息
deviceEquipmentDiskDO.setId(equipmentDiskDO.getId());
equipmentDiskDao.updateByPrimaryKeySelective(deviceEquipmentDiskDO);
}
}
}
}
/**
* 网卡更新/新增
*
* @param equipmentId
* @param equipmentNetDTOList
*/
private void operationEquipmentNet(Integer equipmentId, List<EquipmentNetDTO> equipmentNetDTOList) {
if (CollectionUtils.isNotEmpty(equipmentNetDTOList)) {
for (EquipmentNetDTO equipmentNetDTO : equipmentNetDTOList) {
DeviceEquipmentNetDO equipmentNetDO = new DeviceEquipmentNetDO();
BeanUtils.copyProperties(equipmentNetDTO, equipmentNetDO);
equipmentNetDO.setEquipmentId(equipmentId);
DeviceEquipmentNetDO deviceEquipmentNetDO = new LambdaQueryChainWrapper<>(equipmentNetDao)
.eq(DeviceEquipmentNetDO::getEquipmentId, equipmentId)
.one();
if (Objects.isNull(deviceEquipmentNetDO)) {
// 添加设备信息
equipmentNetDao.insertSelective(equipmentNetDO);
} else {
// 修改设备信息
equipmentNetDO.setId(deviceEquipmentNetDO.getId());
equipmentNetDao.updateByPrimaryKeySelective(equipmentNetDO);
}
}
}
}
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentCpuDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentCpuVO;
import com.skr.mdm.entity.DeviceEquipmentCpuDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DeviceEquipmentCpuDao extends BaseMapper<DeviceEquipmentCpuDO> {
int deleteByPrimaryKey(Integer id);
......@@ -14,4 +17,6 @@ public interface DeviceEquipmentCpuDao extends BaseMapper<DeviceEquipmentCpuDO>
int updateByPrimaryKeySelective(DeviceEquipmentCpuDO record);
List<DeviceEquipmentCpuVO> getEquipmentInfo(Integer equipmentId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentDao.java
......@@ -11,7 +11,6 @@ import com.skr.mdm.bean.qo.equipment.EquipmentPageQO;
import com.skr.mdm.bean.vo.DeviceDistributionVO;
import com.skr.mdm.bean.vo.TerminalVO;
import com.skr.mdm.bean.vo.equipment.ClientAdminEquipmentVO;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfoVO;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentVO;
import com.skr.mdm.bean.vo.equipment.EquipmentIssuedVO;
import com.skr.mdm.bean.vo.user.UserEquipmentVO;
......@@ -34,8 +33,6 @@ public interface DeviceEquipmentDao extends BaseMapper<DeviceEquipmentDO> {
List<Integer> selectDeviceEquipmentIdByUserId(@Param("list") List<Integer> userIdList);
DeviceEquipmentInfoVO getEquipmentInfo(@Param("equipmentId") Integer equipmentId);
/**
* 根据设备id获取在线设备
* @param equipmentState
......
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentDiskDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentDiskVO;
import com.skr.mdm.entity.DeviceEquipmentDiskDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DeviceEquipmentDiskDao extends BaseMapper<DeviceEquipmentDiskDO> {
int deleteByPrimaryKey(Integer id);
......@@ -14,4 +17,5 @@ public interface DeviceEquipmentDiskDao extends BaseMapper<DeviceEquipmentDiskDO
int updateByPrimaryKeySelective(DeviceEquipmentDiskDO record);
List<DeviceEquipmentDiskVO> getEquipmentInfo(Integer equipmentId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentInfoCopyDao.java deleted 100644 → 0
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfo2VO;
import com.skr.mdm.entity.DeviceEquipmentInfoCopyDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Repository
public interface DeviceEquipmentInfoCopyDao extends BaseMapper<DeviceEquipmentInfoCopyDO> {
int deleteByPrimaryKey(Integer id);
int insertSelective(DeviceEquipmentInfoCopyDO record);
DeviceEquipmentInfoCopyDO selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(DeviceEquipmentInfoCopyDO record);
DeviceEquipmentInfo2VO getEquipmentInfo(Integer equipmentId);
/**
* 根据公司ID删除
* @param companyId 公司ID
*/
void deleteByCompanyId(@Param("companyId") Integer companyId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentInfoDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfoVO;
import com.skr.mdm.entity.DeviceEquipmentInfoDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 设备信息详情表(DeviceEquipmentInfo)表数据库访问层
*
* @author nfq
* @since 2020-07-31 14:12:55
*/
@Repository
public interface DeviceEquipmentInfoDao extends BaseMapper<DeviceEquipmentInfoDO> {
int deleteByPrimaryKey(Integer id);
int insertSelective(DeviceEquipmentInfoDO record);
DeviceEquipmentInfoDO selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(DeviceEquipmentInfoDO record);
DeviceEquipmentInfoVO getEquipmentInfo(Integer equipmentId);
/**
* 根据公司ID删除
* @param companyId 公司ID
*/
void deleteByCompanyId(@Param("companyId") Integer companyId);
/**
* 根据设备ID删除
......
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentNetDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentNetVO;
import com.skr.mdm.entity.DeviceEquipmentNetDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DeviceEquipmentNetDao extends BaseMapper<DeviceEquipmentNetDO> {
int deleteByPrimaryKey(Integer id);
......@@ -14,4 +17,6 @@ public interface DeviceEquipmentNetDao extends BaseMapper<DeviceEquipmentNetDO>
int updateByPrimaryKeySelective(DeviceEquipmentNetDO record);
List<DeviceEquipmentNetVO> getEquipmentInfo(Integer equipmentId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentSysSourceDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentSysSourceVO;
import com.skr.mdm.entity.DeviceEquipmentSysSourceDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DeviceEquipmentSysSourceDao extends BaseMapper<DeviceEquipmentSysSourceDO> {
int deleteByPrimaryKey(Integer id);
......@@ -14,4 +17,6 @@ public interface DeviceEquipmentSysSourceDao extends BaseMapper<DeviceEquipmentS
int updateByPrimaryKeySelective(DeviceEquipmentSysSourceDO record);
List<DeviceEquipmentSysSourceVO> getEquipmentInfo(Integer equipmentId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/dao/DeviceEquipmentUsbDao.java
package com.skr.mdm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentUsbVO;
import com.skr.mdm.entity.DeviceEquipmentUsbDO;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface DeviceEquipmentUsbDao extends BaseMapper<DeviceEquipmentUsbDO> {
int deleteByPrimaryKey(Integer id);
......@@ -13,4 +16,6 @@ public interface DeviceEquipmentUsbDao extends BaseMapper<DeviceEquipmentUsbDO>
DeviceEquipmentUsbDO selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(DeviceEquipmentUsbDO record);
List<DeviceEquipmentUsbVO> getEquipmentInfo(Integer equipmentId);
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/entity/DeviceEquipmentDiskDO.java
......@@ -31,7 +31,7 @@ public class DeviceEquipmentDiskDO implements Serializable {
/**
* 制造商
*/
private String vendor;
private String marker;
/**
* 型号
......
mdm_dao/src/main/java/com/skr/mdm/entity/DeviceEquipmentInfoCopyDO.java deleted 100644 → 0
package com.skr.mdm.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
* 设备信息详情表
* device_equipment_info_copy
*/
@Data
@TableName("device_equipment_info_copy")
public class DeviceEquipmentInfoCopyDO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 设备ID
*/
private Integer equipmentId;
/**
* 系统架构信息
*/
private String sysArch;
/**
* 系统名称
*/
private String sysName;
/**
* 系统版本号
*/
private String sysVersion;
/**
* 内核版本号
*/
private String sysKernelVersion;
/**
* 当前登录用户的用户名
*/
private String sysLoginUser;
/**
* 操作系统项目编号名
*/
private String osProjectNumName;
/**
* 操作系统项目子编号名
*/
private String osSubProjectNumName;
/**
* 操作系统产品标识码
*/
private String osProductId;
/**
* 操作系统宿主机的虚拟机类型
*/
private String osHostVmType;
/**
* 操作系统宿主机的云平台类型
*/
private String osCloudPlatformType;
/**
* 操作系统是否为专用机系统
*/
private String osIsDedicatedSystem;
/**
* 系统分辨率信息
*/
private String sysResolution;
/**
* 系统硬件版本类别
*/
private String sysHwVersionType;
/**
* 系统版本号/补丁版本号
*/
private String sysPatchVersion;
/**
* bios厂商
*/
private String biosVendor;
/**
* bios版本
*/
private String biosVersion;
/**
* 客户端版本号
*/
private String clientVersionCode;
/**
* 地理位置纬度
*/
private String latitude;
/**
* 地理位置经度
*/
private String longitude;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
mdm_dao/src/main/java/com/skr/mdm/entity/DeviceEquipmentInfoDO.java
package com.skr.mdm.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
* 设备信息详情表实体类
*
* @author nfq
* @since 2020-07-31 14:07:18
* 设备信息详情表
* device_equipment_info
*/
@Data
@TableName("device_equipment_info")
public class DeviceEquipmentInfoDO {
private static final long serialVersionUID = -89204936162552569L;
private Integer id;
private Integer equipmentId;
private String imei2;
private String sn;
public class DeviceEquipmentInfoDO implements Serializable {
/**
* 0：未root；1：已root
* id
*/
private Integer rootStatus;
private Integer id;
/**
* 电源寿命
* 设备ID
*/
private String batteryLife;
private Integer equipmentId;
/**
* 电源当前电量
*/
private String batteryPower;
* 系统架构信息
*/
private String sysArch;
/**
* 电源状态
*/
private String batteryStatus;
* 系统名称
*/
private String sysName;
/**
* 电源类型
*/
private String batteryTechnology;
* 系统版本号
*/
private String sysVersion;
/**
* 电源温度
*/
private String batteryTemperature;
* 内核版本号
*/
private String sysKernelVersion;
/**
* 电源电压
*/
private String batteryVoltage;
* 当前登录用户的用户名
*/
private String sysLoginUser;
/**
* 蓝牙地址
*/
private String bluetoothAddr;
* 操作系统项目编号名
*/
private String osProjectNumName;
/**
* 蓝牙是否打开
*/
private String bluetoothIsOn;
* 操作系统项目子编号名
*/
private String osSubProjectNumName;
/**
* 蓝牙是否可搜索
*/
private String bluetoothIsSearch;
* 操作系统产品标识码
*/
private String osProductId;
/**
* 蓝牙名称
*/
private String bluetoothName;
* 操作系统宿主机的虚拟机类型
*/
private String osHostVmType;
/**
* 蓝牙配对设备
*/
private String bluetoothPairDev;
* 操作系统宿主机的云平台类型
*/
private String osCloudPlatformType;
/**
* 蓝牙状态
*/
private String bluetoothStatus;
* 操作系统是否为专用机系统
*/
private String osIsDedicatedSystem;
/**
* 通话状态
*/
private String callStatus;
* 系统分辨率信息
*/
private String sysResolution;
/**
* 通话音量
*/
private String callVolume;
* 系统硬件版本类别
*/
private String sysHwVersionType;
/**
* 数据活动状态
*/
private String dataActivityStatus;
* 系统版本号/补丁版本号
*/
private String sysPatchVersion;
/**
* 数据连接状态
*/
private String dataConnStatus;
* bios厂商
*/
private String biosVendor;
/**
* 固件版本
*/
private String firmwareVersion;
* bios版本
*/
private String biosVersion;
/**
* IMEI软件版本
*/
private String imeiVersion;
* 客户端版本号
*/
private String clientVersionCode;
/**
* 地理位置纬度
*/
* 地理位置纬度
*/
private String latitude;
/**
* 地理位置经度
*/
* 地理位置经度
*/
private String longitude;
/**
* 地理位置更新时间
*/
private Date posCorrentionTime;
/**
* 型号版本
*/
private String modelNumber;
/**
* 音乐音量
*/
private String musicVolume;
/**
* 网络提供商
*/
private String networkProviders;
/**
* 网络类型
*/
private String networkType;
/**
* 设备制式
*/
private String phoneType;
/**
* 响铃音量
*/
private String ringVolume;
/**
* SIM序列号
*/
private String simSn;
/**
* SIM状态
*/
private String simState;
/**
* SIM供应商
*/
private String simSupplier;
/**
* 系统音量
*/
private String systemVolume;
/**
* 提示声音量
*/
private String tipSoundVolume;
/**
* 版本号码
*/
private String versionNumber;
/**
* wifi BSSID
*/
private String wifiBssid;
/**
* wifi连接速度
*/
private String wifiConnSpeed;
/**
* wifi ip地址
*/
private String wifiIpAddr;
/**
* wifi mac地址
*/
private String wifiMacAddr;
/**
* wifi 网络ID
*/
private String wifiNetworkId;
/**
* wifi RSSI
*/
private String wifiRssi;
/**
* wifi SSID
*/
private String wifiSsid;
/**
* cpu信息
*/
private String cpuInfo;
/**
* 内存信息
*/
private String internalInfo;
/**
* 存储空间信息
*/
private String storageInfo;
/**
* 客户端版本号
*/
private String clientVersionCode;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
mdm_dao/src/main/resources/mapper/DeviceEquipmentCpuDao.xml
......@@ -23,7 +23,13 @@
from device_equipment_cpu
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentCpuVO">
select
<include refid="Base_Column_List" />
from device_equipment_cpu
where equipment_id = #{equipmentId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from device_equipment_cpu
where id = #{id,jdbcType=INTEGER}
</delete>
......
mdm_dao/src/main/resources/mapper/DeviceEquipmentDao.xml
......@@ -90,73 +90,6 @@
</foreach>
</select>
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfoVO">
SELECT de.equipment_name,
de.user_name,
de.activation_time,
de.department_name,
de.offline_time,
de.equipment_model,
de.phone_number as equipmentPhoneNumber,
au.phone_number as userPhoneNumber,
dei.imei2,
dei.firmware_version,
dei.model_number,
dei.version_number,
dei.cpu_info,
dei.internal_info,
dei.storage_info,
dei.imei_version,
de.imei,
de.oaid,
de.uuid,
dei.sim_state,
dei.sim_sn,
dei.sim_supplier,
dei.network_providers,
dei.network_type,
dei.phone_type,
dei.call_status,
dei.wifi_bssid,
dei.wifi_ip_addr,
dei.wifi_mac_addr,
dei.wifi_rssi,
dei.wifi_ssid,
dei.wifi_network_id,
dei.wifi_conn_speed,
dei.battery_status,
dei.battery_power,
dei.battery_voltage,
dei.battery_temperature,
dei.battery_technology,
dei.battery_life,
dei.data_activity_status,
dei.data_conn_status,
dei.call_volume,
dei.system_volume,
dei.ring_volume,
dei.music_volume,
dei.tip_sound_volume,
dei.latitude,
dei.longitude,
dei.pos_corrention_time,
dei.root_status,
dei.bluetooth_addr,
dei.bluetooth_is_on,
dei.bluetooth_is_search,
dei.bluetooth_name,
dei.bluetooth_pair_dev,
dei.bluetooth_status,
dei.client_version_code,
dei.sn,
dei.update_time
FROM device_equipment de
LEFT JOIN device_equipment_info dei ON dei.equipment_id = de.id
JOIN au_user au on de.user_id = au.id
WHERE au.is_delete = 0
AND de.id = #{equipmentId}
</select>
<select id="listOnlineChannelIdByIdList" resultType="java.lang.String">
select ws_channel_id from device_equipment
where is_delete = 0 and equipment_state = #{equipmentState} and id in
......@@ -269,7 +202,7 @@
FROM device_equipment de
JOIN au_user au on de.user_id = au.id
JOIN au_admin_department aad on au.department_id = aad.department_id
left join device_equipment_info_copy dei on de.id = dei.equipment_id
left join device_equipment_info dei on de.id = dei.equipment_id
WHERE de.is_delete = 0 AND de.company_id = #{companyId} AND aad.admin_id = #{adminId}
<if test="boundState != null">
AND de.bound_state = #{boundState}
......
mdm_dao/src/main/resources/mapper/DeviceEquipmentDiskDao.xml
......@@ -5,7 +5,7 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="equipment_id" jdbcType="INTEGER" property="equipmentId" />
<result column="path" jdbcType="VARCHAR" property="path" />
<result column="vendor" jdbcType="VARCHAR" property="vendor" />
<result column="marker" jdbcType="VARCHAR" property="marker" />
<result column="model" jdbcType="VARCHAR" property="model" />
<result column="serial_num" jdbcType="VARCHAR" property="serialNum" />
<result column="dist_type" jdbcType="TINYINT" property="distType" />
......@@ -25,7 +25,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, equipment_id, `path`, vendor, model, serial_num, dist_type, interface_type, speed,
id, equipment_id, `path`, marker, model, serial_num, dist_type, interface_type, speed,
num_sectors, bytes_per_sec, disk_cap_mib, num_subpart, uuid, is_mnt, mnt_path, fs_type,
part_type, fw_ver, create_time, update_time
</sql>
......@@ -35,7 +35,13 @@
from device_equipment_disk
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentDiskVO">
select
<include refid="Base_Column_List" />
from device_equipment_disk
where equipment_id = #{equipmentId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from device_equipment_disk
where id = #{id,jdbcType=INTEGER}
</delete>
......@@ -48,8 +54,8 @@
<if test="path != null">
`path`,
</if>
<if test="vendor != null">
vendor,
<if test="marker != null">
marker,
</if>
<if test="model != null">
model,
......@@ -110,8 +116,8 @@
<if test="path != null">
#{path,jdbcType=VARCHAR},
</if>
<if test="vendor != null">
#{vendor,jdbcType=VARCHAR},
<if test="marker != null">
#{marker,jdbcType=VARCHAR},
</if>
<if test="model != null">
#{model,jdbcType=VARCHAR},
......@@ -175,8 +181,8 @@
<if test="path != null">
`path` = #{path,jdbcType=VARCHAR},
</if>
<if test="vendor != null">
vendor = #{vendor,jdbcType=VARCHAR},
<if test="marker != null">
marker = #{marker,jdbcType=VARCHAR},
</if>
<if test="model != null">
model = #{model,jdbcType=VARCHAR},
......
mdm_dao/src/main/resources/mapper/DeviceEquipmentNetDao.xml
......@@ -22,7 +22,13 @@
from device_equipment_net
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentNetVO">
select
<include refid="Base_Column_List" />
from device_equipment_net
where equipment_id = #{equipmentId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from device_equipment_net
where id = #{id,jdbcType=INTEGER}
</delete>
......
mdm_dao/src/main/resources/mapper/DeviceEquipmentSysSourceDao.xml
......@@ -30,7 +30,13 @@
from device_equipment_sys_source
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentSysSourceVO">
select
<include refid="Base_Column_List" />
from device_equipment_sys_source
where equipment_id = #{equipmentId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from device_equipment_sys_source
where id = #{id,jdbcType=INTEGER}
</delete>
......
mdm_dao/src/main/resources/mapper/DeviceEquipmentUsbDao.xml
......@@ -22,7 +22,13 @@
from device_equipment_usb
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<select id="getEquipmentInfo" resultType="com.skr.mdm.bean.vo.equipment.DeviceEquipmentUsbVO">
select
<include refid="Base_Column_List" />
from device_equipment_usb
where equipment_id = #{equipmentId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from device_equipment_usb
where id = #{id,jdbcType=INTEGER}
</delete>
......
mdm_website/src/main/java/com/skr/mdm/api/equipment/service/impl/EquipmentInfoUserStrategyServiceImpl.java
......@@ -2,14 +2,13 @@ package com.skr.mdm.api.equipment.service.impl;
import com.skr.mdm.api.equipment.annotation.UserStrategy;
import com.skr.mdm.api.equipment.service.UserStrategyService;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfo2VO;
import com.skr.mdm.dao.DeviceEquipmentDao;
import com.skr.mdm.dao.DeviceEquipmentInfoCopyDao;
import com.skr.mdm.bean.vo.equipment.DeviceEquipmentInfoVO;
import com.skr.mdm.dao.*;
import com.skr.mdm.entity.DeviceEquipmentDO;
import com.skr.mdm.enums.SendCmdConfigEnum;
import com.skr.mdm.enums.UserStrategyEnum;
import com.skr.mdm.handle.IssuedUserHandler;
import com.skr.mdm.result.ResponseResult;
import com.skr.mdm.entity.DeviceEquipmentDO;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collections;
......@@ -26,7 +25,17 @@ public class EquipmentInfoUserStrategyServiceImpl implements UserStrategyService
@Autowired
private IssuedUserHandler issuedUserHandler;
@Autowired
private DeviceEquipmentInfoCopyDao deviceEquipmentInfoCopyDao;
private DeviceEquipmentInfoDao deviceEquipmentInfoDao;
@Autowired
private DeviceEquipmentCpuDao cpuDao;
@Autowired
private DeviceEquipmentDiskDao diskDao;
@Autowired
private DeviceEquipmentNetDao netDao;
@Autowired
private DeviceEquipmentSysSourceDao sysSourceDao;
@Autowired
private DeviceEquipmentUsbDao usbDao;
@Override
public ResponseResult getUserStrategy(Integer equipmentId) {
......@@ -34,7 +43,12 @@ public class EquipmentInfoUserStrategyServiceImpl implements UserStrategyService
DeviceEquipmentDO equipmentDO = equipmentDao.selectById(equipmentId);
issuedUserHandler.issuedUser(Collections.singletonList(equipmentId), equipmentDO.getCompanyId(),
SendCmdConfigEnum.UPLOAD_EQUIPMENT.getCmd(), null);
DeviceEquipmentInfo2VO deviceEquipmentInfo2VO = deviceEquipmentInfoCopyDao.getEquipmentInfo(equipmentId);
return ResponseResult.success(deviceEquipmentInfo2VO);
DeviceEquipmentInfoVO deviceEquipmentInfoVO = deviceEquipmentInfoDao.getEquipmentInfo(equipmentId);
deviceEquipmentInfoVO.setUsbVOList(usbDao.getEquipmentInfo(equipmentId));
deviceEquipmentInfoVO.setCpuVOList(cpuDao.getEquipmentInfo(equipmentId));
deviceEquipmentInfoVO.setSysSourceVOList(sysSourceDao.getEquipmentInfo(equipmentId));
deviceEquipmentInfoVO.setNetVOList(netDao.getEquipmentInfo(equipmentId));
deviceEquipmentInfoVO.setDiskVOList(diskDao.getEquipmentInfo(equipmentId));
return ResponseResult.success(deviceEquipmentInfoVO);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment