From eeeaf9166b41ee1cb3afc84ef1d4de78e6ff0ff5 Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Fri, 8 Aug 2025 10:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=83=A8=E5=88=86vo=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/anyan/client/AnYanClient.java | 2 +- .../anyan/client/AnYanClientExecutor.java | 4 +- ...ealthRoomVO.java => HealthRoomBaseVO.java} | 2 +- .../anyan/model/vo/HospitalListVO.java | 5 +++ .../controller/LargeScreenNewController.java | 3 ++ .../service/ILargeScreenService.java | 3 ++ .../service/impl/LargeScreenServiceImpl.java | 37 +++++++++++++++---- 7 files changed, 44 insertions(+), 12 deletions(-) rename functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/{HealthRoomVO.java => HealthRoomBaseVO.java} (95%) diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java index b9c1f76..3c26d85 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java @@ -73,7 +73,7 @@ public interface AnYanClient { * 健康小屋基础数据查询 * @return */ - List healthPlaceHomList(); + List healthPlaceHomList(); /** * 健康小屋详细数据查询 diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java index 2ed8fc3..2468970 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java @@ -136,10 +136,10 @@ public class AnYanClientExecutor implements AnYanClient { } @Override - public List healthPlaceHomList() { + public List healthPlaceHomList() { Result result = RestTemplateUtil.postExchange(AnYanApiEnum.HEALTH_PLACE_ROOM_LIST, buildTokenHeader(),null); List listMaps = (List) result.getResult(); - return listMaps.stream().map(lMap -> BeanUtil.toBean(lMap, HealthRoomVO.class)).collect(Collectors.toList()); + return listMaps.stream().map(lMap -> BeanUtil.toBean(lMap, HealthRoomBaseVO.class)).collect(Collectors.toList()); } @Override diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java similarity index 95% rename from functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomVO.java rename to functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java index 09ef2a5..83bde18 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java @@ -5,7 +5,7 @@ import lombok.Data; @Data @Schema(title="新疆健康小屋对象", description="新疆健康小屋对象") -public class HealthRoomVO { +public class HealthRoomBaseVO { /** * id */ diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HospitalListVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HospitalListVO.java index 82df17b..41bdfe2 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HospitalListVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HospitalListVO.java @@ -6,6 +6,11 @@ import lombok.Data; @Data @Schema(title="油田医院VO", description="油田医院VO") public class HospitalListVO { + /** + * id + */ + @Schema(title = "id") + private String id; /** * 医院名称 */ 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 107af95..a40f906 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 @@ -1,7 +1,10 @@ package com.renkang.emergency.largeScreen.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.renkang.anyan.model.vo.HealthRoomBaseVO; +import com.renkang.anyan.model.vo.MedicalAbnormalVO; import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; +import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; import com.renkang.emergency.entity.dto.*; import com.renkang.emergency.entity.vo.DataDetailVO; import com.renkang.emergency.entity.vo.MedicalDataVO; diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java index 20a170d..dea9213 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java @@ -2,7 +2,10 @@ 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.vo.HealthRoomBaseVO; +import com.renkang.anyan.model.vo.MedicalAbnormalVO; import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; +import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; import com.renkang.emergency.largeScreen.entity.dto.*; import com.renkang.emergency.largeScreen.entity.vo.*; diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java index 33e3420..2df53d4 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -3,14 +3,18 @@ package com.renkang.emergency.largeScreen.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.vo.HealthSignStatVO; -import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; +import com.renkang.anyan.config.AnYanProperties; +import com.renkang.anyan.model.vo.*; +import com.renkang.anyan.model.vo.HealthRoomBaseVO; +import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; +import com.renkang.anyan.model.vo.MedicalAbnormalVO; import com.renkang.emergency.bean.response.XjHealthSignFakerData; import com.renkang.emergency.bean.response.XjMedicalCountFakerData; import com.renkang.emergency.bean.response.XjMedicalDataFakerData; @@ -26,7 +30,6 @@ import com.renkang.emergency.largeScreen.service.ILargeScreenService; import com.renkang.emergency.service.IResourceService; import lombok.RequiredArgsConstructor; import org.jeecg.common.constant.FakerDataConstant; -import org.jeecg.common.exception.ExceptionAssertsUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.util.RedisClientUtil; import org.jeecg.util.RedisKeyPrefix; @@ -58,7 +61,7 @@ public class LargeScreenServiceImpl extends ServiceImpl healthRoomVOS = anYanClient.healthPlaceHomList(); + List healthRoomVOS = anYanClient.healthPlaceHomList(); // 查询第三方接口返回 此接口返回对象跟原有可能不太一样 要注意 return list; } @@ -496,8 +499,26 @@ public class LargeScreenServiceImpl extends ServiceImpl hospitalListVOList = anYanClient.hospitalList(); + if(ObjectUtil.isEmpty(hospitalListVOList)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Resource::getType,1); + wrapper.in(Resource::getId,hospitalListVOList.stream().map(HospitalListVO::getId).collect(Collectors.toList())); + List hospitalList = resourceService.list(wrapper); + + } + //更新健康小屋信息 + List healthRoomVOList = anYanClient.healthPlaceHomList(); + if(ObjectUtil.isEmpty(healthRoomVOList)){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Resource::getType,2); + wrapper.in(Resource::getId,healthRoomVOList.stream().map(HealthRoomBaseVO::getId).collect(Collectors.toList())); + List hospitalList = resourceService.list(wrapper); + } + } } public static String[] generateRandomLocation() {