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

大屏关爱联络员暂时改为接口现查

Browse Source
This commit is contained in:
feng
2025-12-13 14:24:55 +08:00
parent 2ca6c5f1cd
commit 24cd7cfdca
3 changed files with 27 additions and 12 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
+3 -2
View File
@@ -294,8 +294,9 @@ public class LargeScreenNewController {
* @return
*/
@GetMapping("careUser")
public Result<CareUserVO> careUser(@RequestParam(name = "userId") String userId){
return Result.ok(largeScreenDataService.careUser(userId));
public Result<CareUserVO> careUser(@RequestParam(name = "userId") String userId,
@RequestParam(name = "workNo") String workNo){
return Result.ok(largeScreenDataService.careUser(userId,workNo));
}
/**
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java
+1 -1
View File
@@ -49,7 +49,7 @@ public interface ILargeScreenDataService extends IService<LargeScreenData> {
CareUserListVo healthArchives(String employeeNum);
CareUserVO careUser(String userId);
CareUserVO careUser(String userId,String workNo);
IPage<AnYanHealthCheckNew> queryAnYanHealthCheckNew(AnYanHealthCheckNewParam param);
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+23 -9
View File
@@ -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<LargeScreenDataMappe
}
@Override
public CareUserVO careUser(String userId) {
ListUser user = new ListUser();
public CareUserVO careUser(String userId,String workNo) {
CareUserVO careUserVO = new CareUserVO();
//20251212修改为关爱人员信息从安眼系统现查 ，如若后期有定时任务频繁更新本系统的用户拓展信息，这里可再走以下注释的代码查本系统中的书
/*ListUser user = new ListUser();
user.setUserIds(Collections.singletonList(userId));
List<HealthUserEmployeeEx> 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<LargeScreenDataMappe
careUserVO.setCareLiaisonJob(healthUserEmployeeExes.get(0).getCareLiaisonJob());
careUserVO.setLifeguardName(healthUserEmployeeExes.get(0).getLifeguardName());
careUserVO.setLifeguardPhone(healthUserEmployeeExes.get(0).getLifeguardPhone());
}*/
if(StrUtil.isNotEmpty(workNo)){
try {
EmergencyContactParam param = new EmergencyContactParam();
param.setEmployeeNum(workNo);
IPage<EmergencyContactVO> 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;
}