提交了

ruoyi-ui/vue.config.js

@@ -41,8 +41,8 @@ module.exports = {
       //   }
       // },   
       '/jhapi':{
-        target: `http://62.234.3.186/jhapi/`,
+        //target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoAiBoxController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.text.Convert;
 import com.yanzhu.jh.video.domain.DevAiProjectData;
+import com.yanzhu.jh.video.domain.SurProjectVideoConfig;
 import com.yanzhu.jh.video.service.IDevAiProjectDataService;
 import com.yanzhu.jh.video.service.ISurProjectVideoConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,4 +70,21 @@ public class VideoAiBoxController extends BaseController {
         }
         return success(surProjectVideoConfigService.selectSurProjectVideoConfigByParams(map));
     }
+
+    /**
+     * 查询视频配置列表
+     */
+    @GetMapping("/groupCountByAlarmType")
+    public AjaxResult groupCountByAlarmType(String deptId,String projectId)
+    {
+        DevAiProjectData devAiProjectData = new DevAiProjectData();
+        if(deptId!=null && !"0".equals(deptId)){
+            devAiProjectData.setProjectDeptId(deptId);
+        }
+        if(projectId!=null && !"0".equals(projectId)){
+            devAiProjectData.setProjectId(Convert.toLong(projectId));
+        }
+        List<Map<String, Object>> list = devAiProjectDataService.groupCountByAlarmType(devAiProjectData);
+        return success(list);
+    }
 }

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java

@@ -9,7 +9,10 @@ import com.yanzhu.jh.video.service.ISurProjectVideoConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 实时视频Conller
@@ -34,6 +37,10 @@ public class VideoController extends BaseController {
         if(projectId!=null && !"0".equals(projectId)){
             surProjectVideoConfig.setProjectId(Convert.toLong(projectId));
         }
+        //默认查询当天数据
+        Map<String,Object> params = new HashMap<>();
+        params.put("date","Y");
+        surProjectVideoConfig.setParams(params);
         List<SurProjectVideoConfig> list = surProjectVideoConfigService.selectSurProjectVideoConfigList(surProjectVideoConfig);
         return success(list);
     }
@@ -60,4 +67,5 @@ public class VideoController extends BaseController {
     {
         return success(surProjectVideoConfigService.getVideoPassage(videoDvrNumberd));
     }
+
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/DevAiProjectDataMapper.java

@@ -1,6 +1,8 @@
 package com.yanzhu.jh.video.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.yanzhu.jh.video.domain.DevAiProjectData;
 
 /**
@@ -58,4 +60,12 @@ public interface DevAiProjectDataMapper
      * @return 结果
      */
     public int deleteDevAiProjectDataByIds(Long[] ids);
+
+    /**
+     * 设备数据统计
+     *
+     * @param devAiProjectData 查询条件
+     * @return 结果
+     */
+    public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData);
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/IDevAiProjectDataService.java

@@ -1,6 +1,8 @@
 package com.yanzhu.jh.video.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.yanzhu.jh.video.domain.DevAiProjectData;
 import com.yanzhu.jh.video.domain.DevAiProjectDataVO;
 
@@ -67,4 +69,12 @@ public interface IDevAiProjectDataService
      * @return 结果
      */
     public int deleteDevAiProjectDataById(Long id);
+
+    /**
+     * 设备数据统计
+     *
+     * @param devAiProjectData 查询条件
+     * @return 结果
+     */
+    public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData);
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/DevAiProjectDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.yanzhu.jh.video.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.enums.PublicStateEnum;
@@ -197,4 +198,14 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService
         return devAiProjectDataMapper.deleteDevAiProjectDataById(id);
     }
 
+    /**
+     * 设备数据统计
+     *
+     * @param devAiProjectData 查询条件
+     * @return 结果
+     */
+    public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData) {
+        return devAiProjectDataMapper.groupCountByAlarmType(devAiProjectData);
+    }
+
 }

yanzhu-jh/src/main/resources/mapper/video/DevAiProjectDataMapper.xml

@@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
                 and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
             </if>
+            <if test="params.date != null"> and date(dapd.create_time) = date(now())</if>
         </where>
         order by dapd.create_time desc
-        <if test="params.limit != null"> limit #{params.limit}</if>
     </select>
     
     <select id="selectDevAiProjectDataById" parameterType="Long" resultMap="DevAiProjectDataResult">
@@ -79,6 +79,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where dapd.id = #{id}
     </select>
 
+    <select id="groupCountByAlarmType" parameterType="DevAiProjectData" resultType="map">
+        select dapd.alarm_type as alarmType,sdd.dict_label as alarmTypeName, count(1) as sumValue from dev_ai_project_data dapd
+        left join sur_project sp on sp.id=dapd.project_id
+        left join sys_dept sd on sd.dept_id=dapd.dept_id
+        left join sys_dict_data sdd on sdd.dict_type='aibox_alarm_type' and sdd.dict_value=dapd.alarm_type
+        <where>
+            and dapd.is_del='0'
+            <if test="projectId != null "> and dapd.project_id = #{projectId}</if>
+            <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="deptId != null "> and dapd.dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''"> and sd.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deviceName != null  and deviceName != ''"> and dapd.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="alarmType != null "> and dapd.alarm_type = #{alarmType}</if>
+            <if test="plateNo != null "> and dapd.plate_no = #{plateNo}</if>
+            <!-- 查询条件-项目部门 -->
+            <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+            <!--子部门数据-->
+            <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
+            <!--监理单位/总包公司/分包单位查询当前关联数据-->
+            <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and sp.id in (select spui.projectId from sur_project_unit_info spui where spui.unitId = #{nowDept} and spui.del_flag=0 )</if>
+            <!--普通用户查询项目人员-->
+            <if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'>
+                and sp.id in (select spu.project_id from sur_project_userinfo spu where spu.user_id = #{nowUser} and spu.is_del=0)
+            </if>
+        </where>
+    </select>
+        
     <insert id="insertDevAiProjectData" parameterType="DevAiProjectData" useGeneratedKeys="true" keyProperty="id">
         insert into dev_ai_project_data
         <trim prefix="(" suffix=")" suffixOverrides=",">