大屏改动

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java

@@ -4,14 +4,25 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.vo.*;
+import com.renkang.anyan.model.vo.BloodSugarClockSList;
 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.entity.dto.*;
+import com.renkang.anyan.model.vo.WeightPressureList;
+import com.renkang.anyan.model.vo.BloodPressureList;
+import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO;
+import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO;
+import com.renkang.emergency.entity.dto.MedicalCenterDTO;
+import com.renkang.emergency.entity.dto.PhoneListDTO;
+import com.renkang.emergency.entity.dto.ResourcesAllDTO;
+import com.renkang.emergency.entity.dto.StatisticsDTO;
+import com.renkang.emergency.entity.dto.UserHealthCenterDTO;
+import com.renkang.emergency.largeScreen.entity.dto.HealthRoomBaseDTO;
+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.*;
+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.*;
 import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
 import com.renkang.emergency.largeScreen.service.ILargeScreenService;

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthBloodPressureDTO.java

@@ -1,58 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-public class HealthBloodPressureDTO {
-    /**
-     * 单位名称
-     */
-    @Schema(title = "单位名称")
-    private String departName;
-    /**
-     * 员工姓名
-     */
-    @Schema(title = "员工姓名")
-    private String name;
-    /**
-     * 填报开始时间起
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Schema(title = "填报开始时间起")
-    private Date inputDateBegin;
-    /**
-     * 填报开始时间止
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Schema(title = "填报开始时间止")
-    private Date inputDateEnd;
-
-    /**
-     * 异常标记 0:正常/1:异常/2:全部
-     */
-    @Schema(title = "异常标记 0:正常/1:异常/2:全部")
-    private String abFlag;
-
-    /**
-     * 页码 从1开始
-     */
-    @Schema(title = "页码 从1开始")
-    private Integer pageNo;
-    /**
-     * 每页数量
-     */
-    @Schema(title = "每页数量")
-    private Integer pageSize;
-
-    public HealthBloodPressureDTO() {
-        this.pageNo = 1;
-        this.pageSize = 10;
-    }
-}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthBloodSugarDTO.java

@@ -1,58 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-public class HealthBloodSugarDTO {
-    /**
-     * 单位名称
-     */
-    @Schema(title = "单位名称")
-    private String departName;
-    /**
-     * 员工姓名
-     */
-    @Schema(title = "员工姓名")
-    private String name;
-    /**
-     * 填报开始时间起
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Schema(title = "填报开始时间起")
-    private Date inputDateBegin;
-    /**
-     * 填报开始时间止
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Schema(title = "填报开始时间止")
-    private Date inputDateEnd;
-
-    /**
-     * 异常标记 0:正常/1:异常/2:全部
-     */
-    @Schema(title = "异常标记 0:正常/1:异常/2:全部")
-    private String abFlag;
-
-    /**
-     * 页码 从1开始
-     */
-    @Schema(title = "页码 从1开始")
-    private Integer pageNo;
-    /**
-     * 每页数量
-     */
-    @Schema(title = "每页数量")
-    private Integer pageSize;
-
-    public HealthBloodSugarDTO() {
-        this.pageNo = 1;
-        this.pageSize = 10;
-    }
-}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthRoomDTO.java

@@ -1,74 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.dto;
-
-import cn.hutool.core.date.DateUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-//@Data
-//public class HealthRoomDTO {
-//    /**
-//     * 健康小屋ID
-//     */
-//    @Schema(title = "健康小屋ID")
-//    @NotNull
-//    private String healthRoomId;
-//    /**
-//     * 检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加
-//     */
-//    @Schema(title = "检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加")
-//    @Dict(dicCode = "xj_check_type")
-//    private String checkType;
-//    /**
-//     * 单位名称
-//     */
-//    @Schema(title = "单位名称")
-//    private String departName;
-//    /**
-//     * 员工姓名
-//     */
-//    @Schema(title = "员工姓名")
-//    private String name;
-//    /**
-//     * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01
-//     */
-//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01")
-//    private Date checkInDateBegin;
-//    /**
-//     * 检查日期止期 参数为空时，默认为今天
-//     */
-//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @Schema(title = "检查日期止期 参数为空时，默认为今天")
-//    private Date checkInDateEnd;
-//    /**
-//     * 是否成功控降 是否成功空降，1:是/0.否
-//     */
-//    @Schema(title = "是否成功控降 是否成功空降，1:是/0.否")
-//    private String successFlag;
-//    /**
-//     * 页码 从1开始
-//     */
-//    @Schema(title = "页码 从1开始")
-//    private Integer pageNo;
-//    /**
-//     * 每页数量
-//     */
-//    @Schema(title = "每页数量")
-//    private Integer pageSize;
-//
-//    public HealthRoomDTO() {
-//        Date date = new Date();
-//        this.checkInDateBegin = DateUtil.beginOfYear(date);
-//        this.checkInDateEnd = DateUtil.endOfDay(date);
-//        this.pageNo = 1;
-//        this.pageSize = 10;
-//    }
-//}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalDTO.java

@@ -1,60 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.dto;
-
-import cn.hutool.core.date.DateUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-//@Data
-//public class MedicalAbnormalDTO {
-//    /**
-//     * 单位名称
-//     */
-//    private String departName;
-//    /**
-//     * 员工姓名
-//     */
-//    private String name;
-//    /**
-//     * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01
-//     */
-//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01")
-//    private Date checkInDateBegin;
-//    /**
-//     * 检查日期止期 参数为空时，默认为今天
-//     */
-//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-//    @DateTimeFormat(pattern = "yyyy-MM-dd")
-//    @Schema(title = "检查日期止期 参数为空时，默认为今天")
-//    private Date checkInDateEnd;
-//    /**
-//     * 查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常
-//     */
-//    @Schema(title = "查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常")
-//    @NotNull
-//    private String queryType;
-//    /**
-//     * 页码 从1开始
-//     */
-//    @Schema(title = "页码 从1开始")
-//    private Integer pageNo;
-//    /**
-//     * 每页数量
-//     */
-//    @Schema(title = "每页数量")
-//    private Integer pageSize;
-//
-//    public MedicalAbnormalDTO() {
-//        Date date = new Date();
-//        this.checkInDateBegin = DateUtil.beginOfYear(date);
-//        this.checkInDateEnd = DateUtil.endOfDay(date);
-//        this.pageNo = 1;
-//        this.pageSize = 10;
-//    }
-//}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomBaseVO.java

@@ -1,24 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-public class HealthRoomBaseVO {
-    private String id;
-    private String departName;
-    private String address;
-    private String lon;
-    private String lat;
-    /**
-     * 建设时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Schema(title = "建设时间")
-    private Date buildDate;
-}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java

@@ -1,20 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.vo;
-
-import cn.hutool.core.date.DateUtil;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-//@Data
-//public class MedicalAbnormalStatisticsVO {
-//    private Integer totalCount;
-//    // 心血管异常人数
-//    private Integer cardiovaAbCount;
-//    // 脑血管异常人数
-//    private Integer cerebrovAbCount;
-//    // 冠脉ct异常人数
-//    private Integer cctaAbCount;
-//}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalVO.java

@@ -1,40 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.jeecg.common.aspect.annotation.Dict;
-
-@Data
-public class MedicalAbnormalVO {
-    /**
-     * 单位
-     */
-    @Schema(title = "单位")
-    private String departName;
-    /**
-     * 姓名
-     */
-    @Schema(title = "姓名")
-    private String name;
-    /**
-     * 性别
-     */
-    @Schema(title = "性别")
-    @Dict(dicCode = "sex2")
-    private Integer sex;
-    /**
-     * 年龄
-     */
-    @Schema(title = "年龄")
-    private Integer age;
-    /**
-     * 体检医院
-     */
-    @Schema(title = "体检医院")
-    private String hospitalName;
-    /**
-     * 检查日期
-     */
-    @Schema(title = "检查日期")
-    private String checkInDate;
-}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalPeopleNumStatisticsVO.java

@@ -1,23 +0,0 @@
-package com.renkang.emergency.largeScreen.entity.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-//@Data
-//public class MedicalPeopleNumStatisticsVO {
-//    /**
-//     * 医院名称
-//     */
-//    @Schema(title = "医院名称")
-//    private String hospitalName;
-//    /**
-//     * 已参检人数
-//     */
-//    @Schema(title = "已参检人数")
-//    private Integer checkedCount;
-//    /**
-//     * 应检人数 (可能无法提供 先冗余)
-//     */
-//    @Schema(title = "应检人数 (可能无法提供 先冗余)")
-//    private Integer totalCount;
-//}

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java

@@ -6,10 +6,15 @@ 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.vo.*;
-import com.renkang.anyan.model.vo.HealthRoomBaseVO;
 import com.renkang.anyan.model.vo.MedicalAbnormalVO;
-import com.renkang.emergency.largeScreen.entity.dto.*;
-import com.renkang.emergency.largeScreen.entity.vo.*;
+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;
 
 import java.util.List;
 

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java

@@ -11,27 +11,24 @@ 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.config.AnYanProperties;
 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.vo.HealthSignStatVO;
-import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO;
-import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO;
-import com.renkang.anyan.config.AnYanProperties;
-import com.renkang.anyan.model.vo.HealthRoomBaseVO;
-import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO;
-import com.renkang.anyan.model.vo.MedicalAbnormalVO;
 import com.renkang.anyan.model.vo.*;
-import com.renkang.emergency.bean.response.XjHealthSignFakerData;
-import com.renkang.emergency.bean.response.XjMedicalCountFakerData;
-import com.renkang.emergency.bean.response.XjMedicalDataFakerData;
 import com.renkang.emergency.entity.EmergencyCenter;
 import com.renkang.emergency.entity.EmergencyHealthRoom;
 import com.renkang.emergency.entity.Resource;
 import com.renkang.emergency.entity.vo.DataDetailVO;
 import com.renkang.emergency.entity.vo.MedicalDataVO;
-import com.renkang.emergency.largeScreen.entity.dto.*;
-import com.renkang.emergency.largeScreen.entity.vo.*;
+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;
 import com.renkang.emergency.largeScreen.mapper.LargeScreenMapper;
 import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
 import com.renkang.emergency.largeScreen.service.ILargeScreenService;
@@ -39,17 +36,16 @@ import com.renkang.emergency.service.IEmergencyCenterService;
 import com.renkang.emergency.service.IEmergencyHealthRoomService;
 import com.renkang.emergency.service.IResourceService;
 import lombok.RequiredArgsConstructor;
-import org.jeecg.common.constant.FakerDataConstant;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.util.RedisClientUtil;
 import org.jeecg.util.RedisKeyPrefix;
 import org.jeecg.util.TypeConversionUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;