酒测未通过审核

liujun001
1 parent 88c7675e
Showing 12 changed files with 219 additions and 38 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/exception/report/EquipmentExceptionReportController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/box/dto/TakeKeyDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/dto/EquipmentExceptionReportUpdateStatusDTO.java
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/exception/report/EquipmentExceptionReportServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/sign/in/exception/report/EquipmentExceptionReportService.java
Bsth-admin/src/main/resources/application.yml
Bsth-common/src/main/java/com/ruoyi/common/core/domain/ResponseResult.java
@@ -94,7 +94,7 @@ public class DssFaceController extends BaseController {
     }
     @ApiOperation(("人脸注册"))
-    @PostMapping(value = "/Driver/FaceRegister")
+    @PostMapping(value = "/Face/FaceRegister")
     public ResponseResult<Object> faceRegister(@Valid @RequestBody FaceRegisterDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
@@ -236,7 +236,7 @@ public class DssFaceController extends BaseController {
             vo.setStaffName(d.getPersonnelName());
             vo.setIcCardNo(d.getIcCardCode());
             vo.setFacePhotoPath(d.getImage());
-            vo.setFaceFeature(vo.getFaceFeature());
+            vo.setFaceFeature(d.getFaceFeature());
             vo.setStaffCode(d.getJobCode());
 //            vo.setSynState(d.getS)
             vo.setSynContent(d.getSyncontent());
@@ -245,7 +245,9 @@ public class KeyBoxController extends BaseController {
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
-        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult);
+        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
+
+        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult,equipment);
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
@@ -264,10 +266,11 @@ public class KeyBoxController extends BaseController {
         List<LinggangKeyWorkLocation> locations = convert(dto, schedulings, driver);
         ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
-        if (Objects.isNull(responseResult)) {
+        if (Objects.isNull(responseResult) || !responseResult.isSuccess()) {
             return ResponseResult.error();
         }
-        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult);
+        Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
+        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult,equipment);
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
@@ -382,8 +385,6 @@ public class KeyBoxController extends BaseController {
      * 根据排班时间和钥匙ID查询钥匙
      * @author liujun
      * @date 2024/7/16 17:05
-     * @param keyId
-     * @param scheduleDate
      * @param dto
      * @return com.ruoyi.domain.key.location.LinggangKeyWorkLocation
      */
@@ -591,18 +592,26 @@ public class KeyBoxController extends BaseController {
                 }
             }
-            location.setCreateBy(Convert.toLong(driver.getId()));
+            if(Objects.nonNull(driver)) {
+                location.setCreateBy(Convert.toLong(driver.getId()));
+            }
             location.setCreateTime(new Date());
             return location;
         }).filter(obj -> Objects.nonNull(obj.getKeyInfoId())).collect(Collectors.toList());
     }
-    private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result) {
+    private TakeKeyVo convertTakeKeyVo(TakeKeyDTO dto, ResponseResult<Boolean> result,Equipment equipment) {
         TakeKeyVo vo = new TakeKeyVo();
         vo.setDevice(dto.getDevice());
         vo.setTime(new Date());
         vo.setResult(result.isSuccess() ? 0 : 1);
+        if(Objects.nonNull(equipment)){
+            vo.setDeviceType(equipment.getPromise());
+            vo.setDriverCode(equipment.getDeviceId());
+        }
+
+
         return vo;
     }
 package com.ruoyi.controller.sign.in.exception.report;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
@@ -11,6 +12,7 @@ import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
 import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportAddDTO;
 import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportQueryDTO;
 import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportUpdateDTO;
+import com.ruoyi.domain.sign.in.exception.report.dto.EquipmentExceptionReportUpdateStatusDTO;
 import com.ruoyi.domain.sign.in.exception.report.vo.EquipmentExceptionReportVO;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
@@ -151,17 +153,21 @@ public class EquipmentExceptionReportController extends BaseController {
     }
     @ApiOperation("修改状态")
-    @PostMapping(value = "/update/{status}/{id}")
-    public ResponseResult<Boolean> updateStatus(@PathVariable("status") Integer status, @PathVariable("id") Long id) {
-        EquipmentExceptionReport entity = equipmentExceptionReportService.getById(id);
-        if (Objects.isNull(entity)) {
-            return com.ruoyi.common.core.domain.ResponseResult.error("没有要修改的数据");
+    @PostMapping(value = "/update/status")
+    public ResponseResult<Boolean> updateStatus(@RequestBody EquipmentExceptionReportUpdateStatusDTO dto) {
+        NewDriver driver = driverService.getOneByPhone(dto.getTelPhone());
+        if(Objects.isNull(driver)){
+            return ResponseResult.error("根据手机号没有找到相关的用户:[{}]",dto);
         }
-//        entity.setUpdateBy(getUserId());
-        entity.setUpdateTime(new Date());
-        entity.setStatus(status);
-        entity.setReportTime(new Date());
-        boolean flag = equipmentExceptionReportService.updateByPrimaryKey(entity);
+        EquipmentExceptionReport entity = new EquipmentExceptionReport();
+        entity.setId(dto.getId());
+        entity.setStatus(dto.getStatus());
+        entity.setAlcoholIntake(dto.getAlcoholIntake());
+        entity.setContent(dto.getContent());
+        entity.setUpdateBy(Convert.toLong(driver.getId()));
+
+
+        boolean flag = equipmentExceptionReportService.updateStatusAndAddSign(entity);
         return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
@@ -46,9 +46,9 @@ public class TakeKeyDTO implements java.io.Serializable {
     @ApiModelProperty(value = "领取类型;0：司机操作，16管理员操作，17紧急领取，18紧急按钮", required = true)
     private Integer opeType;
-    @NotEmpty(message = "选择的钥匙位车牌 不能为空")
-    @ApiModelProperty(value = "选择的钥匙位车牌", required = true)
-    private String checkPlate;
+//    @NotEmpty(message = "选择的钥匙位车牌 不能为空")
+//    @ApiModelProperty(value = "选择的钥匙位车牌", required = true)
+//    private String plate;
     @ApiModelProperty(value = "领取钥匙信息集合")
     private List<TakeKeyKeyItemDTO> keyItem;
@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
@@ -137,6 +138,11 @@ public class EquipmentExceptionReport {
     @TableField(exist = false)
     private Collection<String> driverJobs;
+    @TableField(exist = false)
+    private BigDecimal alcoholIntake;
+
+    @TableField(exist = false)
+    private String content;
     @Override
     public String toString() {
+package com.ruoyi.domain.sign.in.exception.report.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liujun
+ * @date 2024年08月09日 13:22
+ */
+@Data
+@ApiModel(value = "打卡异常上报表的修改DTO(status)")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EquipmentExceptionReportUpdateStatusDTO implements java.io.Serializable{
+
+    private static final long serialVersionUID = -7483578326873622615L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+
+    /***处理状态 1 未处理 2 处理中 3 已处理*/
+    @ApiModelProperty(value = "处理状态 1 未处理 2 处理中 3 已处理", example = "1")
+    private Integer status;
+
+    /***处理状态 1 未处理 2 处理中 3 已处理*/
+    @ApiModelProperty(value = "再次测试的酒精值", example = "1")
+    private BigDecimal alcoholIntake;
+
+    @ApiModelProperty(value = "上传的图片信息")
+    private String content;
+
+    private String telPhone;
+
+    private String supperAuh;
+}
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.response.SignInResponseVo;
@@ -71,6 +73,8 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
      */
     AjaxResult addSignIn(SignIn signIn) throws FileUploadException, IOException;
+    AjaxResult addSign(SignIn signIn, Driver driver, LinggangScheduling scheduling) throws IOException;
+
     String repairSignRecord(HttpServletRequest request);
     String repairAllSignRecord(HttpServletRequest request, String date);
 package com.ruoyi.in.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -19,6 +20,7 @@ import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
@@ -33,6 +35,7 @@ import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.ConstDateUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -100,6 +103,9 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
     @Resource
     private ThreadJobService threadJobService;
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
+
     /**
      * 查询签到
      *
@@ -118,12 +124,12 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
             wrapper.in(SignIn::getJobCode, jobCodes);
         }
-        if(Objects.nonNull(signIn.getStartCreateTime())  && Objects.nonNull(signIn.getEndCreateTime())){
-            wrapper.between(SignIn::getCreateTime,signIn.getStartCreateTime(),signIn.getEndCreateTime());
-        }else if(Objects.nonNull(signIn.getStartCreateTime())){
-            wrapper.ge(SignIn::getCreateTime,signIn.getStartCreateTime());
-        }else if(Objects.nonNull(signIn.getEndCreateTime())){
-            wrapper.le(SignIn::getCreateTime,signIn.getEndCreateTime());
+        if (Objects.nonNull(signIn.getStartCreateTime()) && Objects.nonNull(signIn.getEndCreateTime())) {
+            wrapper.between(SignIn::getCreateTime, signIn.getStartCreateTime(), signIn.getEndCreateTime());
+        } else if (Objects.nonNull(signIn.getStartCreateTime())) {
+            wrapper.ge(SignIn::getCreateTime, signIn.getStartCreateTime());
+        } else if (Objects.nonNull(signIn.getEndCreateTime())) {
+            wrapper.le(SignIn::getCreateTime, signIn.getEndCreateTime());
         }
         return list(wrapper);
     }
@@ -199,12 +205,12 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         GlobalIndex globalIndex = new GlobalIndex();
         long now = signIn.getCreateTime().getTime();
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
-        if(CollectionUtils.isEmpty(dto)){
+        if (CollectionUtils.isEmpty(dto)) {
             return AjaxResult.error("今天没有签到数据，签到失败");
         }
         handleSignBody(signIn, driver, globalIndex, now, dto);
-        log.info("签到的数据为:[{}];index为[{}]",dto,globalIndex);
+        log.info("签到的数据为:[{}];index为[{}]", dto, globalIndex);
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
@@ -213,8 +219,8 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
                 return result;
             }
         }
-        if(org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())){
-             uploadImage(signIn, vo);
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())) {
+            uploadImage(signIn, vo);
         }
         signIn.setSchedulingId(dto.get(globalIndex.getIndex()).getId());
         signInMapper.insertSignIn(signIn);
@@ -226,7 +232,6 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         }
-
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
@@ -234,6 +239,31 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         return handleAjaxResult(signIn, driver, vo);
     }
+    /***
+     * 保存审核的签到
+     * @author liujun
+     * @date 2024/8/9 14:44
+     * @param signIn
+     * @param driver
+     * @param scheduling
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     */
+    public AjaxResult addSign(SignIn signIn, Driver driver, LinggangScheduling scheduling) throws IOException {
+        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
+        SignInResponseVo vo = getSignInResponseVo(driver, signIn, equipment);
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())) {
+            uploadImage(signIn, vo);
+        }
+        signIn.setSchedulingId(scheduling.getId());
+        signInMapper.insertSignIn(signIn);
+
+        scheduling.setSignInId(Convert.toInt(signIn.getId()));
+        // 更新考勤
+        linggangSchedulingService.updateByPrimaryKey(scheduling);
+
+        return AjaxResult.success();
+    }
+
     private void handleSignBody(SignIn signIn, Driver driver, GlobalIndex globalIndex, long now, List<DriverScheduling> dto) {
         // 签到检查
         if (checkSignIn(now, dto, globalIndex, signIn, driver)) {
 package com.ruoyi.service.impl.sign.in.exception.report;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.mapper.sign.in.exception.report.EquipmentExceptionReportMapper;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.IOException;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 @Slf4j
 @Service
@@ -24,6 +38,12 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
     @Autowired
     private EquipmentExceptionReportMapper equipmentExceptionReportMapper;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+    @Autowired
+    private NewDriverService driverService;
+
+
     /**
      * 分页查询
      */
@@ -31,8 +51,8 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
     public IPage<EquipmentExceptionReport> pageList(Page<EquipmentExceptionReport> page, EquipmentExceptionReport entity, OrderEntity orderEntity) {
         LambdaQueryWrapper<EquipmentExceptionReport> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(EquipmentExceptionReport::getId);
-        if(CollectionUtils.isNotEmpty(entity.getDriverJobs())){
-            countWrapper.in(EquipmentExceptionReport::getJobCode,entity.getDriverJobs());
+        if (CollectionUtils.isNotEmpty(entity.getDriverJobs())) {
+            countWrapper.in(EquipmentExceptionReport::getJobCode, entity.getDriverJobs());
         }
         int count = count(countWrapper);
@@ -40,8 +60,8 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
         if (count > 0) {
             PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
             LambdaQueryWrapper<EquipmentExceptionReport> selectWrapper = new LambdaQueryWrapper<>(entity);
-            if(CollectionUtils.isNotEmpty(entity.getDriverJobs())){
-                selectWrapper.in(EquipmentExceptionReport::getJobCode,entity.getDriverJobs());
+            if (CollectionUtils.isNotEmpty(entity.getDriverJobs())) {
+                selectWrapper.in(EquipmentExceptionReport::getJobCode, entity.getDriverJobs());
             }
             orderColumn(selectWrapper, orderEntity);
@@ -117,6 +137,59 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl&lt;EquipmentEx
         return updateById(entity);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateStatusAndAddSign(EquipmentExceptionReport entity) {
+        EquipmentExceptionReport report = getById(entity.getId());
+        if (Objects.isNull(report)) {
+            log.info("没有找到相应的异常签到数据:[{}]", entity);
+            return false;
+        }
+        ISignInService signInService = SpringUtils.getBean(ISignInService.class);
+
+        SignIn signIn = signInService.getById(report.getSignId());
+        if (Objects.isNull(signIn)) {
+            log.info("没有找到相应的签到数据:[{}]；[{}]", entity, report);
+            return false;
+        }
+
+        LinggangScheduling scheduling = schedulingService.getById(signIn.getSchedulingId());
+        if(Objects.isNull(scheduling)){
+            log.error("没有找到打卡信息[{}]",signIn);
+            return false;
+        }
+
+        NewDriver driver = driverService.getOne(signIn.getJobCode());
+        if(Objects.isNull(driver)){
+            log.error("没有找到用户信息[{}]",signIn);
+            return false;
+        }
+
+        Driver dr = new Driver();
+        BeanUtils.copyProperties(driver, dr);
+
+        signIn.setImage(entity.getContent());
+        signIn.setCreateTime(new Date());
+        signIn.setAlcoholIntake(entity.getAlcoholIntake());
+        signIn.setCreateBy(Convert.toStr(entity.getUpdateBy()));
+        signIn.setId(null);
+
+        try {
+            signInService.addSign(signIn, dr, scheduling);
+
+            report.setStatus(entity.getStatus());
+            report.setUpdateTime(new Date());
+            report.setUpdateBy(entity.getUpdateBy());
+            report.setImage(signIn.getImage());
+
+            updateByPrimaryKey(report);
+            return true;
+        } catch (IOException e) {
+            log.error("审核酒精测试失败", e);
+        }
+        return false;
+    }
+
     /***根据主键删除数据*/
     @Override
     public boolean deleteById(Long id) {
@@ -48,5 +48,7 @@ public interface EquipmentExceptionReportService extends IService&lt;EquipmentExcep
      */
     boolean updateByPrimaryKey(EquipmentExceptionReport entity);
+    boolean updateStatusAndAddSign(EquipmentExceptionReport entity);
+
     boolean deleteById(Long id);
 }
 \ No newline at end of file
@@ -37,7 +37,7 @@ server:
 logging:
   level:
     com.ruoyi: debug
-    org.springframework: warn
+    org.springframework: error
     org:
       springframework:
         web:
@@ -46,6 +46,10 @@ logging:
               method:
                 annotation:
                   RequestResponseBodyMethodProcessor: TRACE
+            DispatcherServlet: TRACE
+
+
+
 # 用户配置
 user:
@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.constant.HttpStatus;
+import org.slf4j.MDC;
 import java.util.Objects;
@@ -14,6 +15,7 @@ public class ResponseResult&lt;T&gt; {
     private String msg;
     private T data;
+
     public int getCode() {
         return code;
     }
@@ -38,6 +40,10 @@ public class ResponseResult&lt;T&gt; {
         this.data = data;
     }
+    public String getReqeustId() {
+        return MDC.get("requestId");
+    }
+
     public ResponseResult() {
     }