admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

视频大屏接口bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-21 21:01:57 +08:00
parent 710434995d
commit f0c31272ea
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/video/entity/ProjectVideoHkVqd.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -176,4 +177,7 @@ public class ProjectVideoHkVqd implements Serializable {
@ApiModelProperty(value = "视频设备序列号")
private java.lang.String serialNumber;
@TableField(exist = false)
@ApiModelProperty(value = "视频设备名称")
private java.lang.String videoName;
}

9
src/main/java/com/zhgd/xmgl/modules/video/mapper/ProjectVideoHkVqdMapper.java
View File

@ -1,10 +1,15 @@
package com.zhgd.xmgl.modules.video.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd;
import com.zhgd.xmgl.modules.video.entity.vo.CountQualityVo;
import com.zhgd.xmgl.modules.xz.entity.vo.CountStatusVo;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@ -18,6 +23,10 @@ import java.util.Map;
@Mapper
public interface ProjectVideoHkVqdMapper extends BaseMapper<ProjectVideoHkVqd> {
List<ProjectVideoHkVqd> queryList(@Param(Constants.WRAPPER) QueryWrapper<ProjectVideoHkVqd> queryWrapper);
IPage<ProjectVideoHkVqd> queryList(Page<ProjectVideoHkVqd> page, @Param(Constants.WRAPPER) QueryWrapper<ProjectVideoHkVqd> queryWrapper);
CountQualityVo countQuality(Map<String, Object> param);
List<CountStatusVo> countStatusTrend(Map<String, Object> param);

7
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml
View File

@ -71,6 +71,13 @@
sc_scene_result = -1 or
sc_flash_result = -1, 1, 0)), 0) as notDetectNum
</sql>
<select id="queryList" resultType="com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd">
select t.*,vi.video_name
from project_video_hk_vqd t
left join video_item vi on t.serial_number = vi.serial_number
${ew.customSqlSegment}
</select>
<select id="countQuality" resultType="com.zhgd.xmgl.modules.video.entity.vo.CountQualityVo">
select t.*, ifnull(round(t.normalNum / (t.normalNum + t.exceptionNum) * 100, 2), 0) normalNumRatio
from (select

6
src/main/java/com/zhgd/xmgl/modules/video/service/impl/ProjectVideoHkVqdServiceImpl.java
View File

@ -37,7 +37,7 @@ public class ProjectVideoHkVqdServiceImpl extends ServiceImpl<ProjectVideoHkVqdM
public IPage<ProjectVideoHkVqd> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<ProjectVideoHkVqd> queryWrapper = getQueryWrapper(paramMap);
Page<ProjectVideoHkVqd> page = PageUtil.getPage(paramMap);
IPage<ProjectVideoHkVqd> pageList = this.page(page, queryWrapper);
IPage<ProjectVideoHkVqd> pageList = baseMapper.queryList(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@ -45,11 +45,11 @@ public class ProjectVideoHkVqdServiceImpl extends ServiceImpl<ProjectVideoHkVqdM
@Override
public List<ProjectVideoHkVqd> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<ProjectVideoHkVqd> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
return dealList(baseMapper.queryList(queryWrapper));
}
private QueryWrapper<ProjectVideoHkVqd> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
String alias = "t.";
QueryWrapper<ProjectVideoHkVqd> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectVideoHkVqd.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ProjectVideoHkVqd::getId));
return queryWrapper;