From 0781900bd070feada6be1b7f926696691d03ff53 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 23 九月 2025 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 8 --------
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 5 +++--
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index a14b2c6..2394982 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/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;
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index 31c2f0e..420ed9a 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/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();
}
--
Gitblit v1.9.3