diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjMaxDeviceServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjMaxDeviceServiceImpl.java index a0974ce..b09c7cb 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjMaxDeviceServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjMaxDeviceServiceImpl.java @@ -55,6 +55,7 @@ public class SjMaxDeviceServiceImpl implements SjMaxDeviceService{ double workerUtilization = 0; if (totalShouldCount > 0) { workerUtilization = (totalActualCount / totalShouldCount) * 100; + workerUtilization = (double) Math.round(workerUtilization * 10.0) / 10.0; } result.put("workerUtilization", workerUtilization); double totalUsedDay = list.stream() @@ -66,6 +67,7 @@ public class SjMaxDeviceServiceImpl implements SjMaxDeviceService{ double deviceUtilization = 0; if (totalShouldCount > 0) { deviceUtilization = (totalUsedDay / totalEinDay) * 100; + deviceUtilization = (double) Math.round(deviceUtilization * 10.0) / 10.0; } result.put("deviceUtilization", deviceUtilization); //效率分析 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java index ff8f4f4..12014f5 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectSafetyServiceImpl.java @@ -1,7 +1,11 @@ package com.securitycontrol.screen.service.impl; +import com.securitycontrol.common.core.constant.SecurityConstants; +import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.screen.service.SjProjectSafetyService; +import com.securitycontrol.system.api.RemoteFileService; +import com.securitycontrol.system.api.domain.SysFile; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +23,9 @@ public class SjProjectSafetyServiceImpl implements SjProjectSafetyService { @Resource private SjProjectSafetyMapper mapper; + @Resource + private RemoteFileService remoteFileService; + @Override public List selectProSafetyLedger(SjProjectSafety o) { @@ -27,6 +34,11 @@ public class SjProjectSafetyServiceImpl implements SjProjectSafetyService { @Override public List selectProSafetyVideo(SjProjectSafety o) { + List sjProjectSafeties = mapper.selectProSafetyVideo(o); + sjProjectSafeties.forEach(data -> { + Result result= remoteFileService.getFileBast64(data.getImagePath(), SecurityConstants.INNER); + data.setImagePath(result.getData().getUrl()); + }); return mapper.selectProSafetyVideo(o); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjMaxDeviceMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjMaxDeviceMapper.xml index 5f17a92..7cf8f7d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjMaxDeviceMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjMaxDeviceMapper.xml @@ -87,7 +87,7 @@ tp_count.total_people, ROUND( COALESCE(SUM(actual.actual_count), 0) * 100.0 / - ((DATEDIFF(#{startTime} , #{endTime}) + 1) * tp_count.total_people), + ((DATEDIFF(#{endTime} , #{startTime}) + 1) * tp_count.total_people), 2 ) AS utilization_rate -- 百分比形式(如 86.70) FROM sj_work_team wt