From cf3ab013a2cef94967bc3fd9d860f7771b8927e4 Mon Sep 17 00:00:00 2001 From: zhangzhicheng Date: Mon, 22 Jul 2024 18:00:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=8F=8A=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/EqHomeController.java | 37 +++++- .../dromara/web/domain/bo/EqAppHomeBo.java | 5 + .../web/domain/vo/EqEquipmentStatusVo.java | 107 ++++++++++++++++++ 3 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentStatusVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index 169749c6e..eb07fea5b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -1,5 +1,6 @@ package org.dromara.web.controller.app; +import cn.dev33.satoken.secure.BCrypt; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.ServiceException; @@ -68,7 +69,7 @@ public class EqHomeController extends BaseController { return R.ok(eqAreaService.queryList(bo)); } - /** + /** todo * 首页查看设备列表 */ @GetMapping("/list") @@ -80,14 +81,15 @@ public class EqHomeController extends BaseController { return eqEquipmentService.queryPageList(eqEquipmentBo, pageQuery); //在设备表中增加了分布id } - /** + /** todo * 控制设备 0关 1停 2开 * 传参设备编码 */ @GetMapping("/operate") public R operate(EqAppHomeBo bo){ -// if (bo.getEquipmentId() == null) throw new ServiceException("设备ID不能为空"); if (bo.getEquipmentCode() == null) throw new ServiceException("设备编码不能为空"); + if (bo.getOperateType() == 0) throw new ServiceException("操作类型不能为0"); + if (bo.getUserId() == null) throw new ServiceException("用户ID不能为空"); return R.ok(eqEquipmentService.operate(bo)); } @@ -138,13 +140,17 @@ public class EqHomeController extends BaseController { /** * 密码已验证 - * @param password + * @param bo * @return */ @GetMapping("/checkPassword") - public R checkPassword(String password){ + public R checkPassword(EqAppHomeBo bo){ //密码验证 - return R.ok(true); + if (bo.getUserId()==null||bo.getPassword()== null) throw new ServiceException("用户ID或密码不能为空"); + SysUserVo sysUserVo = userService.selectUserById(bo.getUserId()); + if (sysUserVo == null) throw new ServiceException("用户不存在"); + return R.ok(BCrypt.checkpw(bo.getPassword(), sysUserVo.getPassword())); +// return R.ok(BCrypt.hashpw(bo.getPassword()).equals(sysUserVo.getPassword())); } /** @@ -176,5 +182,24 @@ public class EqHomeController extends BaseController { return R.ok(list); } + /** todo + * 设备状态实时获取 + * @param bo + * @return + */ + @GetMapping("/getDeviceStatus") + public R getDeviceStatus(EqAppHomeBo bo){ + EqEquipmentStatusVo result = new EqEquipmentStatusVo(); + + + return R.ok(result); + } + + + + + + + } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java index 7fffc695c..c545e755d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqAppHomeBo.java @@ -39,5 +39,10 @@ public class EqAppHomeBo extends BaseEntity{ * 半开门百分比 插入int类型值 */ private int openPercent; + + /** + * 密码（密码校验时使用） + */ + private String password; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentStatusVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentStatusVo.java new file mode 100644 index 000000000..2dfb8a90a --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentStatusVo.java @@ -0,0 +1,107 @@ +package org.dromara.web.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.web.domain.EqEquipment; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 设备信息视图对象 eq_equipment + * + * @author zzc + * @date 2024-07-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = EqEquipment.class) +public class EqEquipmentStatusVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long equipmentId; + + /** + * 分布id + */ + @ExcelProperty(value = "分布id") + private Long areaId; + + /** + * 设备类型 + */ + @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_equipment_type") + private Integer type; + + /** + * 登录账号 + */ + @ExcelProperty(value = "登录账号") + private String userName; + + /** + * 账号昵称 + */ + @ExcelProperty(value = "账号昵称") + private String nickName; + + /** + * 设备编码 + */ + @ExcelProperty(value = "设备编码") + private String equipmentCode; + + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String equipmentName; + + /** + * 设备状态 + */ + @ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_status_type") + private Integer status; + + /** + * 故障状态 + */ + @ExcelProperty(value = "故障状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_fault_status") + private Integer faultStatus; + + /** + * 离线状态 + */ + @ExcelProperty(value = "离线状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "eq_line_status") + private Integer lineStatus; + + /** + * 绑定时间 + */ + @ExcelProperty(value = "绑定时间") + private Date bindTime; + + /** + * 操作次数 + */ + @ExcelProperty(value = "操作次数") + private Long operationCount; + + +}