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-12-03 15:53:18 +08:00
parent a4a0265a82
commit 595d702e9e
12 changed files with 108 additions and 60 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/controller/LargeScreenNewController.java
+27 -11
View File
@@ -1,11 +1,7 @@
package com.renkang.emergency.largeScreen.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.renkang.anyan.model.dto.CareUserDetailsParam;
import com.renkang.anyan.model.dto.HealthRoomDTO;
import com.renkang.anyan.model.dto.HealthSignListParam;
import com.renkang.anyan.model.dto.MedicalAbnormalDTO;
import com.renkang.anyan.model.dto.*;
import com.renkang.anyan.model.vo.*;
import com.renkang.emergency.entity.TblBaseHospitalVo;
import com.renkang.emergency.entity.dto.*;
@@ -105,7 +101,7 @@ public class LargeScreenNewController {
@PostMapping("/healthRoomDetail")
@Operation(summary = "健康小屋详情", description = "健康小屋详情")
public Result<IPage<HealthPlaceHomDetailsVO>> healthRoomDetail(@RequestBody HealthRoomDTO dto) {
public Result<IPage<HealthPlaceHomeDetailsVO>> healthRoomDetail(@RequestBody HealthRoomDTO dto) {
return Result.ok(largeScreenService.healthRoomDetail(dto));
}
@@ -256,8 +252,8 @@ public class LargeScreenNewController {
*/
@GetMapping("loveTrendByOne")
public Result<CareUserListVo> loveTrendByOne(@RequestParam(name = "anYanUserId", required = false)String anYanUserId,
@RequestParam(name = "idNo", required = false)String idNo){
return Result.ok(largeScreenDataService.loveTrendByOne(anYanUserId,idNo));
@RequestParam(name = "employeeNum", required = false)String employeeNum){
return Result.ok(largeScreenDataService.loveTrendByOne(anYanUserId,employeeNum));
}
/**
@@ -284,12 +280,12 @@ public class LargeScreenNewController {
/**
* 健康档案
* @param idCard 用户身份证号
* @param employeeNum 工号
* @return vo
*/
@GetMapping("healthArchives")
public Result<CareUserListVo> healthArchives(@RequestParam(name = "idCard") String idCard){
return Result.ok(largeScreenDataService.healthArchives(idCard));
public Result<CareUserListVo> healthArchives(@RequestParam(name = "employeeNum") String employeeNum){
return Result.ok(largeScreenDataService.healthArchives(employeeNum));
}
/**
@@ -310,4 +306,24 @@ public class LargeScreenNewController {
public Result<AuthResult> queryAnYanToken(){
return Result.ok(largeScreenService.queryAnYanToken());
}
/**
* 获取体检数据列表接口 注：此接口为后台接口 不是大屏
* @param param
* @return
*/
@PostMapping("queryAnYanHealthCheckNew")
public Result<IPage<AnYanHealthCheckNew>> queryAnYanHealthCheckNew(@RequestBody AnYanHealthCheckNewParam param){
return Result.ok(largeScreenDataService.queryAnYanHealthCheckNew(param));
}
/**
* 获取小屋数据列表接口 注：此接口为后台接口 不是大屏
* @param healthRoomDTO
* @return
*/
@PostMapping("healthPlaceHomeDetailList")
public Result<IPage<HealthPlaceHomeDetailsVO>> healthPlaceHomeDetailList(@RequestBody HealthRoomDTO healthRoomDTO){
return Result.ok(largeScreenDataService.healthPlaceHomeDetailList(healthRoomDTO));
}
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomVO.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.renkang.emergency.largeScreen.entity.vo;
import com.renkang.anyan.model.vo.HealthPlaceHomDetailsVO;
import com.renkang.anyan.model.vo.HealthPlaceHomeDetailsVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
@@ -57,7 +57,7 @@ public class HealthRoomVO {
public HealthRoomVO() {}
public HealthRoomVO(HealthPlaceHomDetailsVO detailsVO){
public HealthRoomVO(HealthPlaceHomeDetailsVO detailsVO){
departName = detailsVO.getDepartName();
name = detailsVO.getName();
checkInDate = detailsVO.getCheckInDate();
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/TodayEmergencyVO.java
+2
View File
@@ -19,6 +19,8 @@ public class TodayEmergencyVO {
private String realName;
@Schema(title = "身份证号")
private String idCard;
@Schema(title = "工号")
private String employeeNum;
@Schema(title = "0:120 1:紧急求助 2:云坐席 3:终端报警")
private String emergencyType;
@Schema(title = "事件类型(emergencyType=3 才有值)")
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java
+9 -6
View File
@@ -2,17 +2,16 @@ package com.renkang.emergency.largeScreen.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.renkang.anyan.model.dto.AnYanHealthCheckNewParam;
import com.renkang.anyan.model.dto.CareUserDetailsParam;
import com.renkang.anyan.model.vo.CarePersonList;
import com.renkang.anyan.model.vo.CareUserListVo;
import com.renkang.anyan.model.vo.CareUserVO;
import com.renkang.anyan.model.dto.HealthRoomDTO;
import com.renkang.anyan.model.vo.*;
import com.renkang.emergency.entity.LargeScreenData;
import com.renkang.emergency.entity.TblBaseHospitalVo;
import com.renkang.emergency.entity.dto.LargeScreenDataValueDTO;
import com.renkang.emergency.entity.vo.DataDetailVO;
import com.renkang.emergency.entity.vo.MedicalDataVO;
import com.renkang.emergency.largeScreen.entity.dto.TodayEmergencyDTO;
import com.renkang.emergency.largeScreen.entity.vo.HealthArchivesVO;
import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO;
import java.util.List;
@@ -41,13 +40,17 @@ public interface ILargeScreenDataService extends IService<LargeScreenData> {
IPage<CareUserListVo> loveTrendDetail(CareUserDetailsParam param);
CareUserListVo loveTrendByOne(String anYanUserId,String idNo);
CareUserListVo loveTrendByOne(String anYanUserId,String employeeNum);
List<TblBaseHospitalVo> nearResources(String longitude, String latitude);
IPage<TodayEmergencyVO> todayEmergencyList(TodayEmergencyDTO dto);
CareUserListVo healthArchives(String userId);
CareUserListVo healthArchives(String employeeNum);
CareUserVO careUser(String userId);
IPage<AnYanHealthCheckNew> queryAnYanHealthCheckNew(AnYanHealthCheckNewParam param);
IPage<HealthPlaceHomeDetailsVO> healthPlaceHomeDetailList(HealthRoomDTO healthRoomDTO);
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java
+1 -2
View File
@@ -11,7 +11,6 @@ import com.renkang.emergency.largeScreen.entity.dto.HealthRoomBaseDTO;
import com.renkang.emergency.largeScreen.entity.dto.HealthSignDTO;
import com.renkang.emergency.largeScreen.entity.dto.MedicalAbnormalStatisticsDTO;
import com.renkang.emergency.largeScreen.entity.dto.MedicalPeopleNumStatisticsDTO;
import com.renkang.emergency.largeScreen.entity.vo.HealthRoomVO;
import com.renkang.emergency.largeScreen.entity.vo.HealthSignVO;
import com.renkang.emergency.largeScreen.entity.vo.HospitalVO;
import com.renkang.emergency.largeScreen.entity.vo.LargeScreenMap;
@@ -30,7 +29,7 @@ public interface ILargeScreenService extends IService<LargeScreenMap> {
List<HealthRoomBaseVO> healthRoomBase(HealthRoomBaseDTO dto);
IPage<HealthPlaceHomDetailsVO> healthRoomDetail(HealthRoomDTO dto);
IPage<HealthPlaceHomeDetailsVO> healthRoomDetail(HealthRoomDTO dto);
IPage<MedicalAbnormalVO> medicalAbnormal(MedicalAbnormalDTO dto);
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+39 -18
View File
@@ -6,25 +6,23 @@ import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.renkang.anyan.client.AnYanClient;
import com.renkang.anyan.model.dto.AnYanHealthCheckNewParam;
import com.renkang.anyan.model.dto.CareUserDetailsParam;
import com.renkang.anyan.model.vo.CarePersonList;
import com.renkang.anyan.model.vo.CareUserListVo;
import com.renkang.anyan.model.vo.CareUserVO;
import com.renkang.anyan.model.dto.HealthRoomDTO;
import com.renkang.anyan.model.vo.*;
import com.renkang.emergency.aed.service.IAedEquipmentMangerService;
import com.renkang.emergency.entity.*;
import com.renkang.emergency.entity.dto.LargeScreenDataValueDTO;
import com.renkang.emergency.entity.vo.DataDetailVO;
import com.renkang.emergency.entity.vo.MedicalDataVO;
import com.renkang.emergency.largeScreen.entity.dto.TodayEmergencyDTO;
import com.renkang.emergency.largeScreen.entity.vo.HealthArchivesVO;
import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO;
import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper;
import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
@@ -32,9 +30,7 @@ import com.renkang.emergency.mapper.OrderMapper;
import com.renkang.emergency.mapper.TblUserHelpMapper;
import com.renkang.emergency.service.IResourceService;
import com.renkang.emergency.service.ITbQimoNoticeService;
import com.renkang.emergency.service.ITbUserHelpMacService;
import com.renkang.emergency.service.IXjAedService;
import com.renkang.emergency.util.HealthArchivesGenerator;
import com.renkang.watch.api.WatchApi;
import com.renkang.watch.vo.WatchMonitorDataVo;
import lombok.RequiredArgsConstructor;
@@ -47,12 +43,9 @@ import org.jeecg.modules.system.entity.HealthUserEmployeeEx;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.util.TypeConversionUtil;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StreamUtils;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,6 +61,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
private final IResourceService resourceService;
private final IXjAedService xjAedService;
private final IAedEquipmentMangerService aedService;
private final ITbQimoNoticeService noticeService;
private final TblUserHelpMapper userHelpMapper;
private final OrderMapper orderMapper;
@@ -485,8 +479,8 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
}
@Override
public CareUserListVo loveTrendByOne(String anYanUserId, String idNo){
return anYanClient.careUserDetails(anYanUserId, idNo);
public CareUserListVo loveTrendByOne(String anYanUserId,String employeeNum){
return anYanClient.careUserDetails(anYanUserId,employeeNum);
}
@Override
@@ -520,9 +514,9 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
.collect(Collectors.toList());
}
List<XjAed> aedList = xjAedService.list(new LambdaQueryWrapper<XjAed>()
.isNotNull(XjAed::getLatitude)
.isNotNull(XjAed::getLongitude));
List<AedEquipmentManger> aedList = aedService.list(new LambdaQueryWrapper<AedEquipmentManger>()
.isNotNull(AedEquipmentManger::getLatitude)
.isNotNull(AedEquipmentManger::getLongitude));
if (CollUtil.isNotEmpty(aedList)) {
xjAedList = aedList.stream().map(TblBaseHospitalVo::new).collect(Collectors.toList());
}
@@ -783,6 +777,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
vo.setSex(user.getSex());
vo.setAge(user.getAge());
vo.setIdCard(user.getIdCard());
vo.setEmployeeNum(user.getWorkNo());
if (ObjUtil.isNotEmpty(user.getOrgCode())) {
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(user.getOrgCode()));
if (secondDepart != null) {
@@ -858,8 +853,8 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
}
@Override
public CareUserListVo healthArchives(String idCard) {
return anYanClient.careUserDetails(null,idCard);
public CareUserListVo healthArchives(String employeeNum) {
return anYanClient.careUserDetails(null,employeeNum);
// return HealthArchivesGenerator.generateRandomHealthArchives();
}
@@ -880,4 +875,30 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
return careUserVO;
}
@Override
public IPage<AnYanHealthCheckNew> queryAnYanHealthCheckNew(AnYanHealthCheckNewParam param) {
return anYanClient.queryAnYanHealthCheckNew(param);
}
@Override
public IPage<HealthPlaceHomeDetailsVO> healthPlaceHomeDetailList(HealthRoomDTO healthRoomDTO) {
IPage<HealthPlaceHomeDetailsVO> detailsVOIPage = anYanClient.healthPlaceHomDetailList(healthRoomDTO);
List<HealthPlaceHomeDetailsVO> records = detailsVOIPage.getRecords();
if (records != null && !records.isEmpty()) {
List<String> roomIdList = records.stream().map(HealthPlaceHomeDetailsVO::getRoomId).distinct()
.collect(Collectors.toList());
List<Resource> ayRoom = resourceService.list(new LambdaQueryWrapper<Resource>()
.in(Resource::getAyId, roomIdList));
for (HealthPlaceHomeDetailsVO record : records) {
Resource resource = ayRoom.stream().filter(item -> item.getAyId().equals(record.getRoomId())).findFirst().orElse(null);
if (resource != null) {
record.setRoomName(resource.getName());
record.setAddress(resource.getAddress());
}
}
}
return detailsVOIPage;
}
}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java
+1 -4
View File
@@ -1,6 +1,5 @@
package com.renkang.emergency.largeScreen.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
@@ -24,7 +23,6 @@ import com.renkang.emergency.largeScreen.entity.dto.HealthRoomBaseDTO;
import com.renkang.emergency.largeScreen.entity.dto.HealthSignDTO;
import com.renkang.emergency.largeScreen.entity.dto.MedicalAbnormalStatisticsDTO;
import com.renkang.emergency.largeScreen.entity.dto.MedicalPeopleNumStatisticsDTO;
import com.renkang.emergency.largeScreen.entity.vo.HealthRoomVO;
import com.renkang.emergency.largeScreen.entity.vo.HealthSignVO;
import com.renkang.emergency.largeScreen.entity.vo.HospitalVO;
import com.renkang.emergency.largeScreen.entity.vo.LargeScreenMap;
@@ -34,7 +32,6 @@ import com.renkang.emergency.largeScreen.service.ILargeScreenService;
import com.renkang.emergency.service.IEmergencyCenterService;
import com.renkang.emergency.service.IEmergencyHealthRoomService;
import com.renkang.emergency.service.IResourceService;
import com.renkang.emergency.service.IXjAedService;
import lombok.RequiredArgsConstructor;
import org.jeecg.util.RedisClientUtil;
import org.jeecg.util.RedisKeyPrefix;
@@ -118,7 +115,7 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
}
@Override
public IPage<HealthPlaceHomDetailsVO> healthRoomDetail(HealthRoomDTO dto) {
public IPage<HealthPlaceHomeDetailsVO> healthRoomDetail(HealthRoomDTO dto) {
try {
return anYanClient.healthPlaceHomDetailList(dto);
} catch (Exception e) {