web端控制中心3

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -153,5 +153,8 @@ public class Device extends TenantEntity {
      */
     @Schema(title = "出厂日期")
     private Date productionDate;
-
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/InstructionRecordDto.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class InstructionRecordDto {
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+    /**
+     * 操作时间-开始时间
+     */
+    private String startTime;
+
+    /**
+     * 操作时间-结束时间
+     */
+    private String endTime;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -18,22 +18,34 @@ import java.util.Set;
 @Data
 public class DeviceQueryCriteria extends BaseEntity {
 
-    @Schema(name = "设备id")
+    /**
+     * 设备id
+     */
     private Long deviceId;
 
-    @Schema(name = "设备名称")
+    /**
+     * 设备名称
+     */
     private String deviceName;
 
-    @Schema(name = "设备类型")
+    /**
+     * 设备类型
+     */
     private Long deviceType;
 
-    @Schema(name = "设备MAC")
+    /**
+     * 设备MAC
+     */
     private String deviceMac;
 
-    @Schema(name = "设备IMEI")
+    /**
+     * 设备IMEI
+     */
     private String deviceImei;
 
-    @Schema(name = "设备SN")
+    /**
+     * 设备SN
+     */
     private String deviceSn;
 
     /**
@@ -41,26 +53,37 @@ public class DeviceQueryCriteria extends BaseEntity {
      * 0 失效
      * 1 正常
      */
-    @Schema(name = "设备状态  0 失效 1 正常  ")
     private Integer deviceStatus;
 
-    @Schema(name = "页码", example = "1")
+    /**
+     * 页码
+     */
     private Integer pageNum = 1;
 
-    @Schema(name = "每页数据量", example = "10")
+    /**
+     * 每页数据量
+     */
     private Integer pageSize = 10;
 
-    @Schema(name = "客户id")
+    /**
+     * 客户id
+     */
     private Long customerId;
     private Set<Long> customerIds;
 
-    @Schema(name = "当前所有者")
+    /**
+     * 当前所有者
+     */
     private Long currentOwnerId;
 
-    @Schema(name = "租户ID")
+    /**
+     * 租户ID
+     */
     private String tenantId;
 
-    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
     private Integer communicationMode;
 
     /* app绑定用户id */
@@ -72,22 +95,22 @@ public class DeviceQueryCriteria extends BaseEntity {
      */
     private String personnelBy;
 
+
     /**
      * 是否为管理员
      */
-    @Schema(name = "是否为管理员")
     private Boolean isAdmin = false;
 
+
     /**
      * 设备所属分组
      */
-    @Schema(name = "设备所属分组")
     private Long groupId;
 
+
     /**
      * 设备地区
      */
-    @Schema(name = "设备地区")
     private String area;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/InstructionRecordVo.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class InstructionRecordVo {
+    private Long id;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 操作模块
+     */
+    private String deviceAction;
+
+    /**
+     * 操作内容
+     */
+    private String content;
+
+    /**
+     * 操作时间
+     */
+    private String createTime;
+}

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceLogMapper.java

@@ -1,8 +1,12 @@
 package com.fuyuanshen.equipment.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
 import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.vo.InstructionRecordVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备日志Mapper接口
@@ -12,4 +16,5 @@ import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface DeviceLogMapper extends BaseMapperPlus<DeviceLog, DeviceLogVo> {
 
+    Page<InstructionRecordVo> getInstructionRecord(Page<InstructionRecordVo> page,@Param("bo") InstructionRecordDto bo);
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java

@@ -70,5 +70,5 @@ public interface DeviceMapper extends BaseMapper<Device> {
 
     AppDeviceVo getDeviceInfo(@Param("deviceMac") String deviceMac);
 
-    Page<WebDeviceVo> queryWebDeviceList(Page<Object> build, DeviceQueryCriteria bo);
+    Page<WebDeviceVo> queryWebDeviceList(Page<Object> build,@Param("criteria") DeviceQueryCriteria criteria);
 }