From 6e3f274688b2c30792a0144b8bf4fad448946ffc Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Tue, 30 Sep 2025 10:10:33 +0800 Subject: [PATCH] 0930 --- .../admin/RescueInfoController.java | 73 +++ .../admin/DriverInfoController.java | 46 ++ .../rescue/mapper/DriverInfoMapper.java | 40 +- .../rescue/mapper/RescueInfoMapper.java | 16 + .../rescue/service/IDriverInfoService.java | 36 +- .../service/IRescueDriverInfoService.java | 1 + .../rescue/service/IRescueInfoService.java | 7 + .../service/impl/DriverInfoServiceImpl.java | 40 ++ .../impl/RescueDriverInfoServiceImpl.java | 1 + .../service/impl/RescueInfoServiceImpl.java | 173 +++++++- .../mapper/rescue/DriverInfoMapper.xml | 40 ++ .../mapper/rescue/RescueInfoMapper.xml | 414 +++++++++++++++++- 12 files changed, 852 insertions(+), 35 deletions(-) diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java index 40e4bd5d..74902e8e 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java @@ -388,5 +388,78 @@ public class RescueInfoController extends BaseController { return success(rescueInfoService.statisticsAll(statisticsStaffReqVO)); } + @GetMapping("/statisticsAllSecond") + public CommonResult statisticsAllSecond(StatisticsStaffVO statisticsStaffReqVO) { + return success(rescueInfoService.statisticsAllSecond(statisticsStaffReqVO)); + } + + + /** + * App首页数据统计工单列表数据 + */ + @GetMapping("/getRescueStatisticsInfoList") + public CommonResult getRescueStatisticsInfoList(RescueInfo rescueInfo, + @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + //获取当前登录用户 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + AdminUserRespDTO user = userService.getUser(loginUser.getId()); + List roleIds = permissionApi.getRoleIdsByUserId(user.getId()); + List roleList = roleApi.getRoleList(); + List roles = roleList.stream().filter(item -> roleIds.contains(item.getId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(roles)) { + for (RoleReqDTO role : roles) { + //如果是调度中心 + if (role.getCode().equals("admin") || role.getCode().equals("ddzx") || role.getCode().equals("qt") || role.getCode().equals("kj") || role.getCode().equals("cn") || role.getCode().equals("car_safekeeping")) { + IPage rescueInfos = rescueInfoService.selectRescueStatisticsInfoListByAdmin(rescueInfo, page); + return success(rescueInfos); + } + } + } + if (CollectionUtil.isNotEmpty(roles)) { + for (RoleReqDTO role : roles) { + //如果是二级调度 + if (role.getCode().equals("second_dispatcher")) { + rescueInfo.setUserId(user.getId()); + IPage rescueInfos = rescueInfoService.selectRescueStatisticsInfoListBySecondDispatcher(rescueInfo, page); + return success(rescueInfos); + } + } + } + + IPage rescueInfos = rescueInfoService.selectRescueInfoList(rescueInfo, page); + return success(rescueInfos); + } + + @GetMapping("/getRescueStatisticsInfoNum") + public CommonResult getRescueStatisticsInfoNum(RescueInfo rescueInfo) { + //获取当前登录用户 + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + AdminUserRespDTO user = userService.getUser(loginUser.getId()); + List roleIds = permissionApi.getRoleIdsByUserId(user.getId()); + List roleList = roleApi.getRoleList(); + List roles = roleList.stream().filter(item -> roleIds.contains(item.getId())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(roles)) { + for (RoleReqDTO role : roles) { + //如果是调度中心 + if (role.getCode().equals("admin") || role.getCode().equals("ddzx") || role.getCode().equals("qt") || role.getCode().equals("kj") || role.getCode().equals("cn") || role.getCode().equals("car_safekeeping")) { + Map rescueInfoNum = rescueInfoService.getRescueStatisticsInfoNum(rescueInfo); + return success(rescueInfoNum); + } + } + } + if (CollectionUtil.isNotEmpty(roles)) { + for (RoleReqDTO role : roles) { + //如果是二级调度 + if (role.getCode().equals("second_dispatcher")) { + rescueInfo.setUserId(user.getId()); + Map rescueInfoNum = rescueInfoService.getRescueStatisticsInfoNumSecondDispatcher(rescueInfo); + return success(rescueInfoNum); + } + } + } + return success(null); + } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/DriverInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/DriverInfoController.java index 8a0667d4..22c7b4ac 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/DriverInfoController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/DriverInfoController.java @@ -1,11 +1,57 @@ package cn.iocoder.yudao.module.rescue.controller.admin; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; +import cn.iocoder.yudao.module.rescue.domain.DriverInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; +import cn.iocoder.yudao.module.rescue.service.IDriverInfoService; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + @RestController @RequestMapping("/system/DriverInfo") public class DriverInfoController extends BaseController { + @Resource + private IDriverInfoService driverInfoService; + /** + * 获取司机完整列表 + */ + @GetMapping("/listDriverInfo") + public CommonResult listDriverInfo() { + List driverInfoList = driverInfoService.listDriverInfo(); + return success(driverInfoList); + } + + /** + * 获取司机完整列表 + */ + @GetMapping("/listCarInfo") + public CommonResult listCarInfo() { + List carInfoList = driverInfoService.listCarInfo(); + return success(carInfoList); + } + + + /** + * 二级调度获取司机列表 + */ + @GetMapping("/listDriverInfoSecond") + public CommonResult listDriverInfoSecond() { + List driverInfoList = driverInfoService.listDriverInfoSecond(); + return success(driverInfoList); + } + + /** + * 二级调度获取车辆列表 + */ + @GetMapping("/listCarInfoSecond") + public CommonResult listCarInfoSecond() { + List carInfoList = driverInfoService.listCarInfoSecond(); + return success(carInfoList); + } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/DriverInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/DriverInfoMapper.java index 34a4a0cf..4ca3436f 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/DriverInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/DriverInfoMapper.java @@ -3,8 +3,10 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.DriverInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,7 +14,7 @@ import java.util.List; /** * 【请填写功能名称】Mapper接口 - * + * * @author ruoyi * @date 2023-07-18 */ @@ -21,7 +23,7 @@ public interface DriverInfoMapper extends BaseMapper { /** * 查询【请填写功能名称】 - * + * * @param id 【请填写功能名称】主键 * @return 【请填写功能名称】 */ @@ -29,7 +31,7 @@ public interface DriverInfoMapper extends BaseMapper /** * 查询【请填写功能名称】列表 - * + * * @param driverInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ @@ -37,7 +39,7 @@ public interface DriverInfoMapper extends BaseMapper /** * 新增【请填写功能名称】 - * + * * @param driverInfo 【请填写功能名称】 * @return 结果 */ @@ -45,7 +47,7 @@ public interface DriverInfoMapper extends BaseMapper /** * 修改【请填写功能名称】 - * + * * @param driverInfo 【请填写功能名称】 * @return 结果 */ @@ -53,7 +55,7 @@ public interface DriverInfoMapper extends BaseMapper /** * 删除【请填写功能名称】 - * + * * @param id 【请填写功能名称】主键 * @return 结果 */ @@ -61,9 +63,33 @@ public interface DriverInfoMapper extends BaseMapper /** * 批量删除【请填写功能名称】 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteDriverInfoByIds(Long[] ids); + + /** + * 获取司机列表 + * @return + */ + List listDriverInfo(); + + /** + * 获取车辆列表 + * @return + */ + List listCarInfo(); + + /** + * 二级调度获取司机 + * @return + */ + List listDriverInfoSecond(@Param("userId") Long userId); + + /** + * 二级调度获取车辆 + * @return + */ + List listCarInfoSecond(@Param("userId") Long userId); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java index 211e01f9..f9ae0626 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java @@ -110,4 +110,20 @@ public interface RescueInfoMapper extends BaseMapper List driverStatistics(@Param("vo") StatisticsStaffVO statisticsStaffReqVO); List carStatistics(@Param("vo") StatisticsStaffVO statisticsStaffReqVO); List dispatchStatistics(@Param("vo") StatisticsStaffVO statisticsStaffReqVO); + + + IPage selectRescueStatisticsInfoList(@Param("map") RescueInfo rescueInfo, Page page); + IPage selectRescueStatisticsInfoListSecondDispatcher(@Param("map") RescueInfo rescueInfo, Page page); + + /** + * 数据统计中使用 + * @param rescueInfo + * @return + */ + Map getRescueStatisticsInfoNum(@Param("map") RescueInfo rescueInfo); + Map getRescueStatisticsInfoNumSecondDispatcher(@Param("map") RescueInfo rescueInfo); + + + List driverStatisticsSecond(@Param("vo") StatisticsStaffVO statisticsStaffReqVO); + List carStatisticsSecond(@Param("vo") StatisticsStaffVO statisticsStaffReqVO); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IDriverInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IDriverInfoService.java index a9a36432..b274c45b 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IDriverInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IDriverInfoService.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.DriverInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** * 【请填写功能名称】Service接口 - * + * * @author ruoyi * @date 2023-07-18 */ @@ -15,7 +16,7 @@ public interface IDriverInfoService extends IService { /** * 查询【请填写功能名称】 - * + * * @param id 【请填写功能名称】主键 * @return 【请填写功能名称】 */ @@ -23,7 +24,7 @@ public interface IDriverInfoService extends IService /** * 查询【请填写功能名称】列表 - * + * * @param driverInfo 【请填写功能名称】 * @return 【请填写功能名称】集合 */ @@ -31,7 +32,7 @@ public interface IDriverInfoService extends IService /** * 新增【请填写功能名称】 - * + * * @param driverInfo 【请填写功能名称】 * @return 结果 */ @@ -39,7 +40,7 @@ public interface IDriverInfoService extends IService /** * 修改【请填写功能名称】 - * + * * @param driverInfo 【请填写功能名称】 * @return 结果 */ @@ -47,7 +48,7 @@ public interface IDriverInfoService extends IService /** * 批量删除【请填写功能名称】 - * + * * @param ids 需要删除的【请填写功能名称】主键集合 * @return 结果 */ @@ -55,7 +56,7 @@ public interface IDriverInfoService extends IService /** * 删除【请填写功能名称】信息 - * + * * @param id 【请填写功能名称】主键 * @return 结果 */ @@ -69,4 +70,25 @@ public interface IDriverInfoService extends IService **/ void syncData(); + + /** + * 获取司机完整列表 + */ + List listDriverInfo(); + + /** + * 获取救援车辆完整列表 + */ + List listCarInfo(); + + /** + * 二级调度获取司机列表 + */ + List listDriverInfoSecond(); + + + /** + * 二级调度获取车辆列表 + */ + List listCarInfoSecond(); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverInfoService.java index cdb6184c..89846295 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverInfoService.java @@ -62,4 +62,5 @@ public interface IRescueDriverInfoService extends IService * 根据救援工单id获取指派司机列表 */ List listDispatchDriverByRescueId(Long rescueId); + } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java index 77501b3c..35998650 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java @@ -197,4 +197,11 @@ public interface IRescueInfoService extends IService Long safeStringToLong(String str, Long defaultValue); List statisticsAll(StatisticsStaffVO statisticsStaffReqVO); + List statisticsAllSecond(StatisticsStaffVO statisticsStaffReqVO); + + IPage selectRescueStatisticsInfoListByAdmin(RescueInfo rescueInfo, Page page); + IPage selectRescueStatisticsInfoListBySecondDispatcher(RescueInfo rescueInfo, Page page); + + Map getRescueStatisticsInfoNum(RescueInfo rescueInfo); + Map getRescueStatisticsInfoNumSecondDispatcher(RescueInfo rescueInfo); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java index 73163266..1d7f1dbe 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java @@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.rescue.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.common.CommonErrorCodeConstants; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.rescue.domain.DriverInfo; +import cn.iocoder.yudao.module.rescue.domain.RescueCarInfo; import cn.iocoder.yudao.module.rescue.service.IDriverInfoService; import cn.iocoder.yudao.module.staff.entity.CompanyStaff; import cn.iocoder.yudao.module.staff.service.CompanyStaffService; @@ -23,6 +25,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -186,4 +189,41 @@ public class DriverInfoServiceImpl extends ServiceImpl listDriverInfo() { + return baseMapper.listDriverInfo(); + } + + /** + * 获取车辆完整列表 + */ + @Override + public List listCarInfo() { + return baseMapper.listCarInfo(); + } + + /** + * 二级调度获取司机 + * @return + */ + @Override + public List listDriverInfoSecond() { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + return baseMapper.listDriverInfoSecond(userId); + } + + /** + * 二级调度获取车辆 + * @return + */ + @Override + public List listCarInfoSecond() { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + return baseMapper.listCarInfoSecond(userId); + } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java index 7a0e5c30..bc67d1ea 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java @@ -1004,4 +1004,5 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl statisticsAllSecond(StatisticsStaffVO statisticsStaffReqVO) { + List statisticsStaffVOS = new ArrayList<>(); + + if (statisticsStaffReqVO == null || statisticsStaffReqVO.getQueryType() == null) { + return statisticsStaffVOS; + } + Long userId = SecurityFrameworkUtils.getLoginUserId(); + statisticsStaffReqVO.setSecondUserId(userId); + String queryType = statisticsStaffReqVO.getQueryType(); + switch (queryType) { + case "driver": + statisticsStaffVOS.addAll(this.driverStatisticsSecond(statisticsStaffReqVO)); + break; + case "car": + statisticsStaffVOS.addAll(this.carStatisticsSecond(statisticsStaffReqVO)); + break; + default: + break; + } + + return statisticsStaffVOS; + } + + @Override + public IPage selectRescueStatisticsInfoListByAdmin(RescueInfo rescueInfo, Page page) { + LoginUser user = getLoginUser(); + AdminUserRespDTO adminUser = userService.getUser(user.getId()); + + rescueInfo.setDeptList(buildDeptList(adminUser.getDeptId())); + String startTime = ""; + String endTime = ""; + if ("more".equals(rescueInfo.getTimeType())) { + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getStartTimeStr())) { + startTime = rescueInfo.getStartTimeStr() + " 00:00:01"; + } + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getEndTimeStr())) { + endTime = rescueInfo.getEndTimeStr() + " 23:59:59"; + } + } else if ("month".equals(rescueInfo.getTimeType())) { + //当月 + startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01"; + endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59"; + } else if ("day".equals(rescueInfo.getTimeType())) { + //当天 + startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:01"; + endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59"; + } + rescueInfo.setStartTimeStr(startTime); + rescueInfo.setEndTimeStr(endTime); + IPage rescueInfos = baseMapper.selectRescueStatisticsInfoList(rescueInfo, page); + + processRescueInfoRecords(rescueInfos, user, false); + return rescueInfos; + } + + @Override + public IPage selectRescueStatisticsInfoListBySecondDispatcher(RescueInfo rescueInfo, Page page) { + LoginUser user = getLoginUser(); + AdminUserRespDTO adminUser = userService.getUser(user.getId()); + rescueInfo.setUserId(adminUser.getId()); + + rescueInfo.setDeptList(buildDeptList(adminUser.getDeptId())); + String startTime = ""; + String endTime = ""; + if ("more".equals(rescueInfo.getTimeType())) { + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getStartTimeStr())) { + startTime = rescueInfo.getStartTimeStr() + " 00:00:01"; + } + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getEndTimeStr())) { + endTime = rescueInfo.getEndTimeStr() + " 23:59:59"; + } + } else if ("month".equals(rescueInfo.getTimeType())) { + //当月 + startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01"; + endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59"; + } else if ("day".equals(rescueInfo.getTimeType())) { + //当天 + startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:01"; + endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59"; + } + rescueInfo.setStartTimeStr(startTime); + rescueInfo.setEndTimeStr(endTime); + IPage rescueInfos = baseMapper.selectRescueStatisticsInfoListSecondDispatcher(rescueInfo, page); + + processRescueInfoRecords(rescueInfos, user, false); + return rescueInfos; + } + public List driverStatistics(StatisticsStaffVO statisticsStaffReqVO) { return baseMapper.driverStatistics(statisticsStaffReqVO); } @@ -2819,4 +2915,79 @@ public class RescueInfoServiceImpl extends ServiceImpl getRescueStatisticsInfoNum(RescueInfo rescueInfo) { + LoginUser user = getLoginUser(); + AdminUserRespDTO adminUser = userService.getUser(user.getId()); + List childDeptList = deptService.getChildDeptList(adminUser.getDeptId()); + List deptList = childDeptList.stream().map(DeptRespDTO::getId).collect(Collectors.toList()); + deptList.add(adminUser.getDeptId()); + rescueInfo.setDeptList(deptList); + String startTime = ""; + String endTime = ""; + if ("more".equals(rescueInfo.getTimeType())) { + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getStartTimeStr())) { + startTime = rescueInfo.getStartTimeStr() + " 00:00:01"; + } + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getEndTimeStr())) { + endTime = rescueInfo.getEndTimeStr() + " 23:59:59"; + } + } else if ("month".equals(rescueInfo.getTimeType())) { + //当月 + startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01"; + endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59"; + } else if ("day".equals(rescueInfo.getTimeType())) { + //当天 + startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:01"; + endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59"; + } + rescueInfo.setStartTimeStr(startTime); + rescueInfo.setEndTimeStr(endTime); + Map res = baseMapper.getRescueStatisticsInfoNum(rescueInfo); + return res; + } + + @Override + public Map getRescueStatisticsInfoNumSecondDispatcher(RescueInfo rescueInfo) { + LoginUser user = getLoginUser(); + AdminUserRespDTO adminUser = userService.getUser(user.getId()); + List childDeptList = deptService.getChildDeptList(adminUser.getDeptId()); + List deptList = childDeptList.stream().map(DeptRespDTO::getId).collect(Collectors.toList()); + deptList.add(adminUser.getDeptId()); + rescueInfo.setDeptList(deptList); + rescueInfo.setUserId(adminUser.getId()); + String startTime = ""; + String endTime = ""; + if ("more".equals(rescueInfo.getTimeType())) { + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getStartTimeStr())) { + startTime = rescueInfo.getStartTimeStr() + " 00:00:01"; + } + if (org.apache.commons.lang3.StringUtils.isNotEmpty(rescueInfo.getEndTimeStr())) { + endTime = rescueInfo.getEndTimeStr() + " 23:59:59"; + } + } else if ("month".equals(rescueInfo.getTimeType())) { + //当月 + startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01"; + endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59"; + } else if ("day".equals(rescueInfo.getTimeType())) { + //当天 + startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:01"; + endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59"; + } + rescueInfo.setStartTimeStr(startTime); + rescueInfo.setEndTimeStr(endTime); + Map res = baseMapper.getRescueStatisticsInfoNumSecondDispatcher(rescueInfo); + return res; + } + + + public List driverStatisticsSecond(StatisticsStaffVO statisticsStaffReqVO) { + return baseMapper.driverStatisticsSecond(statisticsStaffReqVO); + } + + public List carStatisticsSecond(StatisticsStaffVO statisticsStaffReqVO) { + return baseMapper.carStatisticsSecond(statisticsStaffReqVO); + } } diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/DriverInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/DriverInfoMapper.xml index 86dd6d40..dac4a42a 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/DriverInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/DriverInfoMapper.xml @@ -96,4 +96,44 @@ #{id} + + + + + + + + diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml index 181d16b5..e5cdad88 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml @@ -742,6 +742,8 @@ di.create_time DESC; + + @@ -1103,4 +1120,361 @@ createRescueNum DESC; + + + + + + + + + + + + + +