From ba59d6cf6b19cebdce7843c0651b226c852a911d Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Fri, 23 Aug 2024 11:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=91=E6=8F=B4APP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SysAnnouncementController.java | 22 +- .../appBase/mapper/SysAnnouncementMapper.java | 5 +- .../service/ISysAnnouncementService.java | 4 +- .../impl/SysAnnouncementServiceImpl.java | 6 +- .../admin/RescueInfoController.java | 52 ++-- .../controller/admin/RescueInfoSystem.java | 16 +- .../rescue/mapper/RescueInfoMapper.java | 2 +- .../rescue/service/IRescueInfoService.java | 2 +- .../service/impl/RescueInfoServiceImpl.java | 243 +++++++++--------- .../mapper/appBase/SysAnnouncementMapper.xml | 37 +++ .../mapper/rescue/RescueInfoMapper.xml | 51 ++-- .../rescue/RescueRefuelRecordMapper.xml | 5 +- 12 files changed, 245 insertions(+), 200 deletions(-) create mode 100644 dl-module-rescue/src/main/resources/mapper/appBase/SysAnnouncementMapper.xml diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java index d3ee7be3..6d8c6633 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java @@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -38,11 +40,11 @@ public class SysAnnouncementController extends BaseController */ @PreAuthorize("@ss.hasPermi('announcement:announcement:list')") @GetMapping("/list") - public TableDataInfo list(SysAnnouncement sysAnnouncement) + public CommonResult list(SysAnnouncement sysAnnouncement) { - startPage(); - List list = sysAnnouncementService.selectSysAnnouncementList(sysAnnouncement); - return getDataTable(list); + Page page = new Page<>(1, 10); + IPage list = sysAnnouncementService.selectSysAnnouncementList(sysAnnouncement, page); + return success(list); } /** @@ -52,7 +54,7 @@ public class SysAnnouncementController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, SysAnnouncement sysAnnouncement) { - List list = sysAnnouncementService.selectSysAnnouncementList(sysAnnouncement); + List list = sysAnnouncementService.list(); ExcelUtil util = new ExcelUtil(SysAnnouncement.class); util.exportExcel(response, list, "系统通知数据"); } @@ -101,15 +103,15 @@ public class SysAnnouncementController extends BaseController * 查询系统通知列表 */ @GetMapping("/getOwnMsg") - public TableDataInfo getOwnMsg() + public CommonResult getOwnMsg() { //当前登录用户 - LoginUser loginUser = getLoginUser(); + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); SysAnnouncement sysAnnouncement =new SysAnnouncement(); sysAnnouncement.setToUserId(loginUser.getId()); - startPage(); - List list = sysAnnouncementService.selectSysAnnouncementList(sysAnnouncement); - return getDataTable(list); + Page page = new Page<>(1, 10); + IPage list = sysAnnouncementService.selectSysAnnouncementList(sysAnnouncement, page); + return success(list); } /** * 查询未读条数 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/mapper/SysAnnouncementMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/mapper/SysAnnouncementMapper.java index 4b92ba14..e8411c47 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/mapper/SysAnnouncementMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/mapper/SysAnnouncementMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.appBase.mapper; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,7 +33,7 @@ public interface SysAnnouncementMapper extends BaseMapper * @param sysAnnouncement 系统通知 * @return 系统通知集合 */ - public List selectSysAnnouncementList(SysAnnouncement sysAnnouncement); + IPage selectSysAnnouncementList(@Param("map") SysAnnouncement sysAnnouncement, Page page); /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/ISysAnnouncementService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/ISysAnnouncementService.java index 13130d38..d1254680 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/ISysAnnouncementService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/ISysAnnouncementService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.appBase.service; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -27,7 +29,7 @@ public interface ISysAnnouncementService extends IService * @param sysAnnouncement 系统通知 * @return 系统通知集合 */ - public List selectSysAnnouncementList(SysAnnouncement sysAnnouncement); + IPage selectSysAnnouncementList(SysAnnouncement sysAnnouncement, Page page); /** * 新增系统通知 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/SysAnnouncementServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/SysAnnouncementServiceImpl.java index 77fa4794..5a73c3ee 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/SysAnnouncementServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/SysAnnouncementServiceImpl.java @@ -10,6 +10,8 @@ import cn.iocoder.yudao.module.appBase.service.ISysAnnouncementService; import cn.iocoder.yudao.module.rescue.app.controller.admin.AnnouncementSocket; import cn.iocoder.yudao.module.rescue.app.controller.admin.UserAnnouncementSocket; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,9 +52,9 @@ public class SysAnnouncementServiceImpl extends ServiceImpl selectSysAnnouncementList(SysAnnouncement sysAnnouncement) + public IPage selectSysAnnouncementList(SysAnnouncement sysAnnouncement, Page page) { - return baseMapper.selectSysAnnouncementList(sysAnnouncement); + return baseMapper.selectSysAnnouncementList(sysAnnouncement, page); } /** 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 b9f09745..33d44722 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 @@ -6,6 +6,8 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; import cn.iocoder.yudao.module.rescue.domain.RescueInfo; +import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto; +import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; import cn.iocoder.yudao.module.rescue.service.IRescueInfoService; import cn.iocoder.yudao.module.system.api.permission.PermissionApi; import cn.iocoder.yudao.module.system.api.permission.RoleApi; @@ -162,23 +164,23 @@ public class RescueInfoController extends BaseController { // List list = rescueInfoService.driverListApp(driverInfoDto); // return getDataTable(list); // } -// /** -// * 查询【请填写功能名称】列表 -// */ -// @GetMapping("/driverInMap") -// public AjaxResult driverInMap(DriverInfoDto driverInfoDto) -// { -// List driverList = rescueInfoService.driverInMap(driverInfoDto); -// return success(driverList); -// } -// /** -// * 查询【请填写功能名称】列表 -// */ -// @GetMapping("/driverInMap2") -// public AjaxResult driverInMap2() -// { -// return success(rescueInfoService.driverInMap2()); -// } + /** + * 查询【请填写功能名称】列表 + */ + @GetMapping("/driverInMap") + public CommonResult driverInMap(DriverInfoDto driverInfoDto) + { + List driverList = rescueInfoService.driverInMap(driverInfoDto); + return success(driverList); + } + /** + * 查询【请填写功能名称】列表 + */ + @GetMapping("/driverInMap2") + public CommonResult driverInMap2() + { + return success(rescueInfoService.driverInMap2()); + } // /** // * 获取扣车订单 // */ @@ -242,12 +244,12 @@ public class RescueInfoController extends BaseController { // List rescueInfos = rescueInfoService.getHcList(rescueInfo); // return getDataTable(rescueInfos); // } -// /** -// * 获取扣车订单 -// */ -// @GetMapping("/statisticsInfo") -// public AjaxResult statisticsInfo(String type) -// { -// return success( rescueInfoService.statisticsInfo(type)); -// } + /** + * 获取扣车订单 + */ + @GetMapping("/statisticsInfo") + public CommonResult statisticsInfo(String type) + { + return success( rescueInfoService.statisticsInfo(type)); + } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java index 419a60c5..a76eddac 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java @@ -315,13 +315,15 @@ public class RescueInfoSystem extends BaseController { * moneyManagement */ @GetMapping("/moneyManagement") - public TableDataInfo moneyManagement(RescueInfo rescueInfo) { - startPage(); - List rescueInfos = rescueInfoService.getRescueInfoByDriver(rescueInfo); - TableDataInfo dataTable = getDataTable(rescueInfos); - List list = rescueInfoService.moneyManagement2(rescueInfos, rescueInfo.getRescueStart()); + public CommonResult moneyManagement(RescueInfo rescueInfo, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNo, pageSize); + IPage rescueInfos = rescueInfoService.getRescueInfoByDriver(rescueInfo, page); + TableDataInfo dataTable = getDataTable(rescueInfos.getRecords()); + List list = rescueInfoService.moneyManagement2(rescueInfos.getRecords(), rescueInfo.getRescueStart()); dataTable.setRows(list); - return dataTable; + return success(dataTable); } /** @@ -333,7 +335,7 @@ public class RescueInfoSystem extends BaseController { return CommonResult.success(res); } - @PostMapping("/exportManagement") + @GetMapping("/exportManagement") public void exportManagement(HttpServletResponse response, RescueInfo rescueInfo) { List list = rescueInfoService.moneyManagement(rescueInfo); JSONObject jsonObject = rescueInfoService.listData(rescueInfo); 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 41469ee1..147b7185 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 @@ -59,7 +59,7 @@ public interface RescueInfoMapper extends BaseMapper void deleteOtherInfo2(@Param("rescueId") Long rescueId); JSONObject getDriverCarNum(@Param("driverId") Long driverId,@Param("carNum") String carNum,@Param("time") String time); - List getRescueInfoByDriver(RescueInfo rescueInfo); + IPage getRescueInfoByDriver(@Param("map") RescueInfo rescueInfo, Page page); List statisticsInfo(@Param("startTime")String startTime,@Param("endTime")String endTime); } 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 bd511097..c076374f 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 @@ -98,7 +98,7 @@ public interface IRescueInfoService extends IService void trajectoryJs(Long rescueId) throws Exception; List moneyManagement(RescueInfo rescueInfo); List moneyManagement2(List rescueInfos,String rescueStart); - List getRescueInfoByDriver(RescueInfo rescueInfo); + IPage getRescueInfoByDriver(RescueInfo rescueInfo, Page page); List statisticsInfo(String type); diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java index f04d15e8..e7c0d584 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java @@ -2,13 +2,19 @@ package cn.iocoder.yudao.module.rescue.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; import cn.iocoder.yudao.module.appBase.service.ISysAnnouncementService; import cn.iocoder.yudao.module.rescue.domain.*; import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto; import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; -import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.rescue.mapper.RescueInfoMapper; +import cn.iocoder.yudao.module.rescue.service.*; +import cn.iocoder.yudao.module.rescue.utils.RedisUtil; +import cn.iocoder.yudao.module.rescue.utils.StringUtils; +import cn.iocoder.yudao.module.rescue.vo.MoneyManagement; import cn.iocoder.yudao.module.staff.service.CompanyStaffService; import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -19,21 +25,15 @@ import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; -import cn.iocoder.yudao.module.rescue.service.*; -import cn.iocoder.yudao.module.rescue.utils.RedisUtil; -import cn.iocoder.yudao.module.rescue.utils.StringUtils; -import cn.iocoder.yudao.module.rescue.vo.MoneyManagement; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -67,7 +67,7 @@ public class RescueInfoServiceImpl extends ServiceImpl rescueInfos = baseMapper.selectRescueInfoList(rescueInfo, page); -// for (RescueInfo info : rescueInfos) { -// String dljy_type = dictDataService.getDictDataLabel("dljy_type", info.getRescueType()); -// info.setRescueTypeStr(dljy_type); -// String rescueStatus = dictDataService.getDictDataLabel("jy_status", info.getRescueStatus()); -// info.setRescueStatusStr(rescueStatus); -// //获取当前司机的经纬度 -// if (ObjectUtils.isNotEmpty(info.getDriverId())) { -// //所在顶级机构 -// -// String driverKey = Redis_Driver_Key + user.getTenantId() + ":" + info.getDriverId(); -// if (redisCache.hasKey(driverKey)) { -// try { -// JSONObject driverInfo = (JSONObject) JSONObject.parse(JSONObject.toJSONString(redisCache.getCacheMap(driverKey))); -// Double longitude = driverInfo.getDouble("longitude"); -// //纬度 -// Double latitude = driverInfo.getDouble("latitude"); -// Long distanceMeter = getDistanceMeter(Double.parseDouble(info.getRescueLongitude()), Double.parseDouble(info.getRescueLatitude()), longitude, latitude); -// info.setDistance(Double.valueOf(distanceMeter * 1.3d).longValue()); -// info.setNeedTime(5 + (distanceMeter / 1000) * 2 + 5); -// } catch (Exception ignored) { -// -// } -// -// } -// } -// -// -// } + for (RescueInfo info : rescueInfos.getRecords()) { + String dljy_type = dictDataService.getDictDataLabel("dljy_type", info.getRescueType()); + info.setRescueTypeStr(dljy_type); + String rescueStatus = dictDataService.getDictDataLabel("jy_status", info.getRescueStatus()); + info.setRescueStatusStr(rescueStatus); + //获取当前司机的经纬度 + if (ObjectUtils.isNotEmpty(info.getDriverId())) { + //所在顶级机构 + + String driverKey = Redis_Driver_Key + user.getTenantId() + ":" + info.getDriverId(); + if (redisCache2.hasKey(driverKey)) { + try { + JSONObject driverInfo = (JSONObject) JSONObject.parse(JSONObject.toJSONString(redisCache2.getCacheMap(driverKey))); + Double longitude = driverInfo.getDouble("longitude"); + //纬度 + Double latitude = driverInfo.getDouble("latitude"); + Long distanceMeter = getDistanceMeter(Double.parseDouble(info.getRescueLongitude()), Double.parseDouble(info.getRescueLatitude()), longitude, latitude); + info.setDistance(Double.valueOf(distanceMeter * 1.3d).longValue()); + info.setNeedTime(5 + (distanceMeter / 1000) * 2 + 5); + } catch (Exception ignored) { + + } + } + } + } return rescueInfos; } @@ -585,8 +582,8 @@ public class RescueInfoServiceImpl extends ServiceImpl cacheMap = redisCache.getCacheMap(redisKey2); + if (redisCache2.hasKey(redisKey2)) { + Map cacheMap = redisCache2.getCacheMap(redisKey2); dto.setDriverLatitude(cacheMap.get("latitude").toString()); dto.setDriverLongitude(cacheMap.get("longitude").toString()); dto.setDriverPositionInfo(cacheMap.get("positionInfo").toString()); @@ -602,16 +599,16 @@ public class RescueInfoServiceImpl extends ServiceImpl driverInMap(DriverInfoDto driverInfoDto) { //当前登录用户 - LoginUser loginUser = getLoginUser(); + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); List dtos = baseMapper.driverListApp(driverInfoDto); //处理其余信息 //获取司机所在经纬度 int i = 1; for (DriverInfo2Dto dto : dtos) { String redisKey2 = Redis_Driver_Key + loginUser.getTenantId() + ":" + dto.getId(); - if (redisCache.hasKey(redisKey2)) { + if (redisCache2.hasKey(redisKey2)) { try { - Map cacheMap = redisCache.getCacheMap(redisKey2); + Map cacheMap = redisCache2.getCacheMap(redisKey2); dto.setDriverLatitude(cacheMap.get("latitude").toString()); dto.setDriverLongitude(cacheMap.get("longitude").toString()); dto.setDriverPositionInfo(cacheMap.get("positionInfo").toString()); @@ -697,7 +694,7 @@ public class RescueInfoServiceImpl extends ServiceImpl cacheMap = redisCache.getCacheMap(redisKey); + Map cacheMap = redisCache2.getCacheMap(redisKey); List cacheList = new ArrayList<>(); cacheMap.forEach((key, value) -> cacheList.add(value)); if (!CollectionUtil.isEmpty(cacheList)) { @@ -715,10 +712,10 @@ public class RescueInfoServiceImpl extends ServiceImpl { boolean flag = true; String driverKey = Redis_Driver_Key + deptId + ":" + it.getString("driverId"); - if (!redisCache.hasKey(driverKey)) { + if (!redisCache2.hasKey(driverKey)) { return false; } - JSONObject driverInfo = (JSONObject) JSONObject.parse(JSONObject.toJSONString(redisCache.getCacheMap(driverKey))); + JSONObject driverInfo = (JSONObject) JSONObject.parse(JSONObject.toJSONString(redisCache2.getCacheMap(driverKey))); //判断司机是否在线且空闲 flag = driverInfo.getInteger("status") == 1; if (finalRejectDriverIds.contains(Long.parseLong(it.getString("driverId")))) { @@ -831,8 +828,9 @@ public class RescueInfoServiceImpl extends ServiceImpl getRescueInfoByDriver(RescueInfo rescueInfo) { - return baseMapper.getRescueInfoByDriver(rescueInfo); + @Override + public IPage getRescueInfoByDriver(RescueInfo rescueInfo, Page page) { + return baseMapper.getRescueInfoByDriver(rescueInfo, page); } public List moneyManagement2(List rescueInfos, String rescueStart) { @@ -912,86 +910,87 @@ public class RescueInfoServiceImpl extends ServiceImpl moneyManagement(RescueInfo rescueInfo) { - List rescueInfos = baseMapper.getRescueInfoByDriver(rescueInfo); - List resList = new ArrayList<>(); - Double rescueTcBig = 0d; - Double rescueTcMid = 0d; - Double rescueTcSmall = 0d; - RescueConfig rescueConfig = rescueConfigService.selectRescueConfigByDeptId(); - if (ObjectUtils.isNotEmpty(rescueConfig)) { - rescueTcBig = Optional.ofNullable(rescueConfig.getRescueTcBig()).orElse(0d); - rescueTcMid = Optional.ofNullable(rescueConfig.getRescueTcMid()).orElse(0d); - rescueTcSmall = Optional.ofNullable(rescueConfig.getRescueTcSmall()).orElse(0d); - } - for (RescueInfo info : rescueInfos) { - MoneyManagement moneyManagement = new MoneyManagement(); - moneyManagement.setDriverName(info.getDriverName()); - Double grossWages = 0d; - Double tempSetMoney = ObjectUtils.isNotEmpty(info.getSetMoney()) ? Double.valueOf(info.getSetMoney()) / 100d : 0d; - Double tempCheckpointMoney = ObjectUtils.isNotEmpty(info.getCheckpointMoney()) ? info.getCheckpointMoney() : 0d; - JSONObject monthRescueRefuelRecord = new JSONObject(); - monthRescueRefuelRecord.put("refuelMoney", 0); - monthRescueRefuelRecord.put("refuelNum", 0); - monthRescueRefuelRecord.put("refuelDistance", 0); - try { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(RescueCarInfo::getRescueCarNum, info.getDriverCarNum()).last("limit 1"); - RescueCarInfo carInfo = carInfoService.getOne(queryWrapper); - monthRescueRefuelRecord = refuelRecordService.getMonthRescueRefuelRecord(info.getDriverId(), DateUtil.format(info.getRescueTime(), "yyyy-MM"), carInfo.getId()); - } catch (Exception ignored) { - } - moneyManagement.setLicenseNum(info.getLicenseNum()); - moneyManagement.setFeeType(info.getFeeType()); - moneyManagement.setRescueTime(info.getRescueTime()); - moneyManagement.setDiverCarNum(info.getDriverCarNum()); - moneyManagement.setSetMoney(tempSetMoney); - moneyManagement.setCheckpointMoney(info.getCheckpointMoney()); - moneyManagement.setUpMoney(tempSetMoney - tempCheckpointMoney); - moneyManagement.setEmptyingDistance(info.getEmptyNum()); - String carType = "3"; - if (StringUtils.isNotEmpty(info.getDriverCarNum())) { - RescueCarInfo carInfo = carInfoService.selectRescueCarInfoByNum(info.getDriverCarNum()); - carType = carInfo.getRescueCarType(); - } - if (carType.equals("1")) { - //大车 - moneyManagement.setRoyaltyRatio(rescueTcBig); - moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcBig); - } else if (carType.equals("2")) { - //中车 - moneyManagement.setRoyaltyRatio(rescueTcMid); - moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcMid); - } else { - //小车 - moneyManagement.setRoyaltyRatio(rescueTcSmall); - moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcSmall); - } - //获取当前车 当前驾驶员 这个月跑了几次 - JSONObject driverInfoObj = baseMapper.getDriverCarNum(info.getDriverId(), info.getDriverCarNum(), rescueInfo.getRescueStart()); - //计算平均燃油费和平均油耗 - Double avgFuelConsumption = 0d; - Double mglYh = 0d; - if (driverInfoObj.getInteger("allNum") != 0) { - avgFuelConsumption = monthRescueRefuelRecord.getDouble("refuelMoney") / driverInfoObj.getInteger("allNum"); - mglYh = monthRescueRefuelRecord.getDouble("refuelNum") / driverInfoObj.getDouble("allDistance"); - } - moneyManagement.setFuelCost(avgFuelConsumption); - moneyManagement.setOilConsumption(mglYh); - Double oilSubsidy = Optional.ofNullable(info.getEmptyNum()).orElse(0d) * mglYh; - moneyManagement.setOilSubsidy(oilSubsidy); - grossWages = grossWages + moneyManagement.getRoyaltyMoney() + oilSubsidy - avgFuelConsumption; - moneyManagement.setGrossWages(grossWages); - resList.add(moneyManagement); - } - - return resList; +// List rescueInfos = baseMapper.getRescueInfoByDriver(rescueInfo); +// List resList = new ArrayList<>(); +// Double rescueTcBig = 0d; +// Double rescueTcMid = 0d; +// Double rescueTcSmall = 0d; +// RescueConfig rescueConfig = rescueConfigService.selectRescueConfigByDeptId(); +// if (ObjectUtils.isNotEmpty(rescueConfig)) { +// rescueTcBig = Optional.ofNullable(rescueConfig.getRescueTcBig()).orElse(0d); +// rescueTcMid = Optional.ofNullable(rescueConfig.getRescueTcMid()).orElse(0d); +// rescueTcSmall = Optional.ofNullable(rescueConfig.getRescueTcSmall()).orElse(0d); +// } +// for (RescueInfo info : rescueInfos) { +// MoneyManagement moneyManagement = new MoneyManagement(); +// moneyManagement.setDriverName(info.getDriverName()); +// Double grossWages = 0d; +// Double tempSetMoney = ObjectUtils.isNotEmpty(info.getSetMoney()) ? Double.valueOf(info.getSetMoney()) / 100d : 0d; +// Double tempCheckpointMoney = ObjectUtils.isNotEmpty(info.getCheckpointMoney()) ? info.getCheckpointMoney() : 0d; +// JSONObject monthRescueRefuelRecord = new JSONObject(); +// monthRescueRefuelRecord.put("refuelMoney", 0); +// monthRescueRefuelRecord.put("refuelNum", 0); +// monthRescueRefuelRecord.put("refuelDistance", 0); +// try { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(RescueCarInfo::getRescueCarNum, info.getDriverCarNum()).last("limit 1"); +// RescueCarInfo carInfo = carInfoService.getOne(queryWrapper); +// monthRescueRefuelRecord = refuelRecordService.getMonthRescueRefuelRecord(info.getDriverId(), DateUtil.format(info.getRescueTime(), "yyyy-MM"), carInfo.getId()); +// } catch (Exception ignored) { +// } +// moneyManagement.setLicenseNum(info.getLicenseNum()); +// moneyManagement.setFeeType(info.getFeeType()); +// moneyManagement.setRescueTime(info.getRescueTime()); +// moneyManagement.setDiverCarNum(info.getDriverCarNum()); +// moneyManagement.setSetMoney(tempSetMoney); +// moneyManagement.setCheckpointMoney(info.getCheckpointMoney()); +// moneyManagement.setUpMoney(tempSetMoney - tempCheckpointMoney); +// moneyManagement.setEmptyingDistance(info.getEmptyNum()); +// String carType = "3"; +// if (StringUtils.isNotEmpty(info.getDriverCarNum())) { +// RescueCarInfo carInfo = carInfoService.selectRescueCarInfoByNum(info.getDriverCarNum()); +// carType = carInfo.getRescueCarType(); +// } +// if (carType.equals("1")) { +// //大车 +// moneyManagement.setRoyaltyRatio(rescueTcBig); +// moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcBig); +// } else if (carType.equals("2")) { +// //中车 +// moneyManagement.setRoyaltyRatio(rescueTcMid); +// moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcMid); +// } else { +// //小车 +// moneyManagement.setRoyaltyRatio(rescueTcSmall); +// moneyManagement.setRoyaltyMoney(tempSetMoney * rescueTcSmall); +// } +// //获取当前车 当前驾驶员 这个月跑了几次 +// JSONObject driverInfoObj = baseMapper.getDriverCarNum(info.getDriverId(), info.getDriverCarNum(), rescueInfo.getRescueStart()); +// //计算平均燃油费和平均油耗 +// Double avgFuelConsumption = 0d; +// Double mglYh = 0d; +// if (driverInfoObj.getInteger("allNum") != 0) { +// avgFuelConsumption = monthRescueRefuelRecord.getDouble("refuelMoney") / driverInfoObj.getInteger("allNum"); +// mglYh = monthRescueRefuelRecord.getDouble("refuelNum") / driverInfoObj.getDouble("allDistance"); +// } +// moneyManagement.setFuelCost(avgFuelConsumption); +// moneyManagement.setOilConsumption(mglYh); +// Double oilSubsidy = Optional.ofNullable(info.getEmptyNum()).orElse(0d) * mglYh; +// moneyManagement.setOilSubsidy(oilSubsidy); +// grossWages = grossWages + moneyManagement.getRoyaltyMoney() + oilSubsidy - avgFuelConsumption; +// moneyManagement.setGrossWages(grossWages); +// resList.add(moneyManagement); +// } +// +// return resList; + return null; } @Override public List statisticsInfo(String type) { //所在顶级机构 String startTime; - String endTime = DateUtil.format(new Date(), "yyyy-MM-dd") + " 24:00:00"; + String endTime = DateUtil.format(new Date(), "yyyy-MM-dd") + " 00:00:00"; if (type.equals("day")) { //日 startTime = DateUtil.format(new Date(), "yyyy-MM-dd") + " 00:00:00"; diff --git a/dl-module-rescue/src/main/resources/mapper/appBase/SysAnnouncementMapper.xml b/dl-module-rescue/src/main/resources/mapper/appBase/SysAnnouncementMapper.xml new file mode 100644 index 00000000..73387de2 --- /dev/null +++ b/dl-module-rescue/src/main/resources/mapper/appBase/SysAnnouncementMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + delete from sys_announcement where id = #{id} + + + + delete from sys_announcement where id in + + #{id} + + + \ No newline at end of file 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 11c84dfc..6c1d9d08 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml @@ -113,7 +113,6 @@ and ri.driver_id is not null and rescue_time like concat(#{rescueStart},'%') - ${params.dataScope} @@ -222,15 +221,15 @@ @@ -321,44 +320,42 @@ left join rescue_order_info roi on roi.rescue_info_id = ri.id where driver_id is not null - and rescue_time between concat(#{rescueStart},' 00:00:00') - and concat(#{rescueEnd},' 23:59:59') + and rescue_time between concat(#{map.rescueStart},' 00:00:00') + and concat(#{map.rescueEnd},' 23:59:59') - - and ri.license_num like concat('%',#{licenseNum},'%') + + and ri.license_num like concat('%',#{map.licenseNum},'%') - - and ri.fee_type = #{feeType} + + and ri.fee_type = #{map.feeType} - + and ri.driver_id is not null - and rescue_time between concat(#{rescueStart},' 00:00:00') - and concat(#{rescueEnd},' 23:59:59') + and rescue_time between concat(#{map.rescueStart},' 00:00:00') + and concat(#{map.rescueEnd},' 23:59:59') - - and ri.driver_name like concat('%',#{driverName},'%') + + and ri.driver_name like concat('%',#{map.driverName},'%') - - and ri.driver_car_num like concat('%',#{driverCarNum},'%') + + and ri.driver_car_num like concat('%',#{map.driverCarNum},'%') - - and rescue_time like concat(#{rescueStartMonth},'%') + + and rescue_time like concat(#{map.rescueStartMonth},'%') - ${params.dataScope} - order by ri.driver_name desc diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml index b284a8de..2e3f4060 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueRefuelRecordMapper.xml @@ -68,16 +68,15 @@ rescue_refuel_record rrr left join rescue_car_info rci on rci.id = rrr.car_id left join driver_info di on di.id = rrr.driver_id - left join sys_user su on di.user_id = su.user_id + left join system_users su on di.user_id = su.id - and su.real_name like concat('%',#{driverName},'%') + and su.nickname like concat('%',#{driverName},'%') and rci.rescue_car_num like concat('%',#{driverCarNum},'%') and rrr.record_time like concat(#{rescueStart},'%') - ${params.dataScope}