From cab0884d7ffccb2b93285d0c92107d788afe0232 Mon Sep 17 00:00:00 2001 From: DragonWenLong <552045633@qq.com> Date: Thu, 15 Jan 2026 17:21:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(controller):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 @Operation 注解替换为 @Log 注解以正确记录操作日志 - 保持新增设备功能的核心逻辑不变 - 确保日志标题正确显示为"新增设备" --- .../app/controller/device/AppDeviceXinghanController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java index 47f552a5..a7b1f8af 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java @@ -133,7 +133,7 @@ public class AppDeviceXinghanController extends BaseController { } // @Log("新增设备") - @Operation(summary = "新增设备") + @Log(title = "新增设备") @PostMapping(value = "/add") public R addDevice(@RequestBody DeviceForm deviceForm) { try { From 3e119b1dd8b66eba499d60657151dea62f9a9fa4 Mon Sep 17 00:00:00 2001 From: DragonWenLong <552045633@qq.com> Date: Mon, 19 Jan 2026 16:39:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(device):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=9B=BE=E7=89=87=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在设备服务实现中添加设备图片字段的赋值逻辑 - 将设备类型中的图片信息同步到设备对象中 --- .../com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 797c4a09..0ed6af42 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -325,6 +325,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme device.setCreateByName(loginUser.getNickname()); device.setTypeName(deviceType.getTypeName()); device.setDeviceType(deviceType.getId()); + device.setDevicePic(deviceType.getDevicePic()); if (device.getDeviceImei() != null) { device.setPubTopic("A/" + device.getDeviceImei()); device.setSubTopic("B/" + device.getDeviceImei());