From f689436364fb5403c23d083d0bebe866aa614899 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 21 Dec 2023 13:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/DateTimeHelper.java | 16 +++++++++++-- .../controller/LargeScreenController.java | 5 ++++ .../domain/MaintenanceWarningVo.java | 23 +++++++++++++++++++ .../largeScreen/mapper/LargeScreenMapper.java | 9 ++++++++ .../service/ILargeScreenService.java | 8 +++++++ .../service/impl/LargeScreenServiceImpl.java | 16 ++++++++++++- .../mapper/largeScreen/LargeScreenMapper.xml | 15 ++++++++++++ 7 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java index f956153b..3c0d1165 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/DateTimeHelper.java @@ -645,6 +645,16 @@ public class DateTimeHelper { return sdf.format(afterDate); } + public static String getTimeAfterThirtyDay() { + SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //制定日期格式 + Calendar c=Calendar.getInstance(); + Date date=new Date(); + c.setTime(date); + c.add(Calendar.MONTH,1); //将当前日期加一个月 + String validityDate=df.format(c.getTime()); //返回String型的时间 + return validityDate; + } + /** * 获取时间戳 */ @@ -741,8 +751,10 @@ public class DateTimeHelper { } public static void main(String[] args) { - System.err.println(getFisrtDayOfMonth(2023,11)); - System.err.println(getLastDayOfMonth(2023,11)); +// System.err.println(getFisrtDayOfMonth(2023,11)); +// System.err.println(getLastDayOfMonth(2023,11)); + System.err.println(getTimeAfterThirtyDay()); + System.err.println(getNowTime()); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java index 2f242d6f..049b5909 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java @@ -83,4 +83,9 @@ public class LargeScreenController extends BaseController { return service.getCarUseByMonth(); } + @Log(title = "检修预警", businessType = BusinessType.QUERY) + @PostMapping("getMaintenanceWarning") + public AjaxResult getMaintenanceWarning() { + return service.getMaintenanceWarning(); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java new file mode 100644 index 00000000..fc02c14e --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/MaintenanceWarningVo.java @@ -0,0 +1,23 @@ +package com.bonus.sgzb.largeScreen.domain; + +import lombok.Data; + +/** + * @author 10488 + * 检修预警-vo + */ +@Data +public class MaintenanceWarningVo { + + /** 机具名称*/ + private String machineName; + + /** 机具编号*/ + private String maCode; + + /** 规格型号*/ + private String typeName; + + /** 下次检修日期*/ + private String nextCheckTime; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java index c3e9dd29..c387cbee 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java @@ -92,4 +92,13 @@ public interface LargeScreenMapper { * @date 2023/12/15 18:57 */ List getTotalOwnership(ParamsDto dto); + + /** + * @param dto + * @return List + * @description 检修预警 + * @author cwchen + * @date 2023/12/21 9:53 + */ + List getMaintenanceWarning(ParamsDto dto); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java index aed55273..a52493e9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/ILargeScreenService.java @@ -88,4 +88,12 @@ public interface ILargeScreenService { * @date 2023/12/13 15:40 */ AjaxResult getCarUseByMonth(); + + /** + * @return AjaxResult + * @description 检修预警 + * @author cwchen + * @date 2023/12/21 9:42 + */ + AjaxResult getMaintenanceWarning(); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 229df537..d836756c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -103,7 +103,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { * @author cwchen * @date 2023/12/15 19:33 */ - public TotalOwnershipVo countNum(String maType,String maTypeName) { + public TotalOwnershipVo countNum(String maType, String maTypeName) { TotalOwnershipVo vo = new TotalOwnershipVo(); ParamsDto dto = new ParamsDto(); dto.setMaType(maType); @@ -317,6 +317,20 @@ public class LargeScreenServiceImpl implements ILargeScreenService { list.add(carUseVo6); return AjaxResult.success(list); } + + @Override + public AjaxResult getMaintenanceWarning() { + List list = new ArrayList<>(); + try { + ParamsDto dto = new ParamsDto(); + dto.setStartDate(DateTimeHelper.getNowTime()); + dto.setEndDate(DateTimeHelper.getTimeAfterThirtyDay()); + list = mapper.getMaintenanceWarning(dto); + } catch (Exception e) { + log.error("检修预警-查询失败",e); + } + return AjaxResult.success(list); + } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index f459a440..aa12ab69 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -347,4 +347,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file