yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update bug

This commit is contained in:
yangjun 2023-10-30 22:50:26 +08:00
parent de1ed8141d
commit f120181f88
6 changed files with 121 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java
View File

@ -6,12 +6,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog;
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiMonitorLogService;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@ -19,8 +26,9 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
/**
* @Description: 状态日志
* @Author: jeecg-boot
* @Date: 2023-10-29
@ -134,7 +142,28 @@ public class KcZhihuijiaoshiMonitorLogController extends JeecgController<KcZhihu
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, KcZhihuijiaoshiMonitorLog kcZhihuijiaoshiMonitorLog) {
return super.exportXls(request, kcZhihuijiaoshiMonitorLog, KcZhihuijiaoshiMonitorLog.class, "状态日志");
// return super.exportXls(request, kcZhihuijiaoshiMonitorLog, KcZhihuijiaoshiMonitorLog.class, "状态日志");
String title = "统计报表";
// Step.1 组装查询条件
QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshiMonitorLog, request.getParameterMap());
queryWrapper.ge(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getStartTime()),"create_time",kcZhihuijiaoshiMonitorLog.getStartTime());
queryWrapper.le(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getEndTime()),"create_time",kcZhihuijiaoshiMonitorLog.getEndTime());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// Step.2 获取导出数据
List<KcZhihuijiaoshiMonitorLog> exportList = service.staticAllList(queryWrapper);
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//此处设置的filename无效 ,前端会重更新设置一下
mv.addObject(NormalExcelConstants.FILE_NAME, title);
mv.addObject(NormalExcelConstants.CLASS, KcZhihuijiaoshiMonitorLog.class);
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
// exportParams.setImageBasePath(upLoadPath);
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
return mv;
}
/**
@ -149,4 +178,19 @@ public class KcZhihuijiaoshiMonitorLogController extends JeecgController<KcZhihu
return super.importExcel(request, response, KcZhihuijiaoshiMonitorLog.class);
}
@AutoLog(value = "状态日志-分页列表查询")
@ApiOperation(value="状态日志-分页列表查询", notes="状态日志-分页列表查询")
@GetMapping(value = "/staticList")
public Result<?> staticList(KcZhihuijiaoshiMonitorLog kcZhihuijiaoshiMonitorLog,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper = QueryGenerator.initQueryWrapper(kcZhihuijiaoshiMonitorLog, req.getParameterMap());
queryWrapper.ge(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getStartTime()),"create_time",kcZhihuijiaoshiMonitorLog.getStartTime());
queryWrapper.le(StringUtils.isNotBlank(kcZhihuijiaoshiMonitorLog.getEndTime()),"create_time",kcZhihuijiaoshiMonitorLog.getEndTime());
Page<KcZhihuijiaoshiMonitorLog> page = new Page<KcZhihuijiaoshiMonitorLog>(pageNo, pageSize);
IPage<KcZhihuijiaoshiMonitorLog> pageList = kcZhihuijiaoshiMonitorLogService.staticList(page, queryWrapper);
return Result.OK(pageList);
}
}

57
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiMonitorLog.java
View File

@ -34,45 +34,62 @@ public class KcZhihuijiaoshiMonitorLog {
@ApiModelProperty(value = "id")
private java.lang.String id;
/**日志类型(1:播放正常 | 2:播放失败，拉起成功 | 3:播放失败，拉起失败)*/
@Excel(name = "日志类型(1:播放正常 | 2:播放失败，拉起成功 | 3:播放失败，拉起失败)", width = 15)
@ApiModelProperty(value = "日志类型(1:播放正常 | 2:播放失败，拉起成功 | 3:播放失败，拉起失败)")
private java.lang.Integer logType;
/**教学楼编号*/
@Excel(name = "教学楼编号", width = 15)
@ApiModelProperty(value = "教学楼编号")
private java.lang.String jxlId;
/**教学楼名称*/
@Excel(name = "教学楼名称", width = 15)
@ApiModelProperty(value = "教学楼名称")
private java.lang.String jxlName;
/**教室编号*/
@Excel(name = "教室编号", width = 15)
@ApiModelProperty(value = "教室编号")
private java.lang.String jsbh;
/**教室名称*/
@Excel(name = "教室名称", width = 15)
@ApiModelProperty(value = "教室名称")
private java.lang.String jsmc;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private java.lang.String createBy;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private java.lang.String updateBy;
/**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateTime;
@TableField(exist = false)
private String endTime;
//---------------------------导出--------------------------
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "统计日期")
private java.util.Date createTime;
@Excel(name = "统计日期", width = 15)
@TableField(exist = false)
private String startTime;
/**教学楼名称*/
@Excel(name = "教学楼名称", width = 15)
@ApiModelProperty(value = "教学楼名称")
private java.lang.String jxlName;
/**教室名称*/
@Excel(name = "教室名称", width = 15)
@ApiModelProperty(value = "教室名称")
private java.lang.String jsmc;
@TableField(exist = false)
@Excel(name = "状态正常数量", width = 15)
private String ztzcNum;
@TableField(exist = false)
@Excel(name = "开启成功数量", width = 15)
private String kqcgNum;
@TableField(exist = false)
@Excel(name = "开启失败数量", width = 15)
private String kqsbNum;
//---------------------------导出--------------------------
}

