From 3b25a2654099f1170d06e42b19b649ab7e1f7b61 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 15 Dec 2025 15:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=9E=84=E5=BB=BAsocket=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency/api/service/EmergencyOrderApiService.java | 3 ++- .../api/service/impl/EmergencyOrderApiServiceImpl.java | 7 ++++++- .../emergency/controller/TblHelpCenterController.java | 8 ++++++-- .../renkang/emergency/service/ITbHelpCenterService.java | 3 ++- .../emergency/service/impl/TblHelpCenterServiceImpl.java | 5 +++-- .../watch/service/impl/WatchMonitorDataServiceImpl.java | 2 ++ 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java index 362fa6e..c84b788 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/EmergencyOrderApiService.java @@ -15,6 +15,7 @@ import com.renkang.emergency.entity.OrderSendRecord; import com.renkang.emergency.entity.TblHelpCentorVo; import com.renkang.emergency.entity.vo.GroupMemberVO; +import java.util.Date; import java.util.List; /** @@ -70,7 +71,7 @@ public interface EmergencyOrderApiService { Order getOrderById(String id); - List getSicknessTypeStatistic(String sex, String depart,String centerId); + List getSicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate,String centerId); List getGroupMemberList(String sessionId); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java index f087d0c..3ebe544 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyOrderApiServiceImpl.java @@ -1,5 +1,7 @@ package com.renkang.emergency.api.service.impl; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -551,7 +553,7 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { } @Override - public List getSicknessTypeStatistic(String sex, String depart,String centerId) { + public List getSicknessTypeStatistic(String sex, String depart,Date startDate, Date endDate, String centerId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (StrUtil.isNotBlank(sex) && !"0".equals(sex)) { queryWrapper.eq(Order::getSalvageUserSex, sex); @@ -562,6 +564,9 @@ public class EmergencyOrderApiServiceImpl implements EmergencyOrderApiService { if (StrUtil.isNotBlank(centerId)) { queryWrapper.eq(Order::getCenterId, centerId); } + if (startDate != null && endDate != null) { + queryWrapper.between(Order::getCreateTime, DateUtil.beginOfDay(startDate), DateUtil.endOfDay(endDate).offset(DateField.MILLISECOND, -999)); + } queryWrapper.eq(Order::getDelFlag, CommonConstant.DEL_FLAG_0); List orders = orderMapper.selectList(queryWrapper); // 统计 diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/TblHelpCenterController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/TblHelpCenterController.java index 85d2e90..f301a09 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/TblHelpCenterController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/controller/TblHelpCenterController.java @@ -5,12 +5,14 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.jeecg.common.api.vo.Result; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Date; /** * @author TianZi @@ -28,8 +30,10 @@ public class TblHelpCenterController { @Operation(summary = "主诉分类统计", description = "主诉分类统计") public Result sicknessTypeStatistic(@Parameter(description = "0:全部 1:女，2:男") @RequestParam(required = false) String sex, @Parameter(description = "部门id") @RequestParam(required = false) String depart, - @Parameter(description = "应急中心id",required = false) String centerId) { - return Result.OK(tbHelpCenterService.sicknessTypeStatistic(sex,depart,centerId)); + @Parameter(description = "开始时间") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, + @Parameter(description = "结束时间") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, + @Parameter(description = "应急中心id") @RequestParam(required = false) String centerId) { + return Result.OK(tbHelpCenterService.sicknessTypeStatistic(sex,depart,startDate,endDate,centerId)); } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/ITbHelpCenterService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/ITbHelpCenterService.java index 2bd06f7..aa66544 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/ITbHelpCenterService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/ITbHelpCenterService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.renkang.emergency.entity.TblHelpCenter; import com.renkang.emergency.entity.TblHelpCentorVo; +import java.util.Date; import java.util.List; /** @@ -18,6 +19,6 @@ public interface ITbHelpCenterService extends IService { * @param depart * @return */ - List sicknessTypeStatistic(String sex,String depart,String centerId); + List sicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate, String centerId); } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java index d73768d..1e67610 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblHelpCenterServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -43,8 +44,8 @@ public class TblHelpCenterServiceImpl extends ServiceImpl sicknessTypeStatistic(String sex, String depart,String centerId) { - List statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart,centerId); + public List sicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate, String centerId) { + List statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart, startDate, endDate, centerId); for (TblHelpCentorVo tblHelpCentorVo : statistic) { if (tblHelpCentorVo.getType().equals("0")) { tblHelpCentorVo.setName("120"); diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java index cf4b6d6..e0ef558 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java @@ -288,6 +288,8 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl ObjUtil.isNotEmpty(value) && value != 0)) { Gps gps = GPS84ToGCJ02(data.getLon(), data.getLat()); if (null != gps) { + monitorDataEntity.setLon(gps.getLongitude()); + monitorDataEntity.setLat(gps.getLatitude()); monitorDataEntity.setLonGd(BigDecimal.valueOf(gps.getLongitude())); monitorDataEntity.setLatGd(BigDecimal.valueOf(gps.getLatitude())); //获取高德地址信息