fix："远程操作日志增加操作者字段"

src/main/java/com/szwl/controller/MessageLogController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author wuhs
- * @since 2025-04-16
+ * @since 2025-05-10
  */
 @RestController
 @RequestMapping("/messageLog")

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -1635,7 +1635,6 @@ public class TEquipmentController {
     @ApiOperation(value = "获取对应的机器编号")
     @GetMapping("/findEquipmentByClientIds")
     public ResponseModel<List<TEquipment>> findEquipmentByClientIds(@RequestParam("clientIds") List<String> clientIds) {
-
         LambdaQueryWrapper<TEquipment> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(TEquipment::getClientId, clientIds);
         List<TEquipment> list = tEquipmentService.list(wrapper);
@@ -1884,12 +1883,15 @@ public class TEquipmentController {
     @ApiOperation("修改税费开关状态")
     @PostMapping("/updateTaxSwitch")
     public ResponseModel<?> updateTaxSwitch(@RequestBody TEquipmentDesc equipmentDesc) {
+        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
+                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
+        Long adminId = userDetailBO.getId();
         TEquipmentDesc desc = equipmentDescService.getById(equipmentDesc.getEquipmentId());
         if (desc != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentDesc.getEquipmentId());
             String status = equipmentDesc.getTaxStatus() ? "1" : "0";
             String message = PushUtils.buildJson(OperationType.UPDATE_TAX_STATUS.getCode(), status).toString();
-            tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.UPDATE_TAX_STATUS, message);
+            tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.UPDATE_TAX_STATUS, message, adminId);
         }
         return R.ok();
     }
@@ -1897,11 +1899,14 @@ public class TEquipmentController {
     @ApiOperation("修改税率")
     @PostMapping("/updateTaxRate")
     public ResponseModel<?> updateTaxRate(@RequestBody TEquipmentDesc equipmentDesc) {
+        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
+                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
+        Long adminId = userDetailBO.getId();
         TEquipmentDesc desc = equipmentDescService.getById(equipmentDesc.getEquipmentId());
         if (desc != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentDesc.getEquipmentId());
             String message = PushUtils.buildJson(OperationType.UPDATE_TAX_RATE.getCode(), equipmentDesc.getTaxRate().toString()).toString();
-            tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.UPDATE_TAX_RATE, message);
+            tEquipmentService.sendRemoteMessage(equipment.getClientId(), OperationType.UPDATE_TAX_RATE, message, adminId);
         }
         return R.ok();
     }
@@ -1916,6 +1921,9 @@ public class TEquipmentController {
     @ApiOperation(value = "上传日志")
     @GetMapping("/newUploadLog")
     public ResponseModel<?> newUploadLog(String equipmentId, String day) {
+        UserDetailBO userDetailBO = Optional.ofNullable(tokenManager.getLoginUserDetails())
+                .orElseThrow(() -> new BizException(ResponseCodesEnum.L0001));
+        Long adminId = userDetailBO.getId();
         // 检查设备ID是否为空
         if (StringUtils.isEmpty(equipmentId)) {
             return R.fail(A0001);
@@ -1935,7 +1943,7 @@ public class TEquipmentController {
         String upToken = auth.uploadToken(ConfigConsts.QINIU_CLOUD_BUCKET, key);
         // 生成发送消息
         String message = PushUtils.buildJsonLog(OperationType.LOG.getCode(), kind, upToken, key).toString();
-        tEquipmentService.sendRemoteMessage(clientId, OperationType.LOG, message);
+        tEquipmentService.sendRemoteMessage(clientId, OperationType.LOG, message, adminId);
         // 返回操作成功信息
         return R.ok();
     }

src/main/java/com/szwl/mapper/MessageLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2025-04-16
+ * @since 2025-05-10
  */
 public interface MessageLogMapper extends BaseMapper<MessageLog> {
 

src/main/java/com/szwl/mapper/xml/MessageLogMapper.xml

@@ -15,11 +15,12 @@
         <result column="response_content" property="responseContent" />
         <result column="error_info" property="errorInfo" />
         <result column="created_at" property="createdAt" />
+        <result column="admin_id" property="adminId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        log_id, msg_id, client_id, direction, operation, timestamp, status_code, data_content, response_content, error_info, created_at
+        log_id, msg_id, client_id, direction, operation, timestamp, status_code, data_content, response_content, error_info, created_at, admin_id
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/entity/MessageLog.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2025-04-16
+ * @since 2025-05-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -58,5 +58,8 @@ public class MessageLog implements Serializable {
     @ApiModelProperty(value = "记录入库时间（用于日志轮转）")
     private Date createdAt;
 
+    @ApiModelProperty(value = "远程操作用户ID")
+    private Long adminId;
+
 
 }

src/main/java/com/szwl/service/MessageLogService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2025-04-16
+ * @since 2025-05-10
  */
 public interface MessageLogService extends IService<MessageLog> {
 

src/main/java/com/szwl/service/TEquipmentService.java

@@ -27,7 +27,7 @@ public interface TEquipmentService extends MyIService<TEquipment> {
      * @param operationType
      * @param message
      */
-    void sendRemoteMessage(String clientId, OperationType operationType, String message);
+    void sendRemoteMessage(String clientId, OperationType operationType, String message, Long adminId);
 
     String findMachineTotalNum(StatisticsParam param);
 

src/main/java/com/szwl/service/impl/MessageLogServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2025-04-16
+ * @since 2025-05-10
  */
 @Service
 public class MessageLogServiceImpl extends ServiceImpl<MessageLogMapper, MessageLog> implements MessageLogService {

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -106,7 +106,7 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
     }
 
     @Override
-    public void sendRemoteMessage(String clientId, OperationType operationType, String message) {
+    public void sendRemoteMessage(String clientId, OperationType operationType, String message, Long adminId) {
         MessageLog messageLog = new MessageLog();
         messageLog.setMsgId(System.currentTimeMillis() + RandomUtil.randomNumbers(10));
         messageLog.setClientId(clientId);
@@ -115,6 +115,7 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
         messageLog.setTimestamp(System.currentTimeMillis());
         messageLog.setDataContent(message);
         messageLog.setCreatedAt(new Date());
+        messageLog.setAdminId(adminId);
         messageLogService.save(messageLog);
         // 参数
         JSONObject data = new JSONObject();