sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-06-16 22:04:02 +08:00
parent 7172e929b5
commit 0821f9a41b
8 changed files with 110 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -49,7 +49,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh_test_2024?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
password: Sxyanzhu@cf123
#url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8

2
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -111,7 +111,7 @@ spring:
# 数据库索引
database: 1
# 密码
password: aDlasdasasdjHjasasdkqmewqe
password: 123456
# 连接超时时间
timeout: 10s
lettuce:

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

@ -3,6 +3,7 @@ package com.yanzhu.jh.bigscreen.web.controller;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.SysRoleEnum;
@ -14,9 +15,7 @@ import com.yanzhu.jh.video.domain.SurProjectVideoPassage;
import com.yanzhu.jh.video.service.IDevAiProjectDataService;
import com.yanzhu.jh.video.service.ISurProjectVideoConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.HashMap;
@ -79,6 +78,18 @@ public class VideoAiBoxController extends BaseController {
return success(list);
}
/**
* 查询AI预警列表
*/
@PostMapping("/list")
public TableDataInfo list(@RequestBody DevAiProjectData devAiProjectData )
{
devAiProjectData.setActiveName("true");
startPage();
List<DevAiProjectData> list = devAiProjectDataService.selectDevAiProjectDataList(devAiProjectData);
return getDataTable(list);
}
/**
* 获取视频配置详细信息
*/
@ -118,6 +129,26 @@ public class VideoAiBoxController extends BaseController {
return success(list);
}
@GetMapping("/groupCountByProject")
public AjaxResult groupCountByProject(String deptId,String projectId){
DevAiProjectData devAiProjectData = new DevAiProjectData();
devAiProjectData.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(devAiProjectData.getNowRole())){
devAiProjectData.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
devAiProjectData.setNowDept(Convert.toStr(getDeptId()));
}
devAiProjectData.setNowUser(Convert.toStr(getUserId()));
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.groupCountByProject(devAiProjectData);
return success(list);
}
/**
* 查询视频配置列表
*/

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

@ -68,4 +68,10 @@ public interface DevAiProjectDataMapper
* @return 结果
*/
public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData);
/**
* 按项目分组排名
* @param devAiProjectData
* @return
*/
public List<Map<String, Object>> groupCountByProject(DevAiProjectData devAiProjectData);
}

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

@ -77,4 +77,11 @@ public interface IDevAiProjectDataService
* @return 结果
*/
public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData);
/**
* 按项目分组排名
* @param devAiProjectData
* @return
*/
public List<Map<String, Object>> groupCountByProject(DevAiProjectData devAiProjectData);
}

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

@ -207,5 +207,14 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService
public List<Map<String, Object>> groupCountByAlarmType(DevAiProjectData devAiProjectData) {
return devAiProjectDataMapper.groupCountByAlarmType(devAiProjectData);
}
/**
* 按项目分组排名
* @param devAiProjectData
* @return
*/
@Override
public List<Map<String, Object>> groupCountByProject(DevAiProjectData devAiProjectData) {
return devAiProjectDataMapper.groupCountByProject(devAiProjectData);
}
}

3
yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
View File

@ -61,7 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectMyAwaitFlowTask" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="map">
select a.id,sp.id as projectId,sp.projectName,a.approve_status,a.type,a.typeName,u.nick_name,d.dept_name,DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i') as create_time,a.witness_user
select a.id,sp.id as projectId,sp.projectName,a.approve_status,a.type,a.typeName,u.nick_name,
d.dept_name,DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i') as create_time,a.witness_user
from vw_project_audit_all a
left join sur_project sp on sp.id = a.project_id
left JOIN sys_user u on a.create_by = u.user_name

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

@ -81,12 +81,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDevAiProjectDataVo"/>
where dapd.id = #{id}
</select>
<select id="groupCountByProject" parameterType="DevAiProjectData" resultType="map">
select dapd.project_id,sp.projectName, count(1) value
from dev_ai_project_data dapd
LEFT JOIN
sur_project sp ON sp.id = dapd.project_id
<where>
and dapd.project_id is not null and dapd.is_del='0' and sp.progressVisible = 0
<if test="projectId != null "> and dapd.project_id = #{projectId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</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="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>
group by dapd.project_id,sp.projectName
order by count(1) desc
</select>
<select id="groupCountByAlarmType" parameterType="DevAiProjectData" resultType="map">
select dapd.alarm_type as type,sdd.dict_label as name, count(1) as value 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
SELECT
sdd.dict_value AS type,
sdd.dict_label AS name,
COALESCE(dapd.VALUE, 0) AS value
FROM
sys_dict_data sdd
LEFT JOIN (
SELECT
dapd.alarm_type,
COUNT(1) AS VALUE
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
<where>
and dapd.is_del='0' and sp.progressVisible = 0
<if test="projectId != null "> and dapd.project_id = #{projectId}</if>
@ -109,7 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="params.date != null"> and date(dapd.create_time) = date(#{params.date})</if>
</where>
GROUP BY dapd.alarm_type
) dapd ON sdd.dict_value = dapd.alarm_type
WHERE
sdd.dict_type = 'aibox_alarm_type'
GROUP BY
sdd.dict_value, sdd.dict_label
ORDER BY
sdd.dict_value
</select>
<insert id="insertDevAiProjectData" parameterType="DevAiProjectData" useGeneratedKeys="true" keyProperty="id">