feat(log): 增加业务ID字段并修改日志记录逻辑

将操作日志中的 userId 字段改为 busiId，并在调用 saveLog 方法时传入具体的业务 ID，
以增强日志的可追溯性。同时移除了 ipAddress 字段及相关逻辑。涉及模块包括设备管理、用户管理、租户管理、告警计划等。

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/AlarmGatewayImpl.java

@@ -125,8 +125,8 @@ public class AlarmGatewayImpl implements AlarmGateway {
         }
 
         AlarmTimePlan alarmTimePlan = alarmTimePlanService.getById(alarmPlan.getAlarmTimePlanId());
-        logService.saveLog(OprLogType.DEL_ALARM_PLAN.getCode(), alarmPlan);
-        logService.saveLog(OprLogType.DEL_TIME_PLAN.getCode(), alarmPlan);
+        logService.saveLog((long) req.getId(),OprLogType.DEL_ALARM_PLAN.getCode(), alarmPlan);
+        logService.saveLog((long)alarmTimePlan.getId(),OprLogType.DEL_TIME_PLAN.getCode(), alarmTimePlan);
         alarmPlanService.delById(req.getId());
         alarmTimePlanService.delById(alarmTimePlan.getId());
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -269,7 +269,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         }
 
         // 记录操作日志
-        logService.saveLog(OprLogType.UNBLIND_DEVICE.getCode(), logContent);
+        logService.saveLog(Long.valueOf(devId),OprLogType.UNBLIND_DEVICE.getCode(), logContent);
         return updateFlag;
     }
 
@@ -298,7 +298,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         devInfo.setActiveTime(LocalDateTime.now());
         devInfoService.updateById(devInfo);
 
-        logService.saveLog(OprLogType.BIND_DEVICE.getCode(), String.format("用户 %d 绑定设备 %s", request.getUserId(), request.getClientId()));
+        logService.saveLog(devInfo.getDevId(),OprLogType.BIND_DEVICE.getCode(), String.format("用户 %d 绑定设备 %s", request.getUserId(), request.getClientId()));
 
         //5.返回绑定结果和设备主键id
         DeviceDTO result = new DeviceDTO();
@@ -387,7 +387,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
             throw new BizException(ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorCode(), ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorMessage());
         }
 
-        logService.saveLog(OprLogType.UPDATE_DEVICE.getCode(), devInfo);
+        logService.saveLog(devInfo.getDevId(),OprLogType.UPDATE_DEVICE.getCode(), devInfo);
 
         //2.更新数据
         devInfo.setTenantId(params.getTenantId());
@@ -468,7 +468,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
             throw new BizException(ErrorEnum.DEVICE_UPDATE_FAIL.getErrorCode(), ErrorEnum.DEVICE_UPDATE_FAIL.getErrorMessage());
         }
 
-        logService.saveLog(OprLogType.UPDATE_DEVICE.getCode(), params);
+        logService.saveLog(devInfo.getDevId(),OprLogType.UPDATE_DEVICE.getCode(), params);
 
         //5.通过MQTT把信息参数发送到设备
         mqttSend.sendDeviceParamsToMqtt(devInfo.getClientId(), params);
@@ -645,7 +645,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         }
 
         // 记录操作日志
-        logService.saveLog(OprLogType.UPDATE_ROOM.getCode(), param);
+        logService.saveLog(param.getDevId(),OprLogType.UPDATE_ROOM.getCode(), param);
 
         return true;
     }
@@ -801,7 +801,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         devShareService.removeById(devShare);
 
         //3.取消分享记录到日志
-        logService.saveLog(OprLogType.CANCEL_SHARE.getCode(), shareId);
+        logService.saveLog(devShare.getDevId(),OprLogType.CANCEL_SHARE.getCode(), shareId);
     }
 
     @Override
@@ -820,7 +820,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
         devShareService.updateById(devShare);
 
         //3.记录操作日志
-        logService.saveLog(OprLogType.UPDATE_DEVICE_SHARE_PERMISSION.getCode(), param);
+        logService.saveLog(devShare.getDevId(),OprLogType.UPDATE_DEVICE_SHARE_PERMISSION.getCode(), param);
     }
 
     @Override
@@ -1137,7 +1137,7 @@ public class DeviceGatewayImpl implements DeviceGateway {
                 devInfo.getDevId(),             // 转移的设备id
                 userInfo.getUserId()            // 转移后的用户id
         );
-        logService.saveLog(OprLogType.DEVICE_TRANSFER.getCode(), logContent);
+        logService.saveLog(param.getDevId(),OprLogType.DEVICE_TRANSFER.getCode(), logContent);
         return true;
     }
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -387,7 +387,7 @@ public class UserGatewayImpl implements UserGateway {
         );
 
         // 记录操作日志
-        logService.saveLog(OprLogType.USER_LOGOFF.getCode(), userInfo);
+        logService.saveLog(request.getUserId(),OprLogType.USER_LOGOFF.getCode(), userInfo);
     }
 
     @Override

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebAdminDealGatewayImpl.java

@@ -59,7 +59,7 @@ public class WebAdminDealGatewayImpl implements WebAdminDealGateway {
             throw new BizException(ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorCode(), ErrorEnum.DEVICE_IS_NOT_EXIST.getErrorMessage());
         }
 
