添加码概况报表

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/ReportController.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.controller.console;
 import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
+import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -12,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author ludashi
  * @date 2021年06月02日 15:37
@@ -40,6 +39,12 @@ public class ReportController {
        return BaseResponse.create(result);
     }
 
+    @ApiOperation("码包概况")
+    @GetMapping("/queryPackageCodeGeneral")
+    public BaseResponse<PackageCodeTypeRes> queryPackageCodeGeneral(@Validated ReportReq reportReq) {
+        PackageCodeTypeRes result= reportService.queryPackageCodeGeneral(reportReq);
+        return BaseResponse.create(result);
+    }
     @ApiOperation("SKU使用码量排名")
     @PostMapping("/querySkuCodeRanking")
     public BaseResponse<ListSkuCodeRankingReportRes> querySkuCodeRanking(@RequestBody ReportReq reportReq) {

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/ReportServiceMapper.java

@@ -1,10 +1,12 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
+import com.abi.qms.platform.dao.vo.result.ListPackageCodeVo;
 import com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO;
 import com.abi.qms.platform.dto.req.ReportReq;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -22,10 +24,33 @@ public interface ReportServiceMapper  {
      */
     List<ListBrandCodeReportVO> queryBrandCodeProportion(@Param("reportReq") ReportReq reportReq);
 
+    /**
+     * 查询生成码数量
+     * @param reportReq
+     * @return
+     */
+    List<ListPackageCodeVo> queryPackageCodeNum(@Param("reportReq") ReportReq reportReq);
+
+    /**
+     * 查询下载码数量
+     * @param reportReq
+     * @return
+     */
+    List<ListPackageCodeVo> queryLoadPackageCodeNum(@Param("reportReq") ReportReq reportReq);
+
+    /**
+     * 查询激活码数量
+     * @param reportReq
+     * @return
+     */
+    List<ListPackageCodeVo> queryActivateCodeNum(@Param("reportReq") ReportReq reportReq);
+
     /**
      * SKU使用码量排名
      * @param reportReq
      * @return
      */
     List<ListSkuCodeReportVO> querySkuCodeRanking(@Param("reportReq") ReportReq reportReq);
+
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/ReportService.java

@@ -2,6 +2,7 @@ package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
+import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
 import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
 
 /**
@@ -19,6 +20,15 @@ public interface ReportService {
     */
    ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq);
 
+   /**
+    * 获取码包概况
+    * @author liguosong
+    * @date 2021/6/2
+    * @param reportReq
+    * @return
+    */
+   PackageCodeTypeRes queryPackageCodeGeneral(ReportReq reportReq);
+
 
    /**
     * SKU使用码量排名

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ReportServiceImpl.java

@@ -1,13 +1,17 @@
 package com.abi.qms.platform.service.impl;
 
+import com.abi.qms.platform.dao.enums.QrTypeEnum;
 import com.abi.qms.platform.dao.mapper.ReportServiceMapper;
 import com.abi.qms.platform.dao.vo.result.ListBrandCodeReportVO;
 import com.abi.qms.platform.dao.vo.result.ListSkuCodeReportVO;
+import com.abi.qms.platform.dao.vo.result.ListPackageCodeVo;
 import com.abi.qms.platform.dto.req.ReportReq;
 import com.abi.qms.platform.dto.res.ListBrandCodeReportRes;
 import com.abi.qms.platform.dto.res.ListSkuCodeRankingReportRes;
+import com.abi.qms.platform.dto.res.PackageCodeTypeRes;
 import com.abi.qms.platform.service.ReportService;
 import com.abi.task.common.utils.PojoConverterUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -18,9 +22,13 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -33,13 +41,14 @@ public class ReportServiceImpl implements ReportService {
     @Autowired
     private ReportServiceMapper reportServiceMapper;
 
-   /**
-    * 品牌使用码量占比
-    * @author ludashi
-    * @date 2021/6/2 17:50
-    * @param reportReq
-    * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
-    */
+    /**
+     * 品牌使用码量占比
+     *
+     * @param reportReq
+     * @return com.abi.qms.platform.dto.res.ListBrandCodeReportRes
+     * @author ludashi
+     * @date 2021/6/2 17:50
+     */
     @Override
     public ListBrandCodeReportRes queryBrandCodeProportion(ReportReq reportReq) {
         if(!ObjectUtils.isEmpty(reportReq) &&
@@ -152,4 +161,198 @@ public class ReportServiceImpl implements ReportService {
         return calendar.getTimeInMillis();
     }
 
-}
+
+
+    @Override
+    public PackageCodeTypeRes queryPackageCodeGeneral(ReportReq reportReq) {
+        PackageCodeTypeRes res = new PackageCodeTypeRes();
+        int before=0;//往期
+        int present=0;//同期
+        //1.生成码数量
+        getGenerateCodeNum(reportReq, res,present,before);
+        //2.下载码数量
+        getLoadCodeNum(reportReq, res,present,before);
+        //3.激活码数量
+        getActivateCodeNum(reportReq, res,present,before);
+        //返回参数
+        return res;
+    }
+
+    private void getGenerateCodeNum(ReportReq reportReq, PackageCodeTypeRes res, int present, int before) {
+        //封装入参
+        if(!ObjectUtils.isEmpty(reportReq) &&
+                null == reportReq.getEndTime() &&
+                null == reportReq.getBeginTime()){
+            HashMap<String, LocalDateTime> timestamp = getTimestamp(reportReq.getValue());
+            reportReq.setBeginTime( timestamp.get("startTime"));
+            reportReq.setEndTime( timestamp.get("endTime"));
+        }
+        LocalDateTime beforeTime=null;
+        LocalDateTime presentTime=null;//todayOfLastWeek
+        List<ListPackageCodeVo> createList = reportServiceMapper.queryPackageCodeNum(reportReq);
+        /**
+         * 处理逻辑
+         * 1.取出本周的数据集
+         * 2.取出不是本周的数据集
+         * 3.本周的数据集-不是本周的数据集/不是本周的数据集*100%
+         */
+        for (int i = 0; i < createList.size(); i++) {
+            if("0".equals(createList.get(i).getPercent())){
+                if (QrTypeEnum.CARTON.getCode().equals(createList.get(i).getQrType())) {//判断是否箱码
+                    res.setCreateBoxNumber(createList.get(i).getQrNumber());//箱码
+                } else if (QrTypeEnum.CAP.getCode().equals(createList.get(i).getQrType())) {//判断是否盖码
+                    res.setCreateCapNumber(createList.get(i).getQrNumber());//盖码
+                }
+            }
+        }
+        if (StringUtils.isNotEmpty(reportReq.getValue() + "")) {
+            //计算同期和往期的箱码和盖码
+            String vaiue=reportReq.getValue() + "";
+            before = createList.stream().filter(x -> x.getPercent().equals(vaiue)).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            present = createList.stream().filter(x -> x.getPercent().equals("0")).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            BigDecimal number = new BigDecimal(0);
+            BigDecimal preNum = BigDecimal.valueOf((int) present);
+            BigDecimal sufNum = BigDecimal.valueOf((int) before);
+            String result = percentBigDecimal(preNum, sufNum);
+            res.setCreatePercent(result);//获取同比增长率
+        }
+    }
+    private void getLoadCodeNum(ReportReq reportReq, PackageCodeTypeRes res, int present, int before) {
+        List<ListPackageCodeVo> loadList = reportServiceMapper.queryLoadPackageCodeNum(reportReq);
+        for (int i = 0; i < loadList.size(); i++) {
+            if("0".equals(loadList.get(i).getPercent())) {
+                if (QrTypeEnum.CARTON.getCode().equals(loadList.get(i).getQrType())) {
+                    res.setLoadBoxNumber(loadList.get(i).getQrNumber());
+                } else if (QrTypeEnum.CAP.getCode().equals(loadList.get(i).getQrType())) {
+                    res.setLoadCapNumber(loadList.get(i).getQrNumber());
+                }
+            }
+        }
+        if (StringUtils.isNotEmpty(reportReq.getValue() + "")) {
+            //计算同期和往期的箱码和盖码
+            before = loadList.stream().filter(x -> x.getPercent().equals(reportReq.getValue())).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            //获取为0的
+            present = loadList.stream().filter(x -> x.getPercent().equals("0")).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            BigDecimal number = new BigDecimal(0);
+            BigDecimal preNum = BigDecimal.valueOf((int) present);
+            BigDecimal sufNum = BigDecimal.valueOf((int) before);
+            String result = percentBigDecimal(preNum, sufNum);
+            res.setLoadPercent(result);//获取同比增长率
+        }
+    }
+    private void getActivateCodeNum(ReportReq reportReq, PackageCodeTypeRes res, int present, int before) {
+        List<ListPackageCodeVo> activateList = reportServiceMapper.queryActivateCodeNum(reportReq);
+        for (int i = 0; i < activateList.size(); i++) {
+            if("0".equals(activateList.get(i).getPercent())) {
+                if (QrTypeEnum.CARTON.getCode().equals(activateList.get(i).getQrType())) {
+                    res.setActivateBoxNumber(activateList.get(i).getQrNumber());
+                } else if (QrTypeEnum.CAP.getCode().equals(activateList.get(i).getQrType())) {
+                    res.setActivateCapNumber(activateList.get(i).getQrNumber());
+                }
+            }
+        }
+        if (StringUtils.isNotEmpty(reportReq.getValue() + "")) {
+            //计算同期和往期的箱码和盖码
+            before = activateList.stream().filter(x -> x.getPercent().equals(reportReq.getValue())).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            present = activateList.stream().filter(x -> x.getPercent().equals("0")).mapToInt(x -> Math.toIntExact(x.getQrNumber())).sum();
+            BigDecimal number = new BigDecimal(0);
+            BigDecimal preNum = BigDecimal.valueOf((int) present);
+            BigDecimal sufNum = BigDecimal.valueOf((int) before);
+            String result = percentBigDecimal(preNum, sufNum);
+            res.setActivatePercent(result);//获取同比增长率
+        }
+
+    }
+
+
+
+    /**
+     * @param preNum 同期数
+     * @param sufNum 往期数
+     * @return
+     */
+    public static String percentBigDecimal(BigDecimal preNum, BigDecimal sufNum) {
+        double result = countDecimal(preNum, sufNum);
+        if (result > 0) {
+            System.out.println("上升" + result + "%");
+            return "+" + result + "%";
+        }
+        if (result < 0) {
+            return "-" + Math.abs(result) + "%";
+        }
+        if (result == 0) {
+            return "0%";
+        }
+        return null;
+    }
+
+    public static double countDecimal(BigDecimal preNum, BigDecimal sufNum) {
+        boolean preBoolean = verifyNum(preNum);
+        boolean sufBoolean = verifyNum(sufNum);
+        //同时为true计算
+        if (preBoolean && sufBoolean) {
+            boolean b = verifyEqual(preNum, sufNum);
+            if (b == false) {
+                return realCountDecimal(preNum, sufNum);
+            }
+            if (b) {
+                return 0;
+            }
+        }
+        if (preBoolean == false && sufBoolean == false) {
+            return 0;
+        }
+        if (sufBoolean == false) {
+            return 100;
+        }
+        if (preBoolean == false) {
+            return -100;
+        }
+        return 0;
+    }
+
+    //验证数字是否为零和null
+    public static boolean verifyNum(BigDecimal num) {
+        if (null != num && num.compareTo(BigDecimal.ZERO) != 0) {
+            return true;
+        }
+        return false;
+    }
+
+    //验证两个数字是否相等
+    public static boolean verifyEqual(BigDecimal preNum, BigDecimal sufNum) {
+        int n = preNum.compareTo(sufNum);
+        if (n == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    //真正计算
+    public static double realCountDecimal(BigDecimal preNum, BigDecimal sufNum) {
+        //(前面的数字-后面的数字)/后面的数字*100
+        BigDecimal bigDecimal = (preNum.subtract(sufNum)).divide(sufNum, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+        if (bigDecimal.compareTo(BigDecimal.ZERO) != 0) {
+            return bigDecimal.doubleValue();
+        }
+        return 0;
+    }
+
+    /**
+     * 获取上月月初和月末日期
+     * @return
+     */
+    public Map<String,LocalDateTime> getBeforeTime(){
+        Map<String,LocalDateTime> map=new HashMap<String,LocalDateTime>();
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String localTime = fmt.format(LocalDateTime.now());
+        LocalDateTime date2 = LocalDateTime.parse(localTime, fmt);
+        LocalDateTime localDateTime = date2.minusMonths(1);
+        LocalDateTime with = localDateTime.with(TemporalAdjusters.lastDayOfMonth());
+        LocalDateTime with2 = localDateTime.with(TemporalAdjusters.firstDayOfMonth());
+        map.put("startMonth",localDateTime.with(TemporalAdjusters.lastDayOfMonth()));
+        map.put("endMonth",localDateTime.with(TemporalAdjusters.firstDayOfMonth()));
+        return map;
+    }
+
+}

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/ReportServiceMapper.xml

@@ -42,5 +42,180 @@
         </where>
         GROUP BY bs.sku_name
         ORDER BY qr_number DESC
+            (
+                SELECT
+                    brand.brand_name brand_name,
+                    package.qr_number qr_number,
+                    ROUND( package.qr_number /( SELECT SUM( e.qr_number ) FROM qr_package AS e ) * 100, 2 ) AS per
+                FROM
+                    base_brand AS brand
+                    LEFT JOIN base_sku AS sku ON brand.brand_code = sku.brand_code
+                    LEFT JOIN base_material AS material ON material.sku_id = sku.id
+                    LEFT JOIN qr_package AS package ON package.material_id = material.id
+                <where>
+                    package.generate_status = 2
+                    <!--   1本周  -->
+                    <if test="null != reportReq.value and reportReq.value == 1">
+                       and yearweek(date_format(package.generate_time,'%Y-%m-%d')) = yearweek(now())
+                    </if>
+                    <!--  2本月 -->
+                    <if test="null != reportReq.value and reportReq.value == 2">
+                       and date_format(package.generate_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                    </if>
+                    <if test="null != reportReq.beginTime and null != reportReq.endTime">
+                        and #{reportReq.beginTime} &lt; package.generate_time &lt; #{reportReq.endTime}
+                    </if>
+                </where>
+
+                ORDER BY per DESC
+            ) AS quer
+        GROUP BY quer.brand_name
     </select>
+
+    <select id="queryPackageCodeNum" resultType="com.abi.qms.platform.dao.vo.result.ListPackageCodeVo">
+        SELECT
+               qr_type qrType,
+               SUM(qr_number) qrNumber,
+               '0' Percent
+        FROM qr_package
+        <where>
+             generate_status = 2
+        AND  qr_type is not null
+        <!--   1本周  -->
+        <if test="null != reportReq.value and reportReq.value == 1">
+            AND yearweek(date_format(generate_time,'%Y-%m-%d')) = yearweek(now())
+            GROUP BY qr_type
+            UNION ALL
+            SELECT
+                qr_type,
+                SUM(qr_number) qrNumber,
+                '1' Percent from qr_package
+            WHERE
+                generate_status = 2
+            AND YEARWEEK(date_format(generate_time,'%Y-%m-%d')) = YEARWEEK(now())-1
+            AND qr_type is not null
+            GROUP BY qr_type
+        </if>
+        <!--  2本月 -->
+        <if test="null != reportReq.value and reportReq.value == 2">
+            AND date_format(generate_time,'%Y-%m')=date_format(now(),'%Y-%m')
+            GROUP BY qr_type
+            UNION ALL
+            SELECT
+                   qr_type,
+                   sum(qr_number) qrNumber,
+                   '2' Percent
+            FROM qr_package
+            WHERE
+                generate_status = 2
+            AND date_format(generate_time,'%Y-%m')=date_format(DATE_SUB(curdate(), INTERVAL 1 MONTH),'%Y-%m')
+            AND qr_type is not null
+            GROUP BY qr_type
+        </if>
+        <!--  自定义时间 -->
+        <if test="null != reportReq.beginTime and null != reportReq.endTime">
+            AND  #{reportReq.beginTime} &lt; generate_time &lt; #{reportReq.endTime}
+            GROUP BY qr_type
+        </if>
+        </where>
+    </select>
+
+    <select id="queryLoadPackageCodeNum" resultType="com.abi.qms.platform.dao.vo.result.ListPackageCodeVo">
+        SELECT package.qr_type qrType,
+               SUM(package.qr_number)qrNumber,
+               '0' Percent
+        FROM
+                  qr_package package
+        LEFT JOIN qr_package_download_record download ON package.id=download.qr_package_id
+        <where>
+            package.is_download='1' AND package.qr_type IS NOT NULL
+            <!--   1本周  -->
+            <if test="null != reportReq.value and reportReq.value == 1">
+                AND yearweek(date_format(download.create_time,'%Y-%m-%d')) = yearweek(now())
+                GROUP BY package.qr_type
+                UNION ALL
+                SELECT
+                package.qr_type qrType,
+                       SUM(package.qr_number)qrNumber,
+                       '1' Percent
+                FROM qr_package package
+                    LEFT JOIN qr_package_download_record download ON package.id=download.qr_package_id
+                WHERE  package.is_download='1'
+                AND YEARWEEK(date_format(download.create_time,'%Y-%m-%d')) = YEARWEEK(now())-1
+                AND package.qr_type IS NOT NULL
+                GROUP BY package.qr_type
+            </if>
+            <!--  2本月 -->
+            <if test="null != reportReq.value and reportReq.value == 2">
+                AND date_format(download.create_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                GROUP BY package.qr_type
+                UNION ALL
+                SELECT
+                       qr_type qrType,
+                       SUM(qr_number)qrNumber,
+                       '2' Percent
+                FROM qr_package package
+                LEFT JOIN qr_package_download_record download ON package.id=download.qr_package_id
+                WHERE package.is_download='1'
+                AND date_format(download.create_time,'%Y-%m')=date_format(DATE_SUB(curdate(), INTERVAL 1 MONTH),'%Y-%m')
+                AND package.qr_type IS NOT NULL
+                GROUP BY package.qr_type
+            </if>
+            <!--  自定义时间 -->
+            <if test="null != reportReq.beginTime and null != reportReq.endTime">
+                AND  #{reportReq.beginTime} &lt; download.create_time &lt; #{reportReq.endTime}
+                GROUP BY package.qr_type
+            </if>
+        </where>
+    </select>
+
+    <select id="queryActivateCodeNum" resultType="com.abi.qms.platform.dao.vo.result.ListPackageCodeVo">
+        SELECT
+               package.qr_type qrType,
+               SUM(package.qr_number)qrNumber,
+               '0' Percent
+        FROM qr_package package
+            LEFT JOIN  qr_box_mapping boxmap ON package.id=boxmap.package_id
+        <where>
+            boxmap.active_status ='1' AND  package.qr_type IS NOT NULL
+            <!--   1本周  -->
+            <if test="null != reportReq.value and reportReq.value == 1">
+                AND yearweek(date_format(boxmap.active_time,'%Y-%m-%d')) = yearweek(now())
+                GROUP BY package.qr_type
+                UNION ALL
+                SELECT
+                       package.qr_type qrType,
+                       SUM(package.qr_number)qrNumber,
+                       '1' Percent
+                FROM qr_package package
+                    LEFT JOIN qr_box_mapping boxmap ON package.id=boxmap.package_id
+                WHERE  boxmap.active_status ='1'
+                AND YEARWEEK(date_format(boxmap.active_time,'%Y-%m-%d')) = YEARWEEK(now())-1
+                AND package.qr_type IS NOT NULL
+                GROUP BY package.qr_type
+            </if>
+            <!--  2本月 -->
+            <if test="null != reportReq.value and reportReq.value == 2">
+                AND date_format(boxmap.active_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                GROUP BY package.qr_type
+                UNION ALL
+                SELECT
+                       package.qr_type qrType,
+                       SUM(package.qr_number)qrNumber,
+                       '2' Percent
+                FROM qr_package package
+                    LEFT JOIN qr_box_mapping boxmap ON package.id=boxmap.package_id
+                WHERE  boxmap.active_status ='2'
+                AND date_format(boxmap.active_time,'%Y-%m')=date_format(DATE_SUB(curdate(), INTERVAL 1 MONTH),'%Y-%m')
+                AND package.qr_type IS NOT NULL
+                GROUP BY package.qr_type
+            </if>
+            <!--  自定义时间 -->
+            <if test="null != reportReq.beginTime and null != reportReq.endTime">
+                AND  #{reportReq.beginTime} &lt; boxmap.active_time &lt; #{reportReq.endTime}
+                GROUP BY package.qr_type
+            </if>
+        </where>
+    </select>
+
 </mapper>