diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 551a37a7..b58605f4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -192,3 +192,10 @@ iot: # 允许访问的ip地址 allowed: ips: 10.0.111.11,10.168.73.54,10.168.71.194 + # Kafka配置 +kafka: + bootstrap-servers: 10.0.111.11:9092 + producer: + key-serializer: org.apache.kafka.common.serialization.StringSerializer + value-serializer: org.apache.kafka.common.serialization.StringSerializer + topic: eventAi diff --git a/zc-business/pom.xml b/zc-business/pom.xml index ce688960..e5adad4b 100644 --- a/zc-business/pom.xml +++ b/zc-business/pom.xml @@ -101,7 +101,10 @@ com.ruoyi ruoyi-quartz - + + org.springframework.kafka + spring-kafka + org.jsoup jsoup diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java index f51905e0..24aaff80 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficSurveyDataController.java @@ -335,13 +335,22 @@ public class DcTrafficSurveyDataController extends BaseController return dcTrafficSurveyDataService.selectDcTrafficSurveyDataList(dcTrafficSurveyData); } + /** + * 查询一类交调数据列表 + */ + @GetMapping("/listNew") + public AjaxResult listNew(DcTrafficSurveyData dcTrafficSurveyData) + { + return dcTrafficSurveyDataService.selectDcTrafficSurveyDataListNew(dcTrafficSurveyData); + } + /** * 导出一类交调数据列表 */ @Log(title = "一类交调数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, DcTrafficSurveyData dcTrafficSurveyData) throws IOException { - AjaxResult ajaxResult = dcTrafficSurveyDataService.selectDcTrafficSurveyDataList(dcTrafficSurveyData); + AjaxResult ajaxResult = dcTrafficSurveyDataService.selectDcTrafficSurveyDataListNew(dcTrafficSurveyData); if (ajaxResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) { Map data = (Map) ajaxResult.get("data"); List> columnList = (List>) data.get("columnList"); @@ -407,15 +416,7 @@ public class DcTrafficSurveyDataController extends BaseController cell.setCellStyle(dataStyle); cell = subHeaderRow.createCell(UniversalEnum.ONE.getNumber()); String direction = rowList.get(j).get("direction").toString(); - String directionStr = "济南方向"; - if (direction.equals("1")){ - directionStr = "济南方向"; - } else if (direction.equals("2")){ - directionStr = "合计"; - } else if (direction.equals("3")){ - directionStr = "菏泽方向"; - } - cell.setCellValue(directionStr); + cell.setCellValue(direction); cell.setCellStyle(dataStyle); int k = 0; for (k = 0; k < columnList.size(); k++) { diff --git a/zc-business/src/main/java/com/zc/business/domain/DcTrafficSurveyData.java b/zc-business/src/main/java/com/zc/business/domain/DcTrafficSurveyData.java index 3340aff8..22c08747 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcTrafficSurveyData.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcTrafficSurveyData.java @@ -114,6 +114,15 @@ public class DcTrafficSurveyData extends BaseEntity private String times; + /** 数据类型 1:全部 2:分方向 3:分车型 */ + private String rowType; + + /** 客车 */ + private Integer bus; + + /** 货车 */ + private Integer goodsCar; + public void setId(Long id) { this.id = id; @@ -369,6 +378,30 @@ public class DcTrafficSurveyData extends BaseEntity this.endTime = endTime; } + public String getRowType() { + return rowType; + } + + public void setRowType(String rowType) { + this.rowType = rowType; + } + + public Integer getBus() { + return bus; + } + + public void setBus(Integer bus) { + this.bus = bus; + } + + public Integer getGoodsCar() { + return goodsCar; + } + + public void setGoodsCar(Integer goodsCar) { + this.goodsCar = goodsCar; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java index f9e8c0c6..ce7a5f41 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java +++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java @@ -6,16 +6,21 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.google.gson.Gson; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.spring.SpringUtils; import com.zc.business.constant.RedisKeyConstants; import com.zc.business.domain.DcDevice; import com.zc.business.domain.DcMeteorologicalDetectorData; import com.zc.business.domain.DcWarning; import com.zc.business.domain.MdDeviceData; import com.zc.business.enums.*; +import com.zc.business.message.device.subscribe.KafkaTopicProducer; import com.zc.business.service.*; import com.zc.common.core.websocket.WebSocketService; import com.zc.common.core.websocket.constant.WebSocketEvent; +import org.apache.catalina.security.SecurityUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -64,6 +69,7 @@ public class DeviceMessageHandler { private IDcMeteorologicalDetectorDataService meteorologicalDetectorDataService; + /** * 更新设备状态 * @@ -355,13 +361,25 @@ public class DeviceMessageHandler { combinedData.put("address", otherConfig);*/ dcWarning.setOtherConfig(otherConfig.toString()); //异常天气等级 过滤 + KafkaTopicProducer kafkaTopicProducer = SpringUtils.getBean(KafkaTopicProducer.class); if (data.getInteger("warningType") == VISIBILITY_LEVEL) { int WarningLevel = data.getInteger("visibilityLevel"); if (WarningLevel != UniversalEnum.ZERO.getNumber()) { dcWarningService.insertDcWarning(dcWarning); + //kafka消息推送 + // 使用Gson将对象转换为JSON字符串 + Gson gson = new Gson(); + String jsonString = gson.toJson(dcWarning); + kafkaTopicProducer.KafkaTopicProducer(jsonString); } } else { dcWarningService.insertDcWarning(dcWarning); + //kafka消息推送 + // 使用Gson将对象转换为JSON字符串 + Gson gson = new Gson(); + String jsonString = gson.toJson(dcWarning); + kafkaTopicProducer.KafkaTopicProducer(jsonString); + } } @@ -727,4 +745,5 @@ public class DeviceMessageHandler { middleDatabaseService.insertMiddleDatabaseDeviceData(mdDeviceData); } + } diff --git a/zc-business/src/main/java/com/zc/business/message/device/subscribe/KafkaTopicProducer.java b/zc-business/src/main/java/com/zc/business/message/device/subscribe/KafkaTopicProducer.java new file mode 100644 index 00000000..5827937d --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/message/device/subscribe/KafkaTopicProducer.java @@ -0,0 +1,55 @@ +package com.zc.business.message.device.subscribe; + +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.RecordMetadata; +import org.springframework.beans.factory.annotation.Value; + +import java.util.Properties; +import java.util.concurrent.ExecutionException; + + +/** + * + */ +@Slf4j +public class KafkaTopicProducer { + @Value("${kafka.bootstrap-servers}") + private String servers; + @Value("${kafka.producer.key-serializer}") + private String keySerializer; + @Value("${kafka.producer.value-serializer}") + private String valueSerializer; + @Value("${kafka.producer.topic}") + private String topic; + public void KafkaTopicProducer(String event) { + // 配置生产者的属性 + Properties props = new Properties(); + props.put("bootstrap.servers", servers); // Kafka broker地址 + props.put("key.serializer", keySerializer); + props.put("value.serializer",valueSerializer); + + // 创建Kafka生产者实例 + KafkaProducer producer = new KafkaProducer<>(props); + + /* // 准备要发送的消息 + String topic = "eventAi"; + *//*String key = "key2";*//* + String value = "这是没有key的测试信息";*/ + + try { + // 发送消息，并获取元数据（异步） + // ProducerRecord record = new ProducerRecord<>(topic, key, value); + ProducerRecord record = new ProducerRecord<>(topic, event); + RecordMetadata metadata = producer.send(record).get(); + // 数据信息 + log.info(record.key(), record.value(), metadata.partition(), metadata.offset()); + } catch (ExecutionException | InterruptedException e) { + e.printStackTrace(); + } finally { + // 关闭生产者 + producer.close(); + } + } +} diff --git a/zc-business/src/main/java/com/zc/business/service/IDcTrafficSurveyDataService.java b/zc-business/src/main/java/com/zc/business/service/IDcTrafficSurveyDataService.java index 697fbb75..f78dfc92 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcTrafficSurveyDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcTrafficSurveyDataService.java @@ -34,6 +34,14 @@ public interface IDcTrafficSurveyDataService */ AjaxResult selectDcTrafficSurveyDataList(DcTrafficSurveyData dcTrafficSurveyData); + /** + * 查询一类交调数据列表 + * + * @param dcTrafficSurveyData 一类交调数据 + * @return 一类交调数据集合 + */ + AjaxResult selectDcTrafficSurveyDataListNew(DcTrafficSurveyData dcTrafficSurveyData); + /** * 新增一类交调数据 * diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java index 306d2e67..cf63174d 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficSurveyDataServiceImpl.java @@ -83,7 +83,7 @@ public class DcTrafficSurveyDataServiceImpl implements IDcTrafficSurveyDataServi //单个设备济南方向数据 row = new HashMap<>(); row.put("stakeMark",dcDevice.getStakeMark()); - row.put("direction","1"); + row.put("direction","3"); //单个设备合计数据 Map totalRow = new HashMap<>(); @@ -94,10 +94,10 @@ public class DcTrafficSurveyDataServiceImpl implements IDcTrafficSurveyDataServi totalRow.put("total",0); } - if (directionData.containsKey("1")){ + if (directionData.containsKey("3")){ Integer total = 0; //单个设备济南方向分时数据 - Map> directionList = directionData.get("1"); + Map> directionList = directionData.get("3"); for (Map columnMap : columnList) { if (directionList.containsKey(columnMap.get("key"))){ List timeList = directionList.get(columnMap.get("key")); @@ -121,11 +121,11 @@ public class DcTrafficSurveyDataServiceImpl implements IDcTrafficSurveyDataServi //单个设备菏泽方向数据 row = new HashMap<>(); row.put("stakeMark",dcDevice.getStakeMark()); - row.put("direction","3"); - if (directionData.containsKey("3")){ + row.put("direction","1"); + if (directionData.containsKey("1")){ Integer total = 0; //单个设备菏泽方向分时数据 - Map> directionList = directionData.get("3"); + Map> directionList = directionData.get("1"); for (Map columnMap : columnList) { if (directionList.containsKey(columnMap.get("key"))){ List timeList = directionList.get(columnMap.get("key")); @@ -185,6 +185,545 @@ public class DcTrafficSurveyDataServiceImpl implements IDcTrafficSurveyDataServi } + /** + * 查询一类交调数据列表 + * + * @param dcTrafficSurveyData 一类交调数据 + * @return 一类交调数据 + */ + @Override + public AjaxResult selectDcTrafficSurveyDataListNew(DcTrafficSurveyData dcTrafficSurveyData) + { + List> rowList = new ArrayList<>(); + List> columnList = getColumnList(dcTrafficSurveyData); + List dataList = new ArrayList<>(); + if (dcTrafficSurveyData.getType().equals("day")){ + dataList = dcTrafficSurveyDataMapper.selectDay(dcTrafficSurveyData); + } else if (dcTrafficSurveyData.getType().equals("month")){ + dataList = dcTrafficSurveyDataMapper.selectMonth(dcTrafficSurveyData); + } else if (dcTrafficSurveyData.getType().equals("year")){ + dataList = dcTrafficSurveyDataMapper.selectYear(dcTrafficSurveyData); + } else if (dcTrafficSurveyData.getType().equals("range")){ + dataList = dcTrafficSurveyDataMapper.selectRange(dcTrafficSurveyData); + } + Map>>> groupedData = dataList.stream() + .collect(Collectors.groupingBy( + DcTrafficSurveyData::getIotDeviceId, // 第一级分组：按设备Id + Collectors.groupingBy(DcTrafficSurveyData::getDirection, // 第二级分组：按方向 + Collectors.groupingBy(DcTrafficSurveyData::getTimes) // 第三级分组：按时间 + ))); + List deviceList = dcTrafficSurveyDataMapper.selectDeviceList(); + + Map row = new HashMap<>(); + for (DcDevice dcDevice : deviceList) { + if (groupedData.containsKey(dcDevice.getIotDeviceId())){ + + Map>> directionData = groupedData.get(dcDevice.getIotDeviceId()); + + if (dcTrafficSurveyData.getRowType().equals("1")){ + //单个设备济南方向数据 + row = new HashMap<>(); + row.put("stakeMark",dcDevice.getStakeMark()); + row.put("direction","济南"); + + //单个设备客车数据 + Map busRow = new HashMap<>(); + busRow.put("stakeMark",dcDevice.getStakeMark()); + busRow.put("direction","客车"); + for (Map columnMap : columnList) { + busRow.put(columnMap.get("key"),0); + busRow.put("total",0); + } + + //单个设备货车数据 + Map goodsCarRow = new HashMap<>(); + goodsCarRow.put("stakeMark",dcDevice.getStakeMark()); + goodsCarRow.put("direction","货车"); + for (Map columnMap : columnList) { + goodsCarRow.put(columnMap.get("key"),0); + goodsCarRow.put("total",0); + } + + //单个设备合计数据 + Map totalRow = new HashMap<>(); + totalRow.put("stakeMark",dcDevice.getStakeMark()); + totalRow.put("direction","合计"); + for (Map columnMap : columnList) { + totalRow.put(columnMap.get("key"),0); + totalRow.put("total",0); + } + + if (directionData.containsKey("3")){ + Integer bus = 0; + Integer goodsCar = 0; + Integer total = 0; + //单个设备济南方向分时数据 + Map> directionList = directionData.get("3"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + row.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + busRow.put(columnMap.get("key"),timeList.get(0).getBus()); + goodsCarRow.put(columnMap.get("key"),timeList.get(0).getGoodsCar()); + totalRow.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + bus += timeList.get(0).getBus(); + goodsCar += timeList.get(0).getGoodsCar(); + total += timeList.get(0).getTrafficVolume().intValue(); + } else { + row.put(columnMap.get("key"),0); + } + } + row.put("total",total); + busRow.put("total",bus); + goodsCarRow.put("total",goodsCar); + totalRow.put("total",total); + } else { + for (Map columnMap : columnList) { + row.put(columnMap.get("key"),0); + row.put("total",0); + } + } + rowList.add(row); + + //单个设备菏泽方向数据 + row = new HashMap<>(); + row.put("stakeMark",dcDevice.getStakeMark()); + row.put("direction","菏泽"); + if (directionData.containsKey("1")){ + Integer bus = 0; + Integer goodsCar = 0; + Integer total = 0; + //单个设备菏泽方向分时数据 + Map> directionList = directionData.get("1"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + row.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + Long busRowData = Long.parseLong(busRow.get(columnMap.get("key")).toString()); + busRow.put(columnMap.get("key"),busRowData + timeList.get(0).getBus()); + Long goodsCarRowData = Long.parseLong(goodsCarRow.get(columnMap.get("key")).toString()); + goodsCarRow.put(columnMap.get("key"),goodsCarRowData + timeList.get(0).getGoodsCar()); + Long totalRowData = Long.parseLong(totalRow.get(columnMap.get("key")).toString()); + totalRow.put(columnMap.get("key"),totalRowData + timeList.get(0).getTrafficVolume()); + bus += timeList.get(0).getBus(); + goodsCar += timeList.get(0).getGoodsCar(); + total += timeList.get(0).getTrafficVolume().intValue(); + } else { + row.put(columnMap.get("key"),0); + } + } + row.put("total",total); + busRow.put("total",Integer.parseInt(busRow.get("total").toString()) + bus); + goodsCarRow.put("total",Integer.parseInt(goodsCarRow.get("total").toString()) + goodsCar); + totalRow.put("total",Integer.parseInt(totalRow.get("total").toString()) + total); + } else { + for (Map columnMap : columnList) { + row.put(columnMap.get("key"),0); + row.put("total",0); + } + } + rowList.add(row); + + //客车 + rowList.add(busRow); + //客车占比 + Map busRatioRow = new HashMap<>(); + busRatioRow.put("stakeMark",dcDevice.getStakeMark()); + busRatioRow.put("direction","客车占比"); + for (Map columnMap : columnList) { + Integer busTotal = Integer.valueOf(busRow.get(columnMap.get("key")).toString()); + Integer total = Integer.valueOf(totalRow.get(columnMap.get("key")).toString()); + if (total > 0){ + busRatioRow.put(columnMap.get("key"),String.format("%.2f",(double) busTotal / total * 100) + "%"); + } else { + busRatioRow.put(columnMap.get("key"),"0.00%"); + } + } + Integer allBusTotal = Integer.valueOf(busRow.get("total").toString()); + Integer allTotal = Integer.valueOf(totalRow.get("total").toString()); + if (allTotal > 0){ + busRatioRow.put("total",String.format("%.2f",(double) allBusTotal / allTotal * 100) + "%"); + } else { + busRatioRow.put("total","0.00%"); + } + rowList.add(busRatioRow); + + //货车 + rowList.add(goodsCarRow); + //货车占比 + Map goodsCarRatioRow = new HashMap<>(); + goodsCarRatioRow.put("stakeMark",dcDevice.getStakeMark()); + goodsCarRatioRow.put("direction","货车占比"); + for (Map columnMap : columnList) { + Integer goodsCarTotal = Integer.valueOf(goodsCarRow.get(columnMap.get("key")).toString()); + Integer total = Integer.valueOf(totalRow.get(columnMap.get("key")).toString()); + if (total > 0) { + goodsCarRatioRow.put(columnMap.get("key"), String.format("%.2f", (double) goodsCarTotal / total * 100) + "%"); + } else { + goodsCarRatioRow.put(columnMap.get("key"),"0.00%"); + } + } + Integer allGoodsCarTotal = Integer.valueOf(goodsCarRow.get("total").toString()); + if (allTotal > 0){ + goodsCarRatioRow.put("total",String.format("%.2f",(double) allGoodsCarTotal / allTotal * 100) + "%"); + } else { + goodsCarRatioRow.put("total","0.00%"); + } + rowList.add(goodsCarRatioRow); + + + //最后加入合计 + rowList.add(totalRow); + } else if (dcTrafficSurveyData.getRowType().equals("2")){ + //单个设备济南方向数据 + row = new HashMap<>(); + row.put("stakeMark",dcDevice.getStakeMark()); + row.put("direction","济南"); + + //单个设备合计数据 + Map totalRow = new HashMap<>(); + totalRow.put("stakeMark",dcDevice.getStakeMark()); + totalRow.put("direction","合计"); + for (Map columnMap : columnList) { + totalRow.put(columnMap.get("key"),0); + totalRow.put("total",0); + } + + if (directionData.containsKey("3")){ + Integer total = 0; + //单个设备济南方向分时数据 + Map> directionList = directionData.get("3"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + row.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + totalRow.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + total += timeList.get(0).getTrafficVolume().intValue(); + } else { + row.put(columnMap.get("key"),0); + } + } + row.put("total",total); + totalRow.put("total",total); + } else { + for (Map columnMap : columnList) { + row.put(columnMap.get("key"),0); + row.put("total",0); + } + } + rowList.add(row); + + //单个设备菏泽方向数据 + row = new HashMap<>(); + row.put("stakeMark",dcDevice.getStakeMark()); + row.put("direction","菏泽"); + if (directionData.containsKey("1")){ + Integer total = 0; + //单个设备菏泽方向分时数据 + Map> directionList = directionData.get("1"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + row.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + Long totalRowData = Long.parseLong(totalRow.get(columnMap.get("key")).toString()); + totalRow.put(columnMap.get("key"),totalRowData + timeList.get(0).getTrafficVolume()); + total += timeList.get(0).getTrafficVolume().intValue(); + } else { + row.put(columnMap.get("key"),0); + } + } + row.put("total",total); + totalRow.put("total",Integer.parseInt(totalRow.get("total").toString()) + total); + } else { + for (Map columnMap : columnList) { + row.put(columnMap.get("key"),0); + row.put("total",0); + } + } + rowList.add(row); + + //最后加入合计 + rowList.add(totalRow); + } else { + + //单个设备客车数据 + Map busRow = new HashMap<>(); + busRow.put("stakeMark",dcDevice.getStakeMark()); + busRow.put("direction","客车"); + for (Map columnMap : columnList) { + busRow.put(columnMap.get("key"),0); + busRow.put("total",0); + } + + //单个设备货车数据 + Map goodsCarRow = new HashMap<>(); + goodsCarRow.put("stakeMark",dcDevice.getStakeMark()); + goodsCarRow.put("direction","货车"); + for (Map columnMap : columnList) { + goodsCarRow.put(columnMap.get("key"),0); + goodsCarRow.put("total",0); + } + + //单个设备合计数据 + Map totalRow = new HashMap<>(); + totalRow.put("stakeMark",dcDevice.getStakeMark()); + totalRow.put("direction","合计"); + for (Map columnMap : columnList) { + totalRow.put(columnMap.get("key"),0); + totalRow.put("total",0); + } + + if (directionData.containsKey("3")){ + Integer bus = 0; + Integer goodsCar = 0; + Integer total = 0; + //单个设备济南方向分时数据 + Map> directionList = directionData.get("3"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + busRow.put(columnMap.get("key"),timeList.get(0).getBus()); + goodsCarRow.put(columnMap.get("key"),timeList.get(0).getGoodsCar()); + totalRow.put(columnMap.get("key"),timeList.get(0).getTrafficVolume()); + bus += timeList.get(0).getBus(); + goodsCar += timeList.get(0).getGoodsCar(); + total += timeList.get(0).getTrafficVolume().intValue(); + } + } + busRow.put("total",bus); + goodsCarRow.put("total",goodsCar); + totalRow.put("total",total); + } + + //单个设备菏泽方向数据 + if (directionData.containsKey("1")){ + Integer bus = 0; + Integer goodsCar = 0; + Integer total = 0; + //单个设备菏泽方向分时数据 + Map> directionList = directionData.get("1"); + for (Map columnMap : columnList) { + if (directionList.containsKey(columnMap.get("key"))){ + List timeList = directionList.get(columnMap.get("key")); + Long busRowData = Long.parseLong(busRow.get(columnMap.get("key")).toString()); + Long goodsCarRowData = Long.parseLong(goodsCarRow.get(columnMap.get("key")).toString()); + Long totalRowData = Long.parseLong(totalRow.get(columnMap.get("key")).toString()); + busRow.put(columnMap.get("key"),busRowData + timeList.get(0).getBus()); + goodsCarRow.put(columnMap.get("key"),goodsCarRowData + timeList.get(0).getGoodsCar()); + totalRow.put(columnMap.get("key"),totalRowData + timeList.get(0).getTrafficVolume()); + bus += timeList.get(0).getBus(); + goodsCar += timeList.get(0).getGoodsCar(); + total += timeList.get(0).getTrafficVolume().intValue(); + } + } + busRow.put("total",Integer.parseInt(busRow.get("total").toString()) + bus); + goodsCarRow.put("total",Integer.parseInt(goodsCarRow.get("total").toString()) + goodsCar); + totalRow.put("total",Integer.parseInt(totalRow.get("total").toString()) + total); + } + + //客车 + rowList.add(busRow); + //客车占比 + Map busRatioRow = new HashMap<>(); + busRatioRow.put("stakeMark",dcDevice.getStakeMark()); + busRatioRow.put("direction","客车占比"); + for (Map columnMap : columnList) { + Integer busTotal = Integer.valueOf(busRow.get(columnMap.get("key")).toString()); + Integer total = Integer.valueOf(totalRow.get(columnMap.get("key")).toString()); + if (total > 0){ + busRatioRow.put(columnMap.get("key"),String.format("%.2f",(double) busTotal / total * 100) + "%"); + } else { + busRatioRow.put(columnMap.get("key"),"0.00%"); + } + } + Integer allBusTotal = Integer.valueOf(busRow.get("total").toString()); + Integer allTotal = Integer.valueOf(totalRow.get("total").toString()); + if (allTotal > 0){ + busRatioRow.put("total",String.format("%.2f",(double) allBusTotal / allTotal * 100) + "%"); + } else { + busRatioRow.put("total","0.00%"); + } + rowList.add(busRatioRow); + + //货车 + rowList.add(goodsCarRow); + //货车占比 + Map goodsCarRatioRow = new HashMap<>(); + goodsCarRatioRow.put("stakeMark",dcDevice.getStakeMark()); + goodsCarRatioRow.put("direction","货车占比"); + for (Map columnMap : columnList) { + Integer goodsCarTotal = Integer.valueOf(goodsCarRow.get(columnMap.get("key")).toString()); + Integer total = Integer.valueOf(totalRow.get(columnMap.get("key")).toString()); + if (total > 0) { + goodsCarRatioRow.put(columnMap.get("key"), String.format("%.2f", (double) goodsCarTotal / total * 100) + "%"); + } else { + goodsCarRatioRow.put(columnMap.get("key"),"0.00%"); + } + } + Integer allGoodsCarTotal = Integer.valueOf(goodsCarRow.get("total").toString()); + if (allTotal > 0){ + goodsCarRatioRow.put("total",String.format("%.2f",(double) allGoodsCarTotal / allTotal * 100) + "%"); + } else { + goodsCarRatioRow.put("total","0.00%"); + } + rowList.add(goodsCarRatioRow); + + + //最后加入合计 + rowList.add(totalRow); + } + + + + } else { + if (dcTrafficSurveyData.getRowType().equals("1")){ + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "济南"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "菏泽"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "客车"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "客车占比"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "货车"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "货车占比"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + //单个设备合计数据 + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "合计"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + } else if (dcTrafficSurveyData.getRowType().equals("2")) { + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "济南"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "菏泽"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + //单个设备合计数据 + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "合计"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + } else { + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "客车"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "客车占比"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "货车"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "货车占比"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + + //单个设备合计数据 + row = new HashMap<>(); + row.put("stakeMark", dcDevice.getStakeMark()); + row.put("direction", "合计"); + for (Map columnMap : columnList) { + row.put(columnMap.get("key"), 0); + } + row.put("total", 0); + rowList.add(row); + } + } + } + Map result = new HashMap<>(); + result.put("rowList",rowList); + result.put("columnList",columnList); + return AjaxResult.success(result); + + } + public List> getColumnList(DcTrafficSurveyData dcTrafficSurveyData){ List> columnList = new ArrayList<>(); Map column; diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficSurveyDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficSurveyDataMapper.xml index f9cb186b..18d1ad74 100644 --- a/zc-business/src/main/resources/mapper/business/DcTrafficSurveyDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcTrafficSurveyDataMapper.xml @@ -44,25 +44,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM `dc_device` where device_type = '11' and iot_device_id is not null