统计接口

zzcx-service/src/main/java/com/diagbot/aggregate/OptHospAggregate.java

@@ -1,89 +1,106 @@
-//package com.diagbot.aggregate;
-//
-//import com.diagbot.dto.OptDTO;
-//import com.diagbot.dto.OptHospDTO;
-//import com.diagbot.dto.PVDTO;
-//import com.diagbot.dto.UVDTO;
-//import com.diagbot.dto.ZZDTO;
-//import com.diagbot.facade.OptInfoFacade;
-//import com.diagbot.util.ListUtil;
-//import com.diagbot.vo.OptVO;
-//import io.github.lvyahui8.spring.annotation.DataConsumer;
-//import io.github.lvyahui8.spring.annotation.DataProvider;
-//import io.github.lvyahui8.spring.annotation.InvokeParameter;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-///**
-// * @Description:
-// * @author: gaodm
-// * @time: 2020/2/3 10:38
-// */
-//@Component
-//public class OptHospAggregate {
-//    @Autowired
-//    private OptInfoFacade optInfoFacade;
-//
-//    @DataProvider("getAllOptHospSum")
-//    public OptHospDTO getAllOptHospSum(
-//            @InvokeParameter("optVO") OptVO optVO,
-//            @DataConsumer("getHospPV") List<PVDTO> pvdtoList,
-//            @DataConsumer("getPVHospSum") Long pvSum,
-//            @DataConsumer("getUV") List<UVDTO> uvdtoList,
-//            @DataConsumer("getUVSum") Long uvSum,
-//            @DataConsumer("getZZ") List<ZZDTO> zzdtoList,
-//            @DataConsumer("getZZSum") Long zzSum) {
-//        OptHospDTO optHospDTO = new OptHospDTO();
-//        if (ListUtil.isNotEmpty(pvdtoList)) {
-//            optDTO.setPvdto(pvdtoList);
-//        }
-//        if (null != pvSum) {
-//            optDTO.setPvSum(pvSum);
-//        }
-//        if (ListUtil.isNotEmpty(uvdtoList)) {
-//            optDTO.setUvdto(uvdtoList);
-//        }
-//        if (null != uvSum) {
-//            optDTO.setUvSum(uvSum);
-//        }
-//        if (ListUtil.isNotEmpty(zzdtoList)) {
-//            optDTO.setZzdto(zzdtoList);
-//        }
-//        if (null != zzSum) {
-//            optDTO.setZzSum(zzSum);
-//        }
-//        return optDTO;
-//    }
-//
-//    @DataProvider("getPV")
-//    public List<PVDTO> getPV(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getPV(optVO);
-//    }
-//
-//    @DataProvider("getPVSum")
-//    public Long getPVSum(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getPVSum(optVO);
-//    }
-//
-//    @DataProvider("getUV")
-//    public List<UVDTO> getUV(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getUV(optVO);
-//    }
-//
-//    @DataProvider("getUVSum")
-//    public Long getUVSum(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getUVSum(optVO);
-//    }
-//
-//    @DataProvider("getZZ")
-//    public List<ZZDTO> getZZ(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getZZ(optVO);
-//    }
-//
-//    @DataProvider("getZZSum")
-//    public Long getZZSum(@InvokeParameter("optVO") OptVO optVO) {
-//        return optInfoFacade.getZZSum(optVO);
-//    }
-//}
+package com.diagbot.aggregate;
+
+import com.diagbot.dto.OptHospDTO;
+import com.diagbot.dto.PVHospDTO;
+import com.diagbot.dto.PVHospSumDTO;
+import com.diagbot.dto.UVHospDTO;
+import com.diagbot.dto.UVHospSumDTO;
+import com.diagbot.dto.ZZHospDTO;
+import com.diagbot.dto.ZZHospSumDTO;
+import com.diagbot.facade.OptInfoFacade;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.OptVO;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/2/3 10:38
+ */
+@Component
+public class OptHospAggregate {
+    @Autowired
+    private OptInfoFacade optInfoFacade;
+
+    @DataProvider("getAllOptSumHosp")
+    public OptHospDTO getAllOptSumHosp(
+            @InvokeParameter("optVO") OptVO optVO,
+            @DataConsumer("getPVHosp") List<PVHospDTO> pvHospDto,
+            @DataConsumer("getPVSumHosp") List<PVHospSumDTO> pvHospSumDto,
+            @DataConsumer("getUVHosp") List<UVHospDTO> uvHospDto,
+            @DataConsumer("getUVSumHosp") List<UVHospSumDTO> uvHospSumDto,
+            @DataConsumer("getZZHosp") List<ZZHospDTO> zzHospDto,
+            @DataConsumer("getZZSumHosp") List<ZZHospSumDTO> zzHospSumDto) {
+        OptHospDTO optHospDTO = new OptHospDTO();
+        if (ListUtil.isNotEmpty(pvHospDto)) {
+            optHospDTO.setPvHospDto(pvHospDto);
+        }
+        if (ListUtil.isNotEmpty(pvHospSumDto)) {
+            optHospDTO.setPvHospSumDto(pvHospSumDto);
+            Long pvSum = 0L;
+            for (PVHospSumDTO pvHospSumDTO : pvHospSumDto) {
+                pvSum += pvHospSumDTO.getPvSum();
+            }
+            optHospDTO.setPvSum(pvSum);
+        }
+        if (ListUtil.isNotEmpty(uvHospDto)) {
+            optHospDTO.setUvHospDto(uvHospDto);
+        }
+        if (ListUtil.isNotEmpty(uvHospSumDto)) {
+            optHospDTO.setUvHospSumDto(uvHospSumDto);
+            Long uvSum = 0L;
+            for (UVHospSumDTO uvHospSumDTO : uvHospSumDto) {
+                uvSum += uvHospSumDTO.getUvSum();
+            }
+            optHospDTO.setUvSum(uvSum);
+        }
+        if (ListUtil.isNotEmpty(zzHospDto)) {
+            optHospDTO.setZzHospDto(zzHospDto);
+        }
+        if (ListUtil.isNotEmpty(zzHospSumDto)) {
+            optHospDTO.setZzHospSumDto(zzHospSumDto);
+            Long zzSum = 0L;
+            for (ZZHospSumDTO zzHospSumDTO : zzHospSumDto) {
+                zzSum += zzHospSumDTO.getZzSum();
+            }
+            optHospDTO.setZzSum(zzSum);
+        }
+        return optHospDTO;
+    }
+
+    @DataProvider("getPVHosp")
+    public List<PVHospDTO> getPVHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getPVHosp(optVO);
+    }
+
+    @DataProvider("getPVSumHosp")
+    public List<PVHospSumDTO> getPVSumHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getPVSumHosp(optVO);
+    }
+
+    @DataProvider("getUVHosp")
+    public List<UVHospDTO> getUVHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getUVHosp(optVO);
+    }
+
+    @DataProvider("getUVSumHosp")
+    public List<UVHospSumDTO> getUVSumHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getUVSumHosp(optVO);
+    }
+
+    @DataProvider("getZZHosp")
+    public List<ZZHospDTO> getZZHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getZZHosp(optVO);
+    }
+
+    @DataProvider("getZZSumHosp")
+    public List<ZZHospSumDTO> getZZSumHosp(@InvokeParameter("optVO") OptVO optVO) {
+        return optInfoFacade.getZZSumHosp(optVO);
+    }
+}

zzcx-service/src/main/java/com/diagbot/dto/OptHospDTO.java

@@ -20,6 +20,6 @@ public class OptHospDTO {
     private List<UVHospSumDTO> uvHospSumDto;
     private Long uvSum;
     private List<ZZHospDTO> zzHospDto;
-    private List<UVHospSumDTO> uuHospSumDto;
+    private List<ZZHospSumDTO> zzHospSumDto;
     private Long zzSum;
 }

zzcx-service/src/main/java/com/diagbot/facade/OptInfoFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.OptDTO;
+import com.diagbot.dto.OptHospDTO;
 import com.diagbot.entity.OptInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -74,4 +75,36 @@ public class OptInfoFacade extends OptInfoServiceImpl {
         //        optDTO.setZzSum(this.getZZSum(optVO));
         return optDTO;
     }
+
+
+
+    public OptHospDTO getOptSumHosp(OptVO optVO) {
+        //入参验证
+        if (null != optVO && null != optVO.getStartDate()) {
+            optVO.setStartDate(DateUtil.getFirstTimeOfDay(optVO.getStartDate()));
+        }
+        if (null != optVO && null != optVO.getEndDate()) {
+            optVO.setEndDate(DateUtil.getLastTimeOfDay(optVO.getEndDate()));
+        }
+
+        if (null != optVO && null != optVO.getStartDate() && null != optVO.getEndDate()) {
+            if (DateUtil.after(optVO.getStartDate(), optVO.getEndDate())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "开始时间大于结束时间！");
+            }
+        }
+
+        //获取统计数据
+        OptHospDTO optHospDTO = new OptHospDTO();
+
+        try {
+            Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("optVO", optVO);
+            optHospDTO
+                    = dataBeanAggregateQueryFacade.get("getAllOptSumHosp", invokeParams, OptHospDTO.class);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
+        }
+
+        return optHospDTO;
+    }
 }

zzcx-service/src/main/java/com/diagbot/web/OptInfoController.java

@@ -2,6 +2,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.OptDTO;
+import com.diagbot.dto.OptHospDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.OptInfoFacade;
 import com.diagbot.vo.HospitalVO;
@@ -39,7 +40,7 @@ public class OptInfoController {
         return RespDTO.onSuc(optInfoFacade.saveOptOnfo(hospitalVO, "1"));
     }
 
-    @ApiOperation(value = "获取合计数据[by:gaodm]",
+    @ApiOperation(value = "获取合计数据不带医院名称[by:gaodm]",
             notes = "hospitalCode： 医院名称，String<br>" +
                     "startDate： 开始时间，Date<br>" +
                     "endDate： 结束时间，Date<br>")
@@ -48,4 +49,15 @@ public class OptInfoController {
     public RespDTO<OptDTO> getOptSum(@RequestBody OptVO optVO) {
         return RespDTO.onSuc(optInfoFacade.getOptSum(optVO));
     }
+
+
+    @ApiOperation(value = "获取合计数据带医院名称[by:gaodm]",
+            notes = "hospitalCode： 医院名称，String<br>" +
+                    "startDate： 开始时间，Date<br>" +
+                    "endDate： 结束时间，Date<br>")
+    @PostMapping("/getOptSumHosp")
+    @SysLogger("getOptSumHosp")
+    public RespDTO<OptHospDTO> getOptSumHosp(@RequestBody OptVO optVO) {
+        return RespDTO.onSuc(optInfoFacade.getOptSumHosp(optVO));
+    }
 }