From 24cd7cfdca31a71499a44eaab8333ddd7edafa4e Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Sat, 13 Dec 2025 14:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=85=B3=E7=88=B1=E8=81=94?= =?UTF-8?q?=E7=BB=9C=E5=91=98=E6=9A=82=E6=97=B6=E6=94=B9=E4=B8=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=8E=B0=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LargeScreenNewController.java | 5 +-- .../service/ILargeScreenDataService.java | 2 +- .../impl/LargeScreenDataServiceImpl.java | 32 +++++++++++++------ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java index fbd0e98..3313208 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java @@ -294,8 +294,9 @@ public class LargeScreenNewController { * @return */ @GetMapping("careUser") - public Result careUser(@RequestParam(name = "userId") String userId){ - return Result.ok(largeScreenDataService.careUser(userId)); + public Result careUser(@RequestParam(name = "userId") String userId, + @RequestParam(name = "workNo") String workNo){ + return Result.ok(largeScreenDataService.careUser(userId,workNo)); } /** diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java index 5c1ed94..121094a 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java @@ -49,7 +49,7 @@ public interface ILargeScreenDataService extends IService { CareUserListVo healthArchives(String employeeNum); - CareUserVO careUser(String userId); + CareUserVO careUser(String userId,String workNo); IPage queryAnYanHealthCheckNew(AnYanHealthCheckNewParam param); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index f2d5100..443a567 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -13,10 +13,7 @@ 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.AnYanHealthCheckProjectParam; -import com.renkang.anyan.model.dto.CareUserDetailsParam; -import com.renkang.anyan.model.dto.HealthRoomDTO; +import com.renkang.anyan.model.dto.*; import com.renkang.anyan.model.vo.*; import com.renkang.emergency.aed.service.IAedEquipmentMangerService; import com.renkang.emergency.entity.*; @@ -35,12 +32,10 @@ import com.renkang.emergency.service.IXjAedService; import com.renkang.watch.api.WatchApi; import com.renkang.watch.vo.WatchMonitorDataVo; import lombok.RequiredArgsConstructor; -import org.jeecg.bean.request.ListUser; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.global.GlobalUtils; import org.jeecg.modules.manager.ISysCache; -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; @@ -860,11 +855,12 @@ public class LargeScreenDataServiceImpl extends ServiceImpl healthUserEmployeeExes = sysBaseAPI.listEmployeeUserByIds(user); - CareUserVO careUserVO = new CareUserVO(); careUserVO.setUserId(userId); if (healthUserEmployeeExes != null && !healthUserEmployeeExes.isEmpty()) { careUserVO.setCareLiaisonName(healthUserEmployeeExes.get(0).getCareLiaisonName()); @@ -872,6 +868,24 @@ public class LargeScreenDataServiceImpl extends ServiceImpl emergencyContactVOIPage = anYanClient.queryEmergencyContact(param); + if (emergencyContactVOIPage != null && emergencyContactVOIPage.getRecords() != null && !emergencyContactVOIPage.getRecords().isEmpty()) { + EmergencyContactVO emergencyContactVO = emergencyContactVOIPage.getRecords().get(0); + careUserVO.setCareLiaisonName(emergencyContactVO.getRelationEmpName()); + careUserVO.setCareLiaisonPhone(emergencyContactVO.getRelationEmpPhone()); + careUserVO.setCareLiaisonJob(emergencyContactVO.getRelationEmpPostsText()); + careUserVO.setLifeguardName(emergencyContactVO.getFirstAiderName()); + careUserVO.setLifeguardPhone(emergencyContactVO.getFirstAiderPhone()); + } + } catch (Exception e) { + e.printStackTrace(); + } } return careUserVO; }