首页-信息统计

business-service/src/main/java/com/ozs/mapper/BaseTerminalMapper.java

@@ -3,6 +3,8 @@ package com.ozs.mapper;
 import com.ozs.entity.BaseTerminal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  * <p>
  * 机车车载终端信息表 Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BaseTerminalMapper extends BaseMapper<BaseTerminal> {
 
+    Map<String, Integer> getMessageStatisticsTerminal();
 }

business-service/src/main/java/com/ozs/service/BaseTerminalService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +30,6 @@ public interface BaseTerminalService extends IService<BaseTerminal> {
     String importBaseVehicleTerminal(List<BaseTerminal> accountManageList, boolean updateSupport, String userId);
 
     List<BaseTerminal> exportBaseVehicleTerminal(BaseTerminal baseVehicleTerminal);
+
+    Map<String, Integer> getMessageStatisticsTerminal();
 }

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import javax.validation.Validator;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -195,4 +196,9 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
         }
         return baseVehicleTerminalList;
     }
+
+    @Override
+    public Map<String, Integer> getMessageStatisticsTerminal() {
+        return baseTerminalMapper.getMessageStatisticsTerminal();
+    }
 }

business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -35,9 +35,9 @@
     </select>
 
     <select id="getMessageStatisticsCamera" resultType="java.util.Map">
-        select count(id) countAll,
-            SUM(CASE online WHEN '0' THEN 1 ELSE 0 end) AS offline,
-            SUM(CASE online WHEN '1' THEN 1 ELSE 0 end) AS online
+        select count(id) countAllCamera,
+            SUM(CASE online WHEN '0' THEN 1 ELSE 0 end) AS offlineCamera,
+            SUM(CASE online WHEN '1' THEN 1 ELSE 0 end) AS onlineCamera
         from base_camera_management
     </select>
 </mapper>

business-service/src/main/resources/mapper/BaseTerminalMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.mapper.BaseTerminalMapper">
 
+    <select id="getMessageStatisticsTerminal" resultType="java.util.Map">
+        select count(id) countAllTerminal,
+               SUM(CASE status WHEN '1' THEN 1 ELSE 0 end) AS offlineTerminal,
+               SUM(CASE status WHEN '2' THEN 1 ELSE 0 end) AS onlineTerminal
+        from base_terminal
+    </select>
 </mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java

@@ -62,10 +62,14 @@ public class DataStatisticController extends BaseController {
      */
     @ApiOperation(value = "查询相机总数，在线离线数量；车载终端总数，在线离线数量")
     @PostMapping("/getMessageStatistics")
-    // @Log(title = "查询相机总数，在线离线数量；车载终端总数，在线离线数量", businessType = BusinessType.SELECT)
+    @Log(title = "首页-信息统计", businessType = BusinessType.SELECT)
     public AjaxResult getMessageStatistics() {
         Map<String, Integer> cameraCount = baseCameraManagementService.getMessageStatisticsCamera();
-        return AjaxResult.success(cameraCount);
+        Map<String, Integer> terminalCount = baseTerminalService.getMessageStatisticsTerminal();
+        Map<String, Integer> mapAll = new HashMap<>();
+        mapAll.putAll(cameraCount);
+        mapAll.putAll(terminalCount);
+        return AjaxResult.success(mapAll);
     }
 
     /**