7
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMonitorLogMapper.java
View File

@ -2,6 +2,10 @@ package org.jeecg.modules.kc.jiaoshi.mapper;
import java.util.List;
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 org.apache.ibatis.annotations.Param;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface KcZhihuijiaoshiMonitorLogMapper extends BaseMapper<KcZhihuijiaoshiMonitorLog> {
IPage<KcZhihuijiaoshiMonitorLog> staticList(Page<KcZhihuijiaoshiMonitorLog> page,@Param(Constants.WRAPPER) QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper);
List<KcZhihuijiaoshiMonitorLog> staticAllList(@Param(Constants.WRAPPER) QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper);
}

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMonitorLogMapper.xml
View File

@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.kc.jiaoshi.mapper.KcZhihuijiaoshiMonitorLogMapper">
<select id="staticList" resultType="org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog">
select create_time as startTime,jxl_name,jsmc,count_type1 as ztzcNum,count_type2 as kqcgNum,count_type3 as kqsbNum from view_zhjstj_log
${ew.customSqlSegment}
</select>
<select id="staticAllList" resultType="org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog">
select create_time as startTime,jxl_name,jsmc,count_type1 as ztzcNum,count_type2 as kqcgNum,count_type3 as kqsbNum from view_zhjstj_log
${ew.customSqlSegment}
</select>
</mapper>

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiMonitorLogService.java
View File

@ -1,8 +1,13 @@
package org.jeecg.modules.kc.jiaoshi.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 状态日志
* @Author: jeecg-boot
@ -11,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IKcZhihuijiaoshiMonitorLogService extends IService<KcZhihuijiaoshiMonitorLog> {
IPage<KcZhihuijiaoshiMonitorLog> staticList(Page<KcZhihuijiaoshiMonitorLog> page, QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper);
List<KcZhihuijiaoshiMonitorLog> staticAllList(QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper);
}

14
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiMonitorLogServiceImpl.java
View File

@ -1,5 +1,8 @@
package org.jeecg.modules.kc.jiaoshi.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog;
import org.jeecg.modules.kc.jiaoshi.mapper.KcZhihuijiaoshiMonitorLogMapper;
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiMonitorLogService;
@ -7,6 +10,8 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**
* @Description: 状态日志
* @Author: jeecg-boot
@ -16,4 +21,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class KcZhihuijiaoshiMonitorLogServiceImpl extends ServiceImpl<KcZhihuijiaoshiMonitorLogMapper, KcZhihuijiaoshiMonitorLog> implements IKcZhihuijiaoshiMonitorLogService {
@Override
public IPage<KcZhihuijiaoshiMonitorLog> staticList(Page<KcZhihuijiaoshiMonitorLog> page, QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper) {
return baseMapper.staticList(page,queryWrapper);
}
@Override
public List<KcZhihuijiaoshiMonitorLog> staticAllList(QueryWrapper<KcZhihuijiaoshiMonitorLog> queryWrapper) {
return baseMapper.staticAllList(queryWrapper);
}
}