blade-common/src/main/java/org/springblade/common/entity/ReportReturnData.java
@@ -6,4 +6,9 @@ public class ReportReturnData { private String type; private Integer count; public ReportReturnData(String type, Integer count) { this.type = type; this.count = count; } } blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java
@@ -67,6 +67,14 @@ List<ParcelExcel> getParcelList(@RequestBody String body); /** * 获取包裹统计数据 * @param body map集合数据 * @return */ @PostMapping("getParcelPie") List<ReportReturnData> getParcelPie(@RequestBody String body); /** * 获取违禁品数据集合 * @param body map集合数据 * @return @@ -75,5 +83,11 @@ List<ParcelKindExcel> getParcelKindList(@RequestBody String body); /** * 获取违禁品统计数据 * @param body map集合数据 * @return */ @PostMapping("getParcelKindPie") List<ReportReturnData> getParcelKindPie(@RequestBody String body); } blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -15,7 +15,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import sun.plugin.javascript.navig.Array; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -74,7 +76,8 @@ //将map转换为json对象 String body = JSON.toJSONString(map); if (null!=beanName){ return reportClient.getAlarmPie(body); List<ReportReturnData> alarmPie = reportClient.getAlarmPie(body); return alarmPie; } return null; } @@ -123,7 +126,6 @@ //将map转换为json对象 String body = JSON.toJSONString(map); if (null!=beanName){ System.out.println("reportClient.getAnimalHeatList(body) = " + reportClient.getAnimalHeatList(body)); return reportClient.getAnimalHeatList(body); } return null; @@ -136,12 +138,10 @@ * @param map map集合数据 * @return */ @PostMapping("getAnimalHeatPie") public List<ReportReturnData> getAnimalHeatPie(String beanName, String dataName, Map<String,Object> map){ //将map转换为json对象 String body = JSON.toJSONString(map); if (null!=beanName){ System.out.println("reportClient = " + reportClient.getAnimalHeatPie(body)); return reportClient.getAnimalHeatPie(body); } return null; @@ -164,6 +164,23 @@ } /** * 获取包裹统计数据 * @param beanName 调用名称 * @param dataName 返回数据名称 * @param map map集合数据 * @return */ @PostMapping("getParcelPie") public List<ReportReturnData> getParcelPie(String beanName, String dataName, Map<String,Object> map){ //将map转换为json对象 String body = JSON.toJSONString(map); if (null!=beanName){ return reportClient.getParcelPie(body); } return null; } /** * 获取违禁品数据集合 * @param beanName 调用名称 * @param dataName 返回数据名称 @@ -180,6 +197,24 @@ } /** * 获取违禁品统计数据 * @param beanName 调用名称 * @param dataName 返回数据名称 * @param map map集合数据 * @return */ @PostMapping("getParcelKindPie") public List<ReportReturnData> getParcelKindPie(String beanName, String dataName, Map<String,Object> map){ //将map转换为json对象 String body = JSON.toJSONString(map); if (null!=beanName){ return reportClient.getParcelKindPie(body); } return null; }
@@ -108,8 +108,7 @@ //创建对象，并封装数据 HealthcodeVO healthcodeVO = getHealthcodeVo(map); //查询数据并返回数据 List<HealthcodeExcel> excelList = ihealthcodeService.getHealthcodePie(healthcodeVO); return excelList; return ihealthcodeService.getHealthcodePie(healthcodeVO); } /** @@ -145,8 +144,7 @@ //创建对象，并封装数据 AnimalHeatVo animalHeatVo = getAnimalHeatVo(map); //查询数据并返回数据 List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo); return excelList; return animalHeatService.exportAnimalHeat(animalHeatVo); } /** @@ -160,9 +158,7 @@ //创建对象，并封装数据 AnimalHeatVo animalHeatVo = getAnimalHeatVo(map); //查询数据并返回数据 List<ReportReturnData> reportReturnData = animalHeatService.getAnimalHeatPie(animalHeatVo); System.out.println("reportReturnData = " + reportReturnData); return reportReturnData; return animalHeatService.getAnimalHeatPie(animalHeatVo); } /** @@ -198,10 +194,21 @@ //创建对象，并封装数据 ConditionVo conditionVo = getConditionVo(map); //查询数据并返回数据 List<ParcelExcel> excelList = parcelService.exportParcel(conditionVo); System.out.println("conditionVo = " + conditionVo); System.out.println("excelList = " + excelList); return excelList; return parcelService.exportParcel(conditionVo); } /** * 获取包裹数据集合 * @param body map集合数据 * @return */ @PostMapping("getParcelPie") public List<ReportReturnData> getParcelPie(@RequestBody String body){ Map<String,Object> map = JSONObject.parseObject(body); //创建对象，并封装数据 ConditionVo conditionVo = getConditionVo(map); //查询数据并返回数据 return null; } /** blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
@@ -237,10 +237,10 @@ <!--导出健康码数据表格--> <select id="exportHealthcode" resultType="org.springblade.common.entity.HealthcodeExcel"> SELECT * FROM healthcode where 1=1 <if test="healthcodeVO.type!=null and healthcodeVO.type!='undefined' "> and type=#{healthcodeVO.type} </if> where 1=1 <include refid="detailCondition"></include> ORDER BY dtime desc </select> blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -116,9 +116,9 @@ */ @GetMapping("/export-parcelKind") public void exportParcelKind(ConditionVo conditionVo, HttpServletResponse response){ List<ParcelKindExcel> list = parcelService.exportParcelKind(conditionVo); System.out.println("list = " + list); ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", list, ParcelKindExcel.class); List<ParcelKindExcel> parcelKindExcelList = parcelService.exportParcelKind(conditionVo); System.out.println("parcelKindExcelList = " + parcelKindExcelList); ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", parcelKindExcelList, ParcelKindExcel.class); }
@@ -684,6 +684,7 @@ */ @Override public List<ParcelExcel> exportParcel(ConditionVo conditionVo) { System.out.println("conditionVo = " + conditionVo); ArrayList<List<ParcelExcel>> parcelExcelList = new ArrayList<>(); //设置页码数 conditionVo.setCurrentPage(1); @@ -721,7 +722,6 @@ */ @Override public List<ParcelKindExcel> exportParcelKind(ConditionVo conditionVo) { System.out.println("conditionVo = " + conditionVo); List<List<ParcelKindExcel>> parcelKindExcelList = new ArrayList<>(); List<ParcelKindExcel> list = new ArrayList<>(); if(null!=conditionVo.getTimeDesc() && conditionVo.getTimeDesc()!="" && !conditionVo.getTimeDesc().equals("undefined") ){ @@ -780,7 +780,8 @@ } } //合并集合并返回 return parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList()); List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList()); return parcelKindExcels; } } return null;
