From f120181f88650d59940302abbaf6b18f71c50ccc Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 30 Oct 2023 22:50:26 +0800 Subject: [PATCH] update bug --- .../KcZhihuijiaoshiMonitorLogController.java | 48 +++++++++++++++- .../entity/KcZhihuijiaoshiMonitorLog.java | 57 ++++++++++++------- .../KcZhihuijiaoshiMonitorLogMapper.java | 7 +++ .../xml/KcZhihuijiaoshiMonitorLogMapper.xml | 9 +++ .../IKcZhihuijiaoshiMonitorLogService.java | 8 +++ .../KcZhihuijiaoshiMonitorLogServiceImpl.java | 14 +++++ 6 files changed, 121 insertions(+), 22 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java index ef9fcb43..4dc5a7fc 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiMonitorLogController.java @@ -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 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 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 staticList(KcZhihuijiaoshiMonitorLog kcZhihuijiaoshiMonitorLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper 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 page = new Page(pageNo, pageSize); + IPage pageList = kcZhihuijiaoshiMonitorLogService.staticList(page, queryWrapper); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiMonitorLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiMonitorLog.java index d0adf2a3..6d2cda3e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiMonitorLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshiMonitorLog.java @@ -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; + //---------------------------导出-------------------------- + + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMonitorLogMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMonitorLogMapper.java index cfb3e6ea..4098882d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMonitorLogMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/KcZhihuijiaoshiMonitorLogMapper.java @@ -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 { + IPage staticList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List staticAllList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMonitorLogMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMonitorLogMapper.xml index b3a78443..fe085cde 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMonitorLogMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/mapper/xml/KcZhihuijiaoshiMonitorLogMapper.xml @@ -2,4 +2,13 @@ + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiMonitorLogService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiMonitorLogService.java index 61248296..f8e7df98 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiMonitorLogService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/IKcZhihuijiaoshiMonitorLogService.java @@ -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 { + IPage staticList(Page page, QueryWrapper queryWrapper); + + List staticAllList(QueryWrapper queryWrapper); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiMonitorLogServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiMonitorLogServiceImpl.java index e5973754..2ef63e22 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiMonitorLogServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/service/impl/KcZhihuijiaoshiMonitorLogServiceImpl.java @@ -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 implements IKcZhihuijiaoshiMonitorLogService { + @Override + public IPage staticList(Page page, QueryWrapper queryWrapper) { + return baseMapper.staticList(page,queryWrapper); + } + + @Override + public List staticAllList(QueryWrapper queryWrapper) { + return baseMapper.staticAllList(queryWrapper); + } }