Merge remote-tracking branch 'remotes/origin/dev-2.15.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/controller/MonitorAIController.java

@@ -0,0 +1,73 @@
+package com.unis.visualization.modular.grainOilReserve.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.common.pojo.CommonResult;
+import com.unis.reserveLayout.modular.dataSystemInfo.param.DataPageParam;
+import com.unis.visualization.modular.grainOilReserve.service.MonitorAIService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 可视化-粮油储备控制器
+ *
+ * @author TS
+ * @date  2024/06/18 11:08
+ */
+@Api(tags = "可视化-摄像头视频监控")
+@ApiSupport(author = "UNIS_TEAM", order = 1)
+@RestController
+@Validated
+public class MonitorAIController {
+
+    @Resource
+    private MonitorAIService monitorAIService;
+
+
+    /**
+     * 视频AI分析预警-摄像头总数
+     *
+     * @author ZeroLiYi
+     * @date  2024/06/20 11:37
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("监控在线情况统计 - 摄像头总数")
+    @GetMapping("/monitorAI/selectMonitorCount")
+    public CommonResult<Integer> selectMonitorCount() {
+        return CommonResult.data(monitorAIService.selectMonitorCount());
+    }
+
+    /**
+     * 视频AI分析预警-故障摄像头
+     *
+     * @author ZeroLiYi
+     * @date  2024/06/20 11:37
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("监控在线情况统计 - 故障摄像头")
+    @GetMapping("/monitorAI/selectFaultMonitorCount")
+    public CommonResult<Integer> selectFaultMonitorCount() {
+        return CommonResult.data(monitorAIService.selectFaultMonitorCount());
+    }
+    /**
+     * 视频AI分析预警-使用占比
+     *
+     * @author ZeroLiYi
+     * @date  2024/06/20 11:37
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("监控在线情况统计 - 使用占比")
+    @GetMapping("/monitorAI/selectMonitorProportion")
+    public CommonResult<Integer> selectMonitorProportion() {
+        return CommonResult.data(monitorAIService.selectMonitorProportion());
+    }
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/MonitorAIMapper.java

@@ -0,0 +1,13 @@
+package com.unis.visualization.modular.grainOilReserve.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MonitorAIMapper {
+     Integer selectMonitorCount();
+
+
+     Integer selectFaultMonitorCount();
+
+     Integer selectMonitorProportion();
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/mapper/mapping/MonitorAIMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.unis.visualization.modular.grainOilReserve.mapper.MonitorAIMapper">
+
+    <select id="selectMonitorCount" resultType="java.lang.Integer">
+        SELECT COUNT(id) AS totalCameras
+        FROM monitor_camera where isremove=1
+    </select>
+    <select id="selectFaultMonitorCount" resultType="java.lang.Integer">
+        SELECT COUNT(id) AS faultyCameras
+        FROM monitor_camera
+        WHERE isremove=1 and status IN (0, 2)
+
+    </select>
+    <select id="selectMonitorProportion" resultType="java.lang.Integer">
+        SELECT COUNT(id) AS total_cameras
+        FROM monitor_camera where isremove=1 and `status`=1
+    </select>
+</mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/service/MonitorAIService.java

@@ -0,0 +1,13 @@
+package com.unis.visualization.modular.grainOilReserve.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MonitorAIService {
+
+    Integer selectMonitorCount();
+
+    Integer selectFaultMonitorCount();
+
+    Integer selectMonitorProportion();
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainOilReserve/service/impl/MonitorAIServiceImpl.java

@@ -0,0 +1,33 @@
+package com.unis.visualization.modular.grainOilReserve.service.impl;
+
+import com.unis.visualization.modular.grainOilReserve.mapper.MonitorAIMapper;
+import com.unis.visualization.modular.grainOilReserve.service.MonitorAIService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class MonitorAIServiceImpl implements MonitorAIService {
+    @Resource
+    private MonitorAIMapper monitorAIMapper;
+
+    @Override
+    public Integer selectMonitorCount() {
+        return monitorAIMapper.selectMonitorCount();
+    }
+
+    @Override
+    public Integer selectFaultMonitorCount() {
+        return monitorAIMapper.selectFaultMonitorCount();
+    }
+
+    @Override
+    public Integer selectMonitorProportion() {
+        Integer sum = monitorAIMapper.selectMonitorCount();
+       Integer sy = monitorAIMapper.selectMonitorProportion();
+       Integer proportion =sy/sum *100;
+        return proportion;
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/visualization/modular/grainSituationDetection/mapper/mapping/GrainSituationDetectionMapper.xml

@@ -9,22 +9,22 @@
             a.longitude,
             a.latitude,
             b.temp_max,
-                            b.temp_min,
-                            b.temp_avg,
-                            ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,2) as kcsl
+            b.temp_min,
+            b.temp_avg,
+            ROUND(IFNULL(SUM(kcsl),0.0)/1000/10000,2) as kcsl
             FROM
             depot_qh.org_info a
             LEFT JOIN
-                            (SELECT org_id,temp_max,temp_min,temp_avg
-                                FROM (
-                                        SELECT org_id,temp_max,temp_min,temp_avg,
-                                                     ROW_NUMBER() OVER (PARTITION BY org_id ORDER BY gather_time DESC) AS rn
-                                        FROM depot_qh.t_lq_data
-                                ) t
-                                WHERE rn = 1
-                            )
-                             b on a.org_id = b.org_id
-                            LEFT JOIN depot_qh.data_kcgl_kcsw_default c on a.org_id = c.UnitID
+            (SELECT org_id,temp_max,temp_min,temp_avg
+                FROM (
+                        SELECT org_id,temp_max,temp_min,temp_avg,
+                                     ROW_NUMBER() OVER (PARTITION BY org_id ORDER BY gather_time DESC) AS rn
+                        FROM depot_qh.t_lq_data
+                ) t
+                WHERE rn = 1
+            )
+             b on a.org_id = b.org_id
+            LEFT JOIN depot_qh.data_kcgl_kcsw_default c on a.org_id = c.UnitID
             where a.org_id != '9'
             GROUP BY a.org_id
             ORDER BY a.org_id