-        tblOprLogService.saveLog(OprLogType.ADMIN_DEAL_UNBIND.getCode(), devInfo);
+        tblOprLogService.saveLog(param.getDevId(),OprLogType.ADMIN_DEAL_UNBIND.getCode(), devInfo);
         log.info("设备信息:{}", JSON.toJSONString(devInfo));
 
         // 查询设备分享者 逻辑删除

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebTenantGatewayImpl.java

@@ -64,7 +64,7 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
             TblTenant saveTenant = CopyUtils.copy(req, TblTenant.class);
             tblTenantService.save(saveTenant);
 
-            tblOprLogService.saveLog(OprLogType.ADD_TENANT.getCode(), saveTenant);
+            tblOprLogService.saveLog(req.getTenantId(), OprLogType.ADD_TENANT.getCode(), saveTenant);
         } else {
 
             List<TblTenant> tenantList = tblTenantService.queryByCodeOrName(req.getTenantCode(), req.getTenantName());
@@ -76,7 +76,7 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
             BeanUtils.copyProperties(req, tenant);
             tblTenantService.updateById(tenant);
 
-            tblOprLogService.saveLog(OprLogType.MOD_TENANT.getCode(), tenant);
+            tblOprLogService.saveLog(req.getTenantId(), OprLogType.MOD_TENANT.getCode(), tenant);
         }
 
     }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebUserGatewayImpl.java

@@ -95,7 +95,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
         userRole.setRoleId(param.getRoleId());
         tblUserRoleService.save(userRole);
 
-        logService.saveLog(OprLogType.ADD_MANAGER.getCode(), adminUserInfo);
+        logService.saveLog(adminUserInfo.getUserId(),OprLogType.ADD_MANAGER.getCode(), adminUserInfo);
     }
 
     @Override
@@ -121,7 +121,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
         }
         check(userType, param.getUserType());
 
-        logService.saveLog(OprLogType.MOD_MANAGER.getCode(), exist);
+        logService.saveLog(param.getUserId(),OprLogType.MOD_MANAGER.getCode(), exist);
         //2.更新用户信息到 admin_user_info 表
         //更新密码
         BeanUtils.copyProperties(param, exist, "userId");
@@ -154,7 +154,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
         }
         check(userType, exist.getUserType());
 
-        logService.saveLog(OprLogType.DEL_MANAGER.getCode(), exist);
+        logService.saveLog(userId,OprLogType.DEL_MANAGER.getCode(), exist);
         adminUserService.deleteById(exist.getUserId());
     }
 
@@ -204,7 +204,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
         userRole.setRoleId(tblRole.getRoleId());
         tblUserRoleService.save(userRole);
 
-        logService.saveLog(OprLogType.ADD_CLIENT.getCode(), adminUserInfo);
+        logService.saveLog(adminUserInfo.getUserId(),OprLogType.ADD_CLIENT.getCode(), adminUserInfo);
     }
 
     @Override
@@ -223,7 +223,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
             throw new BizException(ErrorEnum.USER_ALREADY_EXISTS.getErrorCode(), ErrorEnum.USER_ALREADY_EXISTS.getErrorMessage());
         }
 
-        logService.saveLog(OprLogType.MOD_CLIENT.getCode(), exist);
+        logService.saveLog(param.getUserId(),OprLogType.MOD_CLIENT.getCode(), exist);
         //2.保存新用户到 admin_user_info 表
         BeanUtils.copyProperties(param, exist, "userId");
         exist.setPassword(PasswordUtil.encrypt(param.getPassword()));
@@ -254,7 +254,7 @@ public class WebUserGatewayImpl implements WebUserGateway {
         }
         check(userType, exist.getUserType());
 
-        logService.saveLog(OprLogType.DEL_MANAGER.getCode(), exist);
+        logService.saveLog(userId,OprLogType.DEL_MANAGER.getCode(), exist);
         adminUserService.deleteById(exist.getUserId());
     }
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblOprLog.java

@@ -21,9 +21,9 @@ public class TblOprLog extends BasePO {
     private Long logId;
 
     /**
-     * 用户 ID
+     * 业务 ID
      */
-    private String userId;
+    private Long busiId;
 
     /**
      * 操作类型
@@ -35,8 +35,4 @@ public class TblOprLog extends BasePO {
      */
     private String operation;
 
-    /**
-     * IP 地址
-     */
-    private String ipAddress;
 } 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/TblOprLogService.java

@@ -5,5 +5,5 @@ import com.hfln.portal.infrastructure.po.TblOprLog;
 
 public interface TblOprLogService extends IService<TblOprLog> {
 
-    void saveLog(String code, Object byId);
+    void saveLog(Long busiId ,String code, Object obj);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/TblOprLogServiceImpl.java

@@ -14,12 +14,11 @@ import org.springframework.stereotype.Service;
 public class TblOprLogServiceImpl extends ServiceImpl<TblOprLogMapper, TblOprLog> implements TblOprLogService {
 
     @Override
-    public void saveLog(String code, Object obj) {
+    public void saveLog(Long busiId ,String code, Object obj) {
         TblOprLog tblOprLog = new TblOprLog();
+        tblOprLog.setBusiId(busiId);
         tblOprLog.setOprType(code);
         tblOprLog.setOperation(JSON.toJSONString(obj));
-        // userId ip todo
-        tblOprLog.setUserId("1");
 
         this.baseMapper.insert(tblOprLog);
     }