统计接口fix

songhuangfeng123

2022-09-07 471e7d6d238e22308e0457aa03c8f8ff62cd6340

统计接口fix

 emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumDetailRPCResp.java

对比新文件
@@ -0,0 +1,71 @@
package com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp;


public class EmergencyExecuteNumDetailRPCResp {

    // 时间 如果查的是年，返回的是月份 ，如果查的是月，返回的是天
    private Integer time ;

    // 年
    private Integer year ;

    // 月
    private Integer month;

    // 日
    private Integer day;

    // 数据类型 1 ：年 2：月
    private Integer distType;

    // 数量
    private Integer num;

    public Integer getTime() {
        return time;
    }

    public void setTime(Integer time) {
        this.time = time;
    }

    public Integer getYear() {
        return year;
    }

    public void setYear(Integer year) {
        this.year = year;
    }

    public Integer getMonth() {
        return month;
    }

    public void setMonth(Integer month) {
        this.month = month;
    }

    public Integer getDay() {
        return day;
    }

    public void setDay(Integer day) {
        this.day = day;
    }

    public Integer getDistType() {
        return distType;
    }

    public void setDistType(Integer distType) {
        this.distType = distType;
    }

    public Integer getNum() {
        return num;
    }

    public void setNum(Integer num) {
        this.num = num;
    }
}

 emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java

@@ -15,8 +15,10 @@
    // 部门级别
    private Integer deptLevel;

    // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
    private List<Map<String ,Integer>> data;
    // 父部门id
    private Long parentDepId;

    private List<EmergencyExecuteNumDetailRPCResp> detail;

    public Long getDeptId() {
        return deptId;
@@ -42,11 +44,19 @@
        this.deptLevel = deptLevel;
    }

    public List<Map<String, Integer>> getData() {
        return data;
    public List<EmergencyExecuteNumDetailRPCResp> getDetail() {
        return detail;
    }

    public void setData(List<Map<String, Integer>> data) {
        this.data = data;
    public void setDetail(List<EmergencyExecuteNumDetailRPCResp> detail) {
        this.detail = detail;
    }

    public Long getParentDepId() {
        return parentDepId;
    }

    public void setParentDepId(Long parentDepId) {
        this.parentDepId = parentDepId;
    }
}

 emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java

@@ -12,6 +12,9 @@
    // 部门级别
    private Integer deptLevel;

    // 父部门id
    private Long parentDepId;

    //上次演练的时间
    private String lastTime;

@@ -47,4 +50,11 @@
        this.lastTime = lastTime;
    }

    public Long getParentDepId() {
        return parentDepId;
    }

    public void setParentDepId(Long parentDepId) {
        this.parentDepId = parentDepId;
    }
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java

@@ -18,6 +18,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumDetailRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
@@ -28,7 +29,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import sun.security.pkcs11.wrapper.CK_SSL3_KEY_MAT_OUT;

import java.text.SimpleDateFormat;
import java.util.*;
@@ -53,6 +53,7 @@
        emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
        emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
        emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
        emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

        getSingleTimeData(emergencyExecuteTimeRPCResp);
        SearchResultVO searchResultVO = new SearchResultVO<>(
@@ -79,6 +80,7 @@
            emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
            emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
            emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
            emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

            getSingleTimeData(emergencyExecuteTimeRPCResp);
            list.add(emergencyExecuteTimeRPCResp);
@@ -119,6 +121,7 @@
        emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
        emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
        emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
        emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

        getSingleNumData(emergencyExecuteNumRPCResp,query);

@@ -147,6 +150,7 @@
            emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
            emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
            emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
            emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

            getSingleNumData(emergencyExecuteNumRPCResp,query);
            list.add(emergencyExecuteNumRPCResp);
@@ -173,30 +177,44 @@

        List<Map<String,Integer>> mapList = new ArrayList<>();
        List<EmergencyDrillExecuteCountRPC> emergencyDrillExecuteCountDataList = new ArrayList<>();

        String startTime ;
        String endTime ;
        Integer distType;
        if (query.getMonth()==null){
            distType=1;
            // 查该年度12个月份的
            startTime = TimeUtils.getYearFirst(query.getYear());
            endTime = TimeUtils.getYearLast(query.getYear());
            emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
        }else{
            // 查该年度指定月份的
            distType=2;
            startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
            endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
            emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByDayAndDept(startTime, endTime, deptIds);
        }
        if (!emergencyDrillExecuteCountDataList.isEmpty()){
            List<EmergencyExecuteNumDetailRPCResp> detailList =new ArrayList<>();
            for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
                Map<String ,Integer> map = new HashMap<>();
                // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
                map.put("name",emergencyDrillExecuteCountRPC.getName());
                map.put("num",emergencyDrillExecuteCountRPC.getNum());
                mapList.add(map);

                EmergencyExecuteNumDetailRPCResp emergencyExecuteNumDetailRPCResp = new EmergencyExecuteNumDetailRPCResp();

                emergencyExecuteNumDetailRPCResp.setTime(emergencyDrillExecuteCountRPC.getName());
                emergencyExecuteNumDetailRPCResp.setDistType(distType);
                emergencyExecuteNumDetailRPCResp.setYear(query.getYear());
                if (distType==1){
                    emergencyExecuteNumDetailRPCResp.setMonth(emergencyDrillExecuteCountRPC.getName());
                }
                if (distType==2){
                    emergencyExecuteNumDetailRPCResp.setMonth(query.getMonth());
                    emergencyExecuteNumDetailRPCResp.setDay(emergencyDrillExecuteCountRPC.getName());
                }
                emergencyExecuteNumDetailRPCResp.setNum(emergencyDrillExecuteCountRPC.getNum());
                detailList.add(emergencyExecuteNumDetailRPCResp);
            }
            emergencyExecuteNumRPCResp.setDetail(detailList);
        }
        emergencyExecuteNumRPCResp.setData(mapList);

    }

    private DepInfoRPCRespDTO getDepInfoByDepId(Long deptId) {

 incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageCountRPCResp.java

@@ -9,6 +9,18 @@
    // 时间 如果查的是年，返回的是月份 ，如果查的是月，返回的是天
    private Integer time ;

    // 年
    private Integer year ;

    // 月
    private Integer month;

    // 日
    private Integer day;

    // 数据类型 1 ：年 2：月
    private Integer distType;

    // 数据
    private List<IncidentManageCountDetailRPCResp> detail;

@@ -27,4 +39,36 @@
    public void setDetail(List<IncidentManageCountDetailRPCResp> detail) {
        this.detail = detail;
    }

    public Integer getYear() {
        return year;
    }

    public void setYear(Integer year) {
        this.year = year;
    }

    public Integer getMonth() {
        return month;
    }

    public void setMonth(Integer month) {
        this.month = month;
    }

    public Integer getDay() {
        return day;
    }

    public void setDay(Integer day) {
        this.day = day;
    }

    public Integer getDistType() {
        return distType;
    }

    public void setDistType(Integer distType) {
        this.distType = distType;
    }
}

 incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java

@@ -2,7 +2,6 @@


import java.util.List;
import java.util.Map;

public class IncidentManageRPCResp {

@@ -14,6 +13,9 @@

    // 部门级别
    private Integer deptLevel;

    // 父部门id
    private Long parentDepId;

    // 名称+数据
    private List<IncidentManageCountRPCResp> data;
@@ -42,6 +44,14 @@
        this.deptLevel = deptLevel;
    }

    public Long getParentDepId() {
        return parentDepId;
    }

    public void setParentDepId(Long parentDepId) {
        this.parentDepId = parentDepId;
    }

    public List<IncidentManageCountRPCResp> getData() {
        return data;
    }

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java

@@ -50,6 +50,7 @@
        incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
        incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
        incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
        incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

        getSingleTimeData(incidentManageCountRPCResp, query);

@@ -81,6 +82,7 @@
            incidentManageCountRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
            incidentManageCountRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
            incidentManageCountRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
            incidentManageCountRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());

            getSingleTimeData(incidentManageCountRPCResp, query);
            list.add(incidentManageCountRPCResp);
@@ -108,13 +110,16 @@
        Long deptId = incidentManageRPCResp.getDeptId();
        String startTime;
        String endTime;
        Integer distType;
        if (query.getMonth() == null) {
            distType=1;
            // 查该年度12个月份的
            startTime = TimeUtils.getYearFirst(query.getYear());
            endTime = TimeUtils.getYearLast(query.getYear());
            accidentReportCountRPCList= accidentReportInfoService.getCountForRPCByDeptIdAndMonth(startTime, endTime, deptId);

        } else {
            distType=2;
            // 查该年度指定月份的
            startTime = TimeUtils.getMonthFirst(query.getYear(), query.getMonth());
            endTime = TimeUtils.getMonthLast(query.getYear(), query.getMonth());
@@ -129,6 +134,16 @@
            for (Integer integer : timeSET) {
                IncidentManageCountRPCResp incidentManageCountRPCResp = new IncidentManageCountRPCResp();
                incidentManageCountRPCResp.setTime(integer);
                incidentManageCountRPCResp.setYear(query.getYear());
                incidentManageCountRPCResp.setDistType(distType);
                if (distType==1){
                    incidentManageCountRPCResp.setMonth(integer);
                }
                if (distType==2){
                    incidentManageCountRPCResp.setMonth(query.getMonth());
                    incidentManageCountRPCResp.setDay(integer);
                }

                incidentManageCountRPCResp.setDetail(new ArrayList<>());
                resList.add(incidentManageCountRPCResp);
            }