统计问题修复

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -110,3 +110,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12

config-server/src/main/resources/shared/tran-service-local.yml

@@ -110,3 +110,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12

config-server/src/main/resources/shared/tran-service-pre.yml

@@ -110,3 +110,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -110,3 +110,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12

config-server/src/main/resources/shared/tran-service-test.yml

@@ -110,3 +110,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12

tran-service/src/main/java/com/diagbot/aggregate/OptAggregate.java

@@ -0,0 +1,109 @@
+package com.diagbot.aggregate;
+
+import com.diagbot.dto.OptDTO;
+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 OptAggregate {
+    @Autowired
+    private OptInfoFacade optInfoFacade;
+
+    @DataProvider("getAllOptSum")
+    public OptDTO getAllOptSum(
+            @InvokeParameter("optVO") OptVO optVO,
+            @DataConsumer("getPV") List<PVDTO> pvdtoList,
+            @DataConsumer("getPVSum") Long pvSum,
+            @DataConsumer("getUV") List<UVDTO> uvdtoList,
+            @DataConsumer("getUVSum") Long uvSum,
+            @DataConsumer("getZZ") List<ZZDTO> zzdtoList,
+            @DataConsumer("getZZSum") Long zzSum) {
+        OptDTO optDTO = new OptDTO();
+        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("getAllOptSumNoDays")
+    public OptDTO getAllOptSumNoDays(
+            @InvokeParameter("optVO") OptVO optVO,
+            @DataConsumer("getPVSum") Long pvSum,
+            @DataConsumer("getUVSum") Long uvSum,
+            @DataConsumer("getZZSum") Long zzSum) {
+        OptDTO optDTO = new OptDTO();
+        if (null != pvSum) {
+            optDTO.setPvSum(pvSum);
+        }
+        if (null != uvSum) {
+            optDTO.setUvSum(uvSum);
+        }
+        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);
+    }
+}

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

@@ -0,0 +1,106 @@
+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);
+    }
+}

tran-service/src/main/resources/mapper/OptInfoMapper.xml

@@ -21,7 +21,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         count(1) AS pvCnt
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -46,7 +46,7 @@
         SELECT
         count(1) AS pvSum
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -73,7 +73,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -105,7 +105,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -133,7 +133,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 2
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -164,7 +164,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 2
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -189,7 +189,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         count(1) AS pvCnt
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -218,7 +218,7 @@
         hospital_code AS hospitalCode,
         count(1) AS pvSum
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -252,7 +252,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -289,7 +289,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -324,7 +324,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 2
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -361,7 +361,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 2
         <if test="hospitalCode != null and hospitalCode != ''">
@@ -385,7 +385,7 @@
     </select>
 
     <select id="getAllHospital" resultType="java.lang.String">
-        SELECT DISTINCT(hospital_code) AS hospitalCode FROM `xlcs_opt_info` order by hospital_code
+        SELECT DISTINCT(hospital_code) AS hospitalCode FROM `tran_opt_info` order by hospital_code
     </select>
 
     <select id="getHospitalPUZ" resultType="com.diagbot.dto.HospItemDTO">
@@ -400,7 +400,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="startDate!=null">
@@ -425,7 +425,7 @@
         DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
         ip
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 2
         <if test="startDate!=null">
@@ -445,7 +445,7 @@
         hospital_code AS hospitalCode,
         count(1) AS pvSum
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCodeList != null and hospitalCodeList.size > 0">
@@ -486,7 +486,7 @@
                 DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
                 ip
                 FROM
-                xlcs_opt_info
+                tran_opt_info
                 WHERE
                 opt_type = 1
                 <if test="startDate!=null">
@@ -520,7 +520,7 @@
                 DATE_FORMAT(gmt_create, '%Y-%m-%d') AS days,
                 ip
                 FROM
-                xlcs_opt_info
+                tran_opt_info
                 WHERE
                 opt_type = 2
                 <if test="startDate!=null">
@@ -544,7 +544,7 @@
         hospital_code AS hospitalCode,
         count(1) AS pvSum
         FROM
-        xlcs_opt_info
+        tran_opt_info
         WHERE
         opt_type = 1
         <if test="hospitalCodeList != null and hospitalCodeList.size > 0">