为导出报表提供实时警情，违禁品，包裹，健康码，体温导出数据接口

Administrator

2021-04-14 1f9bb7708751a9364ae69d9de5a95c1643ccb3da

为导出报表提供实时警情，违禁品，包裹，健康码，体温导出数据接口

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -34,8 +34,7 @@
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.alarm.wrapper.AlarmWrapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java

@@ -21,7 +21,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.jfpt.alarm.entity.Alarm;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -557,7 +557,7 @@
    </select>

    <!--查询符合条件的数据并导出-->
    <select id="exportAlarm" resultType="org.springblade.jfpt.alarm.vo.AlarmExcel">
    <select id="exportAlarm" resultType="org.springblade.common.entity.AlarmExcel">
        select
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
        a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java

@@ -19,7 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.jfpt.alarm.entity.Alarm;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java

@@ -16,17 +16,14 @@
 */
package org.springblade.jfpt.alarm.service.impl;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.alarm.entity.Alarm;
import org.springblade.jfpt.alarm.mapper.AlarmMapper;
import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.parcel.util.DateUtils;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.stereotype.Service;


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java

@@ -8,11 +8,10 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java

@@ -5,9 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.animalheat.vo.StatisVo;
import org.springblade.jfpt.parcel.vo.ConditionVo;

import java.util.List;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml

@@ -195,7 +195,7 @@


    <!--导出体温数据列表-->
    <select id="exportAnimalHeat" resultType="org.springblade.jfpt.animalheat.vo.AnimalHeatExcel">
    <select id="exportAnimalHeat" resultType="org.springblade.common.entity.AnimalHeatExcel">
        SELECT * FROM blade_animal_heat
        where 1=1
        <if test="animalHeatVo.type==0">

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java

@@ -2,12 +2,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.animalheat.vo.StatisVo;
import org.springblade.jfpt.parcel.vo.ConditionVo;

import java.util.List;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java

@@ -8,7 +8,7 @@
import org.springblade.jfpt.animalheat.mapper.AnimalHeatMapper;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.beans.factory.annotation.Value;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java

New file
@@ -0,0 +1,166 @@
package org.springblade.jfpt.feign;

import com.alibaba.fastjson.JSONObject;
import lombok.AllArgsConstructor;
import org.springblade.common.entity.*;
import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;

@RestController
@AllArgsConstructor
public class ReportFeign {

    private final IhealthcodeService ihealthcodeService;

    private final AnimalHeatService animalHeatService;

    private final ParcelService parcelService;

    private final IAlarmService iAlarmService;

    /**
     * 获取实时警情数据集合
     * @param body map集合数据
     * @return
     */
    @PostMapping("getAlarmList")
    public List<AlarmExcel> getAlarmList(@RequestBody String body){
        Map<String,Object> map = JSONObject.parseObject(body);
        //创建对象，并封装数据
        AlarmVO alarmVO = new AlarmVO();
        if (null!=map.get("beginTime")) {
            alarmVO.setBeginTime(map.get("beginTime").toString());
        }
        if (null!=map.get("endTime")) {
            alarmVO.setEndTime(map.get("endTime").toString());
        }
        if (null!=map.get("waringType")) {
            alarmVO.setWaringType(map.get("waringType").toString());
        }
        if (null!=map.get("timeDesc")) {
            alarmVO.setTimeDesc(map.get("timeDesc").toString());
        }
        //查询数据并返回数据
        List<AlarmExcel> excelList = iAlarmService.exportAlarm(alarmVO);
        return excelList;
    }

    /**
     * 获取健康码数据集合
     * @param body map集合数据
     * @return
     */
    @PostMapping("getHealthcodeList")
    public List<HealthcodeExcel> getHealthcodeList(@RequestBody String body){
        Map<String,Object> map = JSONObject.parseObject(body);
        //创建对象，并封装数据
        HealthcodeVO healthcodeVO = new HealthcodeVO();
        if (null!=map.get("begTime")) {
            healthcodeVO.setBegTime(map.get("begTime").toString());
        }
        if (null!=map.get("endTime")) {
            healthcodeVO.setEndTime(map.get("endTime").toString());
        }
        if (null!=map.get("type")) {
            healthcodeVO.setType(map.get("type").toString());
        }
        if (null!=map.get("timeDesc")) {
            healthcodeVO.setTimeDesc(map.get("timeDesc").toString());
        }
        //查询数据并返回数据
        List<HealthcodeExcel> excelList = ihealthcodeService.exportHealthcode(healthcodeVO);
        return excelList;
    }

    /**
     * 获取体温数据集合
     * @param body map集合数据
     * @return
     */
    @PostMapping("getAnimalHeatList")
    public List<AnimalHeatExcel> getAnimalHeatList(@RequestBody String body){
        Map<String,Object> map = JSONObject.parseObject(body);
        //创建对象，并封装数据
        AnimalHeatVo animalHeatVo = new AnimalHeatVo();
        if (null!=map.get("begTime")) {
            animalHeatVo.setBegTime(map.get("begTime").toString());
        }
        if (null!=map.get("endTime")) {
            animalHeatVo.setEndTime(map.get("endTime").toString());
        }
        if (null!=map.get("status")) {
            animalHeatVo.setStatus(Integer.parseInt(map.get("status").toString()));
        }
        if (null!=map.get("timeDesc")) {
            animalHeatVo.setTimeDesc(map.get("timeDesc").toString());
        }
        //查询数据并返回数据
        List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo);
        return excelList;
    }

    /**
     * 获取包裹数据集合
     * @param body map集合数据
     * @return
     */
    @PostMapping("getParcelList")
    public List<ParcelExcel> getParcelList(@RequestBody String body){
        Map<String,Object> map = JSONObject.parseObject(body);
        //创建对象，并封装数据
        ConditionVo conditionVo = getConditionVo(map);
        //查询数据并返回数据
        List<ParcelExcel> excelList = parcelService.exportParcel(conditionVo);
        System.out.println("conditionVo = " + conditionVo);
        System.out.println("excelList = " + excelList);
        return excelList;
    }

    /**
     * 封装conditionVo数据
     * @param  map
     * @return
     */
    private ConditionVo getConditionVo(Map<String, Object> map) {
        ConditionVo conditionVo = new ConditionVo();
        if (null!=map.get("startTime")) {
            conditionVo.setStartTime(map.get("startTime").toString());
        }
        if (null!=map.get("endTime")) {
            conditionVo.setEndTime(map.get("endTime").toString());
        }
        if (null!=map.get("decisioDiagramResult")) {
            conditionVo.setDecisioDiagramResult(map.get("decisioDiagramResult").toString());
        }
        if (null!=map.get("timeDesc")) {
            conditionVo.setTimeDesc(map.get("timeDesc").toString());
        }
        //返回
        return conditionVo;
    }


    /**
     * 获取违禁品数据集合
     * @param body map集合数据
     * @return
     */
    @PostMapping("getParcelKindList")
    public List<ParcelKindExcel> getParcelKindList(@RequestBody String body){
        Map<String,Object> map = JSONObject.parseObject(body);
        //创建对象，并封装数据
        ConditionVo conditionVo = getConditionVo(map);
        //查询数据并返回数据
        List<ParcelKindExcel> excelList = parcelService.exportParcelKind(conditionVo);
        return excelList;
    }
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java

@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.entity.HealthcodeExcel;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -29,11 +30,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.jfpt.alarm.vo.AlarmExcel;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.healthcode.wrapper.healthcodeWrapper;
import org.springframework.web.bind.annotation.*;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/feign/HealthcodeFeign.java

File was deleted

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.java

@@ -20,8 +20,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.common.entity.HealthcodeExcel;
import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml

@@ -228,7 +228,7 @@
    </select>

    <!--导出健康码数据表格-->
    <select id="exportHealthcode" resultType="org.springblade.jfpt.healthcode.vo.HealthcodeExcel">
    <select id="exportHealthcode" resultType="org.springblade.common.entity.HealthcodeExcel">
        SELECT * FROM healthcode
        where 1=1
        <if test="healthcodeVO.status==0">
@@ -240,7 +240,7 @@
        <if test="healthcodeVO.status==2">
            and date_format(dtime,'%Y%m') = date_format(now(),'%Y%m')
        </if>
        <if test="healthcodeVO.type!=null">
        <if test="healthcodeVO.type!=null and healthcodeVO.type!='undefined' ">
            and type=#{healthcodeVO.type}
        </if>
        <if test="healthcodeVO.province!=null">
@@ -252,10 +252,11 @@
        <if test="healthcodeVO.district!=null">
            and district like concat('%',#{healthcodeVO.district},'%')
        </if>
        <if test="healthcodeVO.begTime!=null and healthcodeVO.begTime!='' and healthcodeVO.endTime!=null and healthcodeVO.endTime!='' ">
        <if test="healthcodeVO.begTime!=null and healthcodeVO.begTime!='' and healthcodeVO.begTime!='undefined'  and healthcodeVO.endTime!='undefined'
        and healthcodeVO.endTime!=null and healthcodeVO.endTime!='' ">
            and date(dtime) between #{healthcodeVO.begTime} and #{healthcodeVO.endTime}
        </if>
        <if test="healthcodeVO.timeDesc!=null and healthcodeVO.timeDesc!=''">
        <if test="healthcodeVO.timeDesc!=null and healthcodeVO.timeDesc!='' and healthcodeVO.timeDesc!='undefined' ">
            <if test="healthcodeVO.timeDesc=='0-2'">
                and hour(dtime)>=0 and hour(dtime) &lt;2
            </if>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/IhealthcodeService.java

@@ -18,8 +18,8 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.common.entity.HealthcodeExcel;
import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java

@@ -18,11 +18,11 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.entity.HealthcodeExcel;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.healthcode.mapper.healthcodeMapper;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.stereotype.Service;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java

@@ -4,13 +4,10 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
import org.springblade.jfpt.healthcode.vo.HealthcodeExcel;
import org.springblade.jfpt.healthcode.vo.HealthcodeVO;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springblade.jfpt.parcel.vo.ParcelExcel;
import org.springblade.jfpt.parcel.vo.ParcelKindExcel;
import org.springblade.common.entity.ParcelExcel;
import org.springblade.common.entity.ParcelKindExcel;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/ParcelService.java

@@ -1,8 +1,8 @@
package org.springblade.jfpt.parcel.service;

import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springblade.jfpt.parcel.vo.ParcelExcel;
import org.springblade.jfpt.parcel.vo.ParcelKindExcel;
import org.springblade.common.entity.ParcelExcel;
import org.springblade.common.entity.ParcelKindExcel;

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

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java

@@ -3,20 +3,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.JacksonUtils;
import io.swagger.models.auth.In;
import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
import org.springblade.jfpt.animalheat.util.ImageUtil;
import org.springblade.jfpt.parcel.service.ParcelService;
import org.springblade.jfpt.parcel.util.*;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springblade.jfpt.parcel.vo.ParcelExcel;
import org.springblade.jfpt.parcel.vo.ParcelKindExcel;
import org.springblade.common.entity.ParcelExcel;
import org.springblade.common.entity.ParcelKindExcel;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import javax.validation.constraints.NotBlank;
import java.lang.reflect.Array;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/report/converter/LocalDateTimeConverter.java

File was deleted