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

Compare commits

base: dyf:ca11ef0e3547594d2576596727d1be450c230875
Branches Tags
dyf:main dyf:6170 dyf:jingquan dyf:dyf-device dyf:prod dyf:APP权限登录改造
...
compare: dyf:b280038502eea06319b62262d9c7223997202c49
Branches Tags
dyf:6170 dyf:jingquan dyf:dyf-device dyf:prod dyf:main dyf:APP权限登录改造

3 Commits
ca11ef0e35 ... b280038502

Author SHA1 Message Date
dyf
b280038502 Merge pull request 'fix(controller): 修复新增设备日志注解配置' (#23) from liwenlong/fys-Multi-tenant:jingquan into jingquan 
Reviewed-on: #23
 2026-01-28 16:33:25 +08:00
DragonWenLong
3e119b1dd8 feat(device): 添加设备图片字段映射 
- 在设备服务实现中添加设备图片字段的赋值逻辑
- 将设备类型中的图片信息同步到设备对象中
 2026-01-19 16:39:01 +08:00
DragonWenLong
cab0884d7f fix(controller): 修复新增设备日志注解配置 
- 将 @Operation 注解替换为 @Log 注解以正确记录操作日志
- 保持新增设备功能的核心逻辑不变
- 确保日志标题正确显示为"新增设备"
 2026-01-15 17:21:46 +08:00
2 changed files with 2 additions and 1 deletions
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());