renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正今日应急的应急数据

Browse Source
This commit is contained in:
wanghao
2025-09-25 16:27:43 +08:00
parent ff6e83f1c8
commit 9d68bcd2ff
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+15 -14
View File
@@ -25,6 +25,7 @@ import com.renkang.emergency.largeScreen.entity.vo.HealthArchivesVO;
import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO; import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO;
import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper;
import com.renkang.emergency.largeScreen.service.ILargeScreenDataService; import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
import com.renkang.emergency.mapper.OrderMapper;
import com.renkang.emergency.mapper.TblUserHelpMapper; import com.renkang.emergency.mapper.TblUserHelpMapper;
import com.renkang.emergency.service.IResourceService; import com.renkang.emergency.service.IResourceService;
import com.renkang.emergency.service.ITbQimoNoticeService; import com.renkang.emergency.service.ITbQimoNoticeService;
@@ -66,6 +67,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
private final IXjAedService xjAedService; private final IXjAedService xjAedService;
private final ITbQimoNoticeService noticeService; private final ITbQimoNoticeService noticeService;
private final TblUserHelpMapper userHelpMapper; private final TblUserHelpMapper userHelpMapper;
private final OrderMapper orderMapper;
private final WatchApi watchApi; private final WatchApi watchApi;
private final ISysBaseAPI sysBaseAPI; private final ISysBaseAPI sysBaseAPI;
private final ISysCache sysCache; private final ISysCache sysCache;
@@ -740,27 +742,26 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
* @param list 列表 * @param list 列表
*/ */
private void emergencyData(Date startDate, Date endDate, List<TodayEmergencyVO> list){ private void emergencyData(Date startDate, Date endDate, List<TodayEmergencyVO> list){
List<Order> orderList = orderMapper.selectList(
List<TblUserHelp> userHelpList = userHelpMapper.selectList( new LambdaQueryWrapper<Order>().between(Order::getCreateTime, startDate, endDate).in(Order::getInitiatorType,Arrays.asList("0","1")));
new LambdaQueryWrapper<TblUserHelp>().between(TblUserHelp::getHelpTime, startDate, endDate).in(TblUserHelp::getType,Arrays.asList("0","1"))); if (orderList != null && !orderList.isEmpty()) {
if (userHelpList != null && !userHelpList.isEmpty()) { List<String> userIdList = orderList.stream().map(Order::getInitiatorUserId).distinct().collect(Collectors.toList());
List<String> userIdList = userHelpList.stream().map(TblUserHelp::getUserId).distinct().collect(Collectors.toList());
List<LoginUser> userList = sysBaseAPI.listUserByIdsNew(userIdList); List<LoginUser> userList = sysBaseAPI.listUserByIdsNew(userIdList);
// 根据用户id分组 // 根据用户id分组
Map<String, LoginUser> userMap = userList.stream() Map<String, LoginUser> userMap = userList.stream()
.collect(Collectors.toMap(LoginUser::getId, a -> a, (k1, k2) -> k1)); .collect(Collectors.toMap(LoginUser::getId, a -> a, (k1, k2) -> k1));
for (TblUserHelp tblUserHelp : userHelpList) { for (Order order : orderList) {
TodayEmergencyVO vo = new TodayEmergencyVO(); TodayEmergencyVO vo = new TodayEmergencyVO();
vo.setUserId(tblUserHelp.getUserId()); vo.setUserId(order.getInitiatorUserId());
if (tblUserHelp.getType().equals("0")){ if (order.getInitiatorType().equals("0")){
vo.setEmergencyType("0"); vo.setEmergencyType("0");
} }
if (tblUserHelp.getType().equals("1")){ if (order.getInitiatorType().equals("1")){
vo.setEmergencyType("1"); vo.setEmergencyType("1");
} }
vo.setPhone(tblUserHelp.getOutMobile()); vo.setPhone(order.getInitiatorUserMobile());
LoginUser user = userMap.get(tblUserHelp.getUserId()); LoginUser user = userMap.get(order.getInitiatorUserId());
if (user != null) { if (user != null) {
vo.setRealName(user.getRealname()); vo.setRealName(user.getRealname());
vo.setSex(user.getSex()); vo.setSex(user.getSex());
@@ -777,14 +778,14 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
vo.setOrgName(thirdDepart.getDepartName()); vo.setOrgName(thirdDepart.getDepartName());
} }
} }
vo.setLongitude(tblUserHelp.getLon()); vo.setLongitude(order.getInitiatorLongitude());
vo.setLatitude(tblUserHelp.getLat()); vo.setLatitude(order.getInitiatorLatitude());
} else { } else {
vo.setRealName("未知"); vo.setRealName("未知");
vo.setDepartName("未知"); vo.setDepartName("未知");
vo.setOrgName("未知"); vo.setOrgName("未知");
} }
vo.setTime(tblUserHelp.getHelpTime()); vo.setTime(order.getCreateTime());
list.add(vo); list.add(vo);
} }
} }
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/OrderMapper.java
+2
View File
@@ -6,6 +6,7 @@ import com.renkang.emergency.archives.model.vo.EmergencyNum;
import com.renkang.emergency.bean.response.EmergencyUser; import com.renkang.emergency.bean.response.EmergencyUser;
import com.renkang.emergency.entity.Order; import com.renkang.emergency.entity.Order;
import com.renkang.emergency.entity.TblHelpCentorVo; import com.renkang.emergency.entity.TblHelpCentorVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@@ -16,6 +17,7 @@ import java.util.List;
* @Date: 2023-04-26 * @Date: 2023-04-26
* @Version: V1.0 * @Version: V1.0
*/ */
@Mapper
public interface OrderMapper extends BaseMapper<Order> , MPJBaseMapper<Order> { public interface OrderMapper extends BaseMapper<Order> , MPJBaseMapper<Order> {
/** /**
* 操作人员当天值班记录 * 操作人员当天值班记录