修改一键告警构建socket坐标
This commit is contained in:
wanghao
+2
-1
@@ -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<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart,String centerId);
|
||||
List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate,String centerId);
|
||||
|
||||
List<GroupMemberVO> getGroupMemberList(String sessionId);
|
||||
|
||||
|
||||
+6
-1
@@ -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<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart,String centerId) {
|
||||
public List<TblHelpCentorVo> getSicknessTypeStatistic(String sex, String depart,Date startDate, Date endDate, String centerId) {
|
||||
LambdaQueryWrapper<Order> 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<Order> orders = orderMapper.selectList(queryWrapper);
|
||||
// 统计
|
||||
|
||||
+6
-2
@@ -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));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-1
@@ -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<TblHelpCenter> {
|
||||
* @param depart
|
||||
* @return
|
||||
*/
|
||||
List<TblHelpCentorVo> sicknessTypeStatistic(String sex,String depart,String centerId);
|
||||
List<TblHelpCentorVo> sicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate, String centerId);
|
||||
|
||||
}
|
||||
|
||||
+3
-2
@@ -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<TblHelpCenterMapper, T
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<TblHelpCentorVo> sicknessTypeStatistic(String sex, String depart,String centerId) {
|
||||
List<TblHelpCentorVo> statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart,centerId);
|
||||
public List<TblHelpCentorVo> sicknessTypeStatistic(String sex, String depart, Date startDate, Date endDate, String centerId) {
|
||||
List<TblHelpCentorVo> statistic = emergencyOrderApiService.getSicknessTypeStatistic(sex, depart, startDate, endDate, centerId);
|
||||
for (TblHelpCentorVo tblHelpCentorVo : statistic) {
|
||||
if (tblHelpCentorVo.getType().equals("0")) {
|
||||
tblHelpCentorVo.setName("120");
|
||||
|
||||
+2
@@ -288,6 +288,8 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
|
||||
if (Stream.of(data.getLon(), data.getLat()).allMatch(value -> 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()));
|
||||
//获取高德地址信息
|
||||
|
||||
Reference in New Issue
Block a user