maven
2025-09-23 0781900bd070feada6be1b7f926696691d03ff53
Merge remote-tracking branch 'origin/master'
已修改2个文件
13 ■■■■ 文件已修改
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.mapper.DeviceDefectRecordMapper;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
@@ -24,7 +25,7 @@
    private DeviceDefectRecordMapper deviceDefectRecordMapper;
    @Autowired
    private IDeviceRepairService deviceRepairService;
    private DeviceRepairMapper deviceRepairMapper;
    @Override
    public IPage<DeviceDefectRecordDto> listPage(Page page, DeviceDefectRecordDto deviceDefectRecordDto) {
@@ -40,7 +41,7 @@
            //获取当前登录用户
            deviceRepair.setRepairName(SecurityUtils.getUsername());
            deviceRepair.setRepairTime(new Date());
            deviceRepairService.saveDeviceRepair(deviceRepair);
            deviceRepairMapper.insert(deviceRepair);
            return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
        } else if (status.equals("一般缺陷")) {
            return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -61,14 +61,6 @@
    @Override
    public AjaxResult updateDeviceLedger(DeviceLedger deviceLedger) {
        if (ObjectUtils.isNotNull(deviceLedger.getStartRuntimeTime()) && ObjectUtils.isNotNull(deviceLedger.getEndRuntimeTime())){
            //计算运行时长
            long start = deviceLedger.getStartRuntimeTime().toEpochSecond(ZoneOffset.UTC) * 1000;
            long end = deviceLedger.getEndRuntimeTime().toEpochSecond(ZoneOffset.UTC) * 1000;
            long diffMillis = Math.abs(end - start);
            double time = diffMillis / (1000.0 * 60 * 60);// 毫秒 -> 秒 -> 分钟 -> 小时
            deviceLedger.setRuntimeDuration(time+"h");
        }
        if (this.updateById(deviceLedger)) {
            return AjaxResult.success();
        }