dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(controller): 修复新增设备日志注解配置' (#23) from liwenlong/fys-Multi-tenant:jingquan into jingquan

Browse Source 
Reviewed-on: #23
This commit is contained in:
dyf
2026-01-28 16:33:25 +08:00
parent ca11ef0e35 3e119b1dd8
commit b280038502
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java
View File

@ -133,7 +133,7 @@ public class AppDeviceXinghanController extends BaseController {
} }
// @Log("新增设备") // @Log("新增设备")
@Operation(summary = "新增设备") @Log(title = "新增设备")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public R<Void> addDevice(@RequestBody DeviceForm deviceForm) { public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
try { try {

1
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -325,6 +325,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
device.setCreateByName(loginUser.getNickname()); device.setCreateByName(loginUser.getNickname());
device.setTypeName(deviceType.getTypeName()); device.setTypeName(deviceType.getTypeName());
device.setDeviceType(deviceType.getId()); device.setDeviceType(deviceType.getId());
device.setDevicePic(deviceType.getDevicePic());
if (device.getDeviceImei() != null) { if (device.getDeviceImei() != null) {
device.setPubTopic("A/" + device.getDeviceImei()); device.setPubTopic("A/" + device.getDeviceImei());
device.setSubTopic("B/" + device.getDeviceImei()); device.setSubTopic("B/" + device.getDeviceImei());