预警数量统计接口修改，预警数量分布接口修改，预警分类占比接口新增

Administrator

2021-04-06 abbaf2374fff7d02ecc3eecd6bf62504fbf27c4b

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

@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.aspectj.weaver.patterns.Declare;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -380,7 +381,7 @@
    * @return
    */
   @GetMapping("/selectAlertScount")
   public R selectAlertScount(HttpServletResponse response) {
   public R selectAlertScount(HttpServletResponse response,ConditionVo conditionVo) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
@@ -392,25 +393,48 @@
      //获取类型集合数据
      String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
      types = Arrays.asList(type);
      //获取时间集合数据(今天及今天之前6天的日期)
      times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
      //1.统计7天内一键求助警情数量数据    3-20 修改展示紧急求助
      Map<String,Object> alarmData = alarmService.selectAlarmData();
      alarmData.put("name","一键求助");
      //2.统计7天内违禁品的数量数据
      Map<String,Object> parcelData = parcelService.selectParcelData();
      parcelData.put("name","违禁品");
      //3.统计7天内红色健康码人数数量数据
      Map<String,Object> healthcodeData = ihealthcodeService.selectHealthcodeData();
      healthcodeData.put("name","红色健康码");
      //4.统计7天内体温异常人数数量数据
      Map<String,Object> animalData = animalHeatService.selectAnimalData();
      animalData.put("name","体温异常");
      //封装数据
      dataList.add(alarmData);
      dataList.add(parcelData);
      dataList.add(healthcodeData);
      dataList.add(animalData);
      if (null!=conditionVo){
         //获取时间集合数据
         times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime());
         //1.统计时间段内一键求助警情数量数据    3-20 修改展示紧急求助
         Map<String, Object> alarmData = alarmService.selectAlarmData();
         alarmData.put("name", "一键求助");
         //2.统计时间段内违禁品的数量数据
         Map<String, Object> parcelData = parcelService.selectParcelData(conditionVo);
         parcelData.put("name", "违禁品");
         //3.统计时间段内红色健康码人数数量数据
         Map<String, Object> healthcodeData = ihealthcodeService.selectHealthcodeData();
         healthcodeData.put("name", "红色健康码");
         //4.统计时间段内体温异常人数数量数据
         Map<String, Object> animalData = animalHeatService.selectAnimalData();
         animalData.put("name", "体温异常");
         //封装数据
         dataList.add(alarmData);
         dataList.add(parcelData);
         dataList.add(healthcodeData);
         dataList.add(animalData);
      }else {
         //获取时间集合数据(今天及今天之前6天的日期)
         times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
         //1.统计7天内一键求助警情数量数据    3-20 修改展示紧急求助
         Map<String, Object> alarmData = alarmService.selectAlarmData();
         alarmData.put("name", "一键求助");
         //2.统计7天内违禁品的数量数据
         conditionVo.setStatus(1);
         Map<String, Object> parcelData = parcelService.selectParcelData(conditionVo);
         parcelData.put("name", "违禁品");
         //3.统计7天内红色健康码人数数量数据
         Map<String, Object> healthcodeData = ihealthcodeService.selectHealthcodeData();
         healthcodeData.put("name", "红色健康码");
         //4.统计7天内体温异常人数数量数据
         Map<String, Object> animalData = animalHeatService.selectAnimalData();
         animalData.put("name", "体温异常");
         //封装数据
         dataList.add(alarmData);
         dataList.add(parcelData);
         dataList.add(healthcodeData);
         dataList.add(animalData);
      }
      map.put("types",types);
      map.put("times",times);
      map.put("dataList",dataList);
@@ -487,4 +511,40 @@
      return R.data(lists);
   }


   /**
    * 警情日平均占比
    * @param response 跨域配置
    * @param conditionVo 条件
    * @return
    */
   @GetMapping("/selAlarmDayAveragePro")
   public R selAlarmDayAveragePro(HttpServletResponse response,ConditionVo conditionVo) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      List<Integer> list = new ArrayList<>();
      //获取时间天数
      if (null!= conditionVo.getStartTime() && conditionVo.getStartTime()!=""
         && null!=conditionVo.getEndTime() && conditionVo.getEndTime()!="") {
         int times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime()).size();
         //查询当前时间段一键求助报警总次数
         int alarmTimeCount = alarmService.selAlarmTimeCount(conditionVo);
         //查询当前时间段违禁品总个数
         int parcelTimeCount = parcelService.selParcelTimeCount(conditionVo);
         //查询当前时间段红色健康码总个数
         int healthcodeTimeCount = ihealthcodeService.selHealthcodeTimeCount(conditionVo);
         //查询当前时间段体温异常总次数
         int animalTimeCount = animalHeatService.selAnimalTimeCount(conditionVo);
         //封装数据
         list.add(alarmTimeCount);
         list.add(parcelTimeCount);
         list.add(healthcodeTimeCount);
         list.add(animalTimeCount);
         //返回数据
         return R.data(list);
      }
      return null;
   }

}