diff --git a/db/updatesql/20251223-应急资源表加字段.sql b/db/updatesql/20251223-应急资源表加字段.sql new file mode 100644 index 0000000..f65a8f8 --- /dev/null +++ b/db/updatesql/20251223-应急资源表加字段.sql @@ -0,0 +1,6 @@ + +-- ---------------------------- +-- Table structure for health_user_employee_ex +-- ---------------------------- +ALTER TABLE `emergency_resource` + ADD COLUMN `manager` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '负责人'; diff --git a/db/updatesql/20251223-用户扩展信息加第二个急救人员信息.sql b/db/updatesql/20251223-用户扩展信息加第二个急救人员信息.sql new file mode 100644 index 0000000..7853b4f --- /dev/null +++ b/db/updatesql/20251223-用户扩展信息加第二个急救人员信息.sql @@ -0,0 +1,7 @@ + +-- ---------------------------- +-- Table structure for health_user_employee_ex +-- ---------------------------- +ALTER TABLE `health_user_employee_ex` + ADD COLUMN `lifeguard_name2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '急救人员2姓名', + ADD COLUMN `lifeguard_phone2` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '急救人员2电话'; diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/CareUserVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/CareUserVO.java index fc64c95..6ae341b 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/CareUserVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/CareUserVO.java @@ -16,5 +16,9 @@ public class CareUserVO { private String lifeguardName; @Schema(title = "急救人员电话") private String lifeguardPhone; - + //20251223 改为两个急救人员 ,为改动最小化 没有改数据结构 + @Schema(title = "急救人员2姓名") + private String lifeguardName2; + @Schema(title = "急救人员2电话") + private String lifeguardPhone2; } diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/EmergencyContactVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/EmergencyContactVO.java index 971c832..78a1e42 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/EmergencyContactVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/EmergencyContactVO.java @@ -55,6 +55,12 @@ public class EmergencyContactVO { @Schema(title = "急救人员电话") private String firstAiderPhone; + @Schema(title = "急救人2员姓名") + private String firstAiderName2; + + @Schema(title = "急救人2员电话") + private String firstAiderPhone2; + @Schema(title = "重点关爱人员是否倒班（1是 2否）") private Integer keycareShiftWork; diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java index b0183de..b4afee4 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/HealthRoomBaseVO.java @@ -47,4 +47,16 @@ public class HealthRoomBaseVO { */ @Schema(title = "运转时间(分钟)") private Integer runTime; + + /** + * 管理人员 + */ + @Schema(title = "管理人员") + private String manager; + + /** + * 联系电话 + */ + @Schema(title = "联系电话") + private String phone; } diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java index 1446a88..f711bef 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/Resource.java @@ -55,6 +55,11 @@ public class Resource implements Serializable { @Excel(name = "联系电话", width = 15) @Schema(title = "联系电话") private String mobile; + /** + * 负责人 + */ + @Schema(title = "负责人") + private String manager; /** * 经度 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyResourceApiServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyResourceApiServiceImpl.java index bcd773b..5c410f4 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyResourceApiServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/api/service/impl/EmergencyResourceApiServiceImpl.java @@ -30,10 +30,7 @@ import org.springframework.data.geo.Point; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -71,7 +68,13 @@ public class EmergencyResourceApiServiceImpl implements EmergencyResourceApiServ if (StrUtil.isEmpty(type) || type.equals("4")){ List list = aedMangerService.list(new LambdaQueryWrapper() .isNotNull(AedEquipmentManger::getLatitude)); - maps.addAll(list.stream().map(LargeScreenMap::new).collect(Collectors.toList())); + Map deptMap = sysBaseAPI.queryDepartNameByOrgCodes(list.stream() + .map(AedEquipmentManger::getDepartCode).collect(Collectors.toSet())); + list.forEach(aed ->{ + LargeScreenMap largeScreenMap = new LargeScreenMap(aed); + largeScreenMap.setOrgName(deptMap.get(aed.getDepartCode())); + maps.add(largeScreenMap); + }); } if (StrUtil.isEmpty(type) || type.equals("5")) { List list = resourceMapper.selectList(new LambdaQueryWrapper() diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/LargeScreenMap.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/LargeScreenMap.java index 4e04f2b..2dd0e99 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/LargeScreenMap.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/LargeScreenMap.java @@ -44,6 +44,7 @@ public class LargeScreenMap { this.id = resource.getId(); this.name = resource.getName(); this.mobile = resource.getMobile(); + this.manageName = resource.getManager(); this.orgName = resource.getMemo(); this.type = resource.getType(); this.latitude = String.valueOf(resource.getLatitude()); @@ -66,7 +67,6 @@ public class LargeScreenMap { public LargeScreenMap(AedEquipmentManger aed) { this.id = aed.getId().toString(); this.name = aed.getName(); - this.orgName = aed.getDepartCode(); this.type = "4"; this.address = aed.getInstallAddress(); this.latitude = String.valueOf(aed.getLatitude()); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/TodayEmergencyVO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/TodayEmergencyVO.java index 77f32bc..b7aa38f 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/TodayEmergencyVO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/TodayEmergencyVO.java @@ -26,6 +26,8 @@ public class TodayEmergencyVO { @Schema(title = "事件类型(emergencyType=3 才有值)") @Dict(dicCode = "watch_event_type") private String eventType; + @Schema(title = "异常值(emergencyType=3 才有值)") + private String abnormalValue; @Schema(title = "性别") @Dict(dicCode = "sex2") private Integer sex; 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 9eca210..14098bd 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 @@ -845,6 +845,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl map(String type) { @@ -85,7 +87,16 @@ public class LargeScreenServiceImpl extends ServiceImpl list = aedMangerService.list(new LambdaQueryWrapper() .isNotNull(AedEquipmentManger::getLatitude)); - maps.addAll(list.stream().map(LargeScreenMap::new).collect(Collectors.toList())); + if(ObjectUtil.isNotEmpty(list)){ + //AED部门code翻译 + Map deptMap = sysBaseAPI.queryDepartNameByOrgCodes(list.stream() + .map(AedEquipmentManger::getDepartCode).collect(Collectors.toSet())); + list.forEach(aed ->{ + LargeScreenMap largeScreenMap = new LargeScreenMap(aed); + largeScreenMap.setOrgName(deptMap.get(aed.getDepartCode())); + maps.add(largeScreenMap); + }); + } } if (StrUtil.isEmpty(type) || type.equals("5")) { List list = resourceService.list(new LambdaQueryWrapper() @@ -516,6 +527,8 @@ public class LargeScreenServiceImpl extends ServiceImpl