From 264d0135d9012c89457ad785bad3f0678f27ec0b Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 7 Nov 2025 17:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/bjq/AppDeviceBJQ6075Controller.java | 16 +++++++++++++--- .../app/domain/vo/AppDeviceShareDetailVo.java | 15 +++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java index c87d8b7..c3e9df3 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java @@ -4,7 +4,6 @@ import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo; import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto; import com.fuyuanshen.app.domain.dto.DeviceInstructDto; import com.fuyuanshen.app.domain.vo.AppDevice6075DetailVo; -import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.validate.AddGroup; import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation; @@ -90,8 +89,6 @@ public class AppDeviceBJQ6075Controller extends BaseController { * 灯光模式 * (主光模式) * 0(关闭灯光),1(强光),2(超强光), 3(工作光), 4(节能光),5(爆闪),6(SOS) - * (辅光模式) - * 0(关闭灯光),1(泛光),2(泛光爆闪), 3(警示灯), 4(警示灯/泛光) */ @PostMapping("/lightModeSettings") public R lightModeSettings(@RequestBody DeviceInstructDto params) { @@ -141,4 +138,17 @@ public class AppDeviceBJQ6075Controller extends BaseController { return R.ok(); } + + /** + * 获取设备分享详细信息 + * + * @param id 主键 + */ + @GetMapping("/getShareInfo/{id}") + public R getShareInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(appDeviceService6075.getInfo(id)); + } + + } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java index fe933ee..2fac8dc 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java @@ -45,8 +45,7 @@ public class AppDeviceShareDetailVo implements Serializable { private String phonenumber; /** - * 功能权限(1:灯光模式;2:激光模式;3:开机画面;4:人员信息登记;5:发送信息;6:产品信息) -以逗号分隔 + * 功能权限(1:灯光模式;2:激光模式;3:开机画面;4:人员信息登记;5:发送信息;6:产品信息)以逗号分隔 */ @ExcelProperty(value = "功能权限", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "1=:灯光模式;2:激光模式;3:开机画面;4:人员信息登记;5:发送信息;6:产品信息") @@ -83,7 +82,7 @@ public class AppDeviceShareDetailVo implements Serializable { private String typeName; /** - * 蓝牙名称 + * 蓝牙名称 */ private String bluetoothName; @@ -105,19 +104,19 @@ public class AppDeviceShareDetailVo implements Serializable { */ private String sendMsg; - //设备主灯档位 + // 设备主灯档位 private String mainLightMode; - //激光灯档位 + // 激光灯档位 private String laserLightMode; - //电量百分比 + // 电量百分比 private String batteryPercentage; - //充电状态(0没有充电,1正在充电,2为已充满) + // 充电状态(0没有充电,1正在充电,2为已充满) private String chargeState; - //电池剩余续航时间200分钟 + // 电池剩余续航时间200分钟 private String batteryRemainingTime; /**