From a868c7b5cb0ccd3d3b3e3dcfb71ec8eb093e77c0 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Fri, 28 Nov 2025 17:49:24 +0800 Subject: [PATCH] =?UTF-8?q?gps=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E7=BB=91=E5=AE=9A=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=97=B6=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GpsEquipmentController.java | 10 ++++++++ .../gps/mapper/GpsEquipmentMapper.java | 9 ++++++-- .../gps/mapper/GpsEquipmentSonMapper.java | 23 +++++++++++++++++++ .../gps/service/IGpsEquipmentService.java | 9 ++++++++ .../gps/service/IGpsEquipmentSonService.java | 8 +++++++ .../service/impl/GpsEquipmentServiceImpl.java | 20 +++++++++++++++- .../impl/GpsEquipmentSonServiceImpl.java | 20 ++++++++++++++++ 7 files changed, 96 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java index 3447d4b0..0168715d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java @@ -1,5 +1,6 @@ package org.dromara.gps.controller; +import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ import org.dromara.contractor.domain.dto.constructionuser.SubConstructionUserQue import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo; import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo; import org.dromara.contractor.service.ISubConstructionUserService; +import org.dromara.gps.domain.bo.GpsEquipmentSonBo; import org.dromara.gps.domain.vo.*; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.SysUser; @@ -222,4 +224,12 @@ public class GpsEquipmentController extends BaseController { @PathVariable Long[] ids) { return toAjax(gpsEquipmentService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 查询GPS人员或设备定位日期信息列表 + */ + @GetMapping("/getDateList") + public R> getRlList(GpsEquipmentSonBo bo) { + return R.ok(gpsEquipmentService.getRlList(bo)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java index e1f2a8a3..a5af589b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentMapper.java @@ -19,13 +19,18 @@ public interface GpsEquipmentMapper extends BaseMapperPlus getUeClientList(@Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now); + @Select("") + List getUserOrClientDate(@Param("bo") GpsEquipmentSonBo bo); @Select("WITH RankedData AS (\n" + " SELECT\n" + " *,\n" + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java index 9d832426..bb8023fa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentService.java @@ -1,5 +1,6 @@ package org.dromara.gps.service; +import org.dromara.gps.domain.bo.GpsEquipmentSonBo; import org.dromara.gps.domain.vo.GpsEquipmentSonVo; import org.dromara.gps.domain.vo.GpsEquipmentVo; import org.dromara.gps.domain.bo.GpsEquipmentBo; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.gps.domain.vo.GpsProjectVo; import org.dromara.gps.domain.vo.GpsUserVo; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; @@ -108,4 +110,11 @@ public interface IGpsEquipmentService extends IService{ List getUeUserListByProjectId(LocalDateTime startOfDay, LocalDateTime now); List getListToVehicle(GpsEquipmentBo bo); + + /** + * 查询GPS人员或设备定位日期信息列表 + * @param bo + * @return + */ + List getRlList(GpsEquipmentSonBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java index f7dc357c..8d6dd596 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/IGpsEquipmentSonService.java @@ -9,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.gps.domain.vo.GpsStatusVo; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; @@ -88,4 +89,11 @@ public interface IGpsEquipmentSonService extends IService{ List getVehicleList(GpsEquipmentSonBo bo); List getNewVehicleList(GpsEquipmentSonBo bo); + + /** + * 查询GPS人员或设备定位日期信息列表 + * @param bo + * @return + */ + List getUserOrClientDate(GpsEquipmentSonBo bo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java index 0601fd4d..69ed9ccd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java @@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.Duration; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -118,7 +119,13 @@ public class GpsEquipmentServiceImpl extends ServiceImpl getRlList(GpsEquipmentSonBo bo) { + return gpsEquipmentSonService.getUserOrClientDate(bo); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java index 282a1462..3bd39100 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentSonServiceImpl.java @@ -26,6 +26,7 @@ import org.dromara.gps.domain.GpsEquipmentSon; import org.dromara.gps.mapper.GpsEquipmentSonMapper; import org.dromara.gps.service.IGpsEquipmentSonService; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -247,4 +248,23 @@ public class GpsEquipmentSonServiceImpl extends ServiceImpl getUserOrClientDate(GpsEquipmentSonBo bo) { + if (bo.getProjectId() == null) { + throw new ServiceException("项目id不能为空！"); + } + if (bo.getClientId() == null && bo.getUserId() == null) { + throw new ServiceException("设备id或用户id不能为空！"); + } + if (bo.getStartTime() == null || bo.getEndTime() == null) { + throw new ServiceException("开始时间和结算时间不能为空！！！"); + } + return baseMapper.getUserOrClientDate(bo); + } }