From a1bcb34b8cbbefbebb2fb806273cc332643bbd5a Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Wed, 7 Jun 2023 16:37:04 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E5=A4=A7=E5=B1=8F=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/pojo/vo/OldTimeVO.java | 37 +++++++++++++++++++ .../pq/controller/LargeScreenController.java | 13 +++++++ .../device/pq/mapper/LargeScreenMapper.java | 3 ++ .../pq/mapper/mapping/LargeScreenMapper.xml | 5 +++ .../device/pq/service/LargeScreenService.java | 3 ++ .../service/impl/LargeScreenServiceImpl.java | 28 ++++++++++++++ 6 files changed, 89 insertions(+) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OldTimeVO.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OldTimeVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OldTimeVO.java new file mode 100644 index 000000000..f03864f31 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/OldTimeVO.java @@ -0,0 +1,37 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/06/07 + */ +@Data +public class OldTimeVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 最老的时间 + */ + @ApiModelProperty("最老的时间") + private LocalDateTime oldDate; + + /** + * 天数 + */ + @ApiModelProperty("天数") + private Long days; + + /** + * 最老的时间new + */ + @ApiModelProperty("最老的时间new") + private String oldDateNew; + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java index ab9de1877..d52439956 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.pojo.param.LargeScreenParam; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; +import com.njcn.device.pq.pojo.vo.OldTimeVO; import com.njcn.device.pq.service.LargeScreenService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -59,4 +60,16 @@ public class LargeScreenController extends BaseController { MonitoringPointScaleVO result = largeScreenService.getLoadType(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + /** + * 运行时间 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getRunTime") + @ApiOperation("运行时间") + public HttpResult getRunTime() { + String methodDescribe = getMethodDescribe("getRunTime"); + OldTimeVO result = largeScreenService.getRunTime(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java index 1f8a32531..f0a174b25 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.mapper; +import com.njcn.device.pq.pojo.vo.OldTimeVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +14,6 @@ import java.util.Map; public interface LargeScreenMapper { Map getMonitorAddCount(@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + + OldTimeVO getRunTime(); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml index e5f58e057..07fb0e988 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml @@ -19,4 +19,9 @@ and date_format(pl.Create_Time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java index 16d3b7935..3ef64e770 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service; import com.njcn.device.pq.pojo.param.LargeScreenParam; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; +import com.njcn.device.pq.pojo.vo.OldTimeVO; /** @@ -14,4 +15,6 @@ public interface LargeScreenService { MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam); MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam); + + OldTimeVO getRunTime(); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java index 6d26219a5..979a078d6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java @@ -7,6 +7,7 @@ import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.LargeScreenParam; import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; +import com.njcn.device.pq.pojo.vo.OldTimeVO; import com.njcn.device.pq.service.LargeScreenService; import com.njcn.system.pojo.enums.StatisticsEnum; @@ -15,6 +16,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -104,4 +110,26 @@ public class LargeScreenServiceImpl implements LargeScreenService { return result; } + /** + * 运行时间 + */ + @Override + public OldTimeVO getRunTime() { + + OldTimeVO oldTimeVO = largeScreenMapper.getRunTime(); + LocalDateTime date2 = LocalDateTime.now(); + + Instant instant1 = oldTimeVO.getOldDate().atZone(ZoneId.systemDefault()).toInstant(); + Instant instant2 = date2.atZone(ZoneId.systemDefault()).toInstant(); + + long days = Duration.between(instant1, instant2).toDays(); + oldTimeVO.setDays(days); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String formattedDateTime = oldTimeVO.getOldDate().format(formatter); + oldTimeVO.setOldDateNew(formattedDateTime); + + return oldTimeVO; + } + }