diff --git a/pom.xml b/pom.xml index e8742a8..2582570 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ 0.15.0 5.2.3 3.3.3 + 1.12.2 2.3 1.37.0 3.5.4 @@ -163,6 +164,11 @@ + + com.deepoove + poi-tl + ${poi-tl.version} + diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java index 1b3e56c..2d82dfb 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/WarnController.java @@ -14,6 +14,7 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.BaseQueryBo; import org.dromara.scale.domain.bo.SysWarnRecordBo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysWarnConfigVo; @@ -43,8 +44,8 @@ public class WarnController extends BaseController { */ @SaCheckPermission("warn:record:pageList") @GetMapping("/pageList") - public TableDataInfo list(SysWarnRecordBo bo, PageQuery pageQuery) { - return sysWarnRecordService.queryPageList(bo, pageQuery); + public TableDataInfo list(BaseQueryBo query, PageQuery pageQuery) { + return sysWarnRecordService.queryPageList(query, pageQuery); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java index 1d011f5..3cedaed 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/BaseQueryBo.java @@ -12,8 +12,12 @@ import lombok.Data; @Data public class BaseQueryBo { - Long batchNo; - Long scaleId; - Long deptId; - + private Long batchNo; + private String sessionName; + private Long scaleId; + private Long deptId; + private Long userId; + private String nickName; + private Integer status; + private Integer situation; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java index 95766fc..2a865e6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysWarnRecordBo.java @@ -47,11 +47,15 @@ public class SysWarnRecordBo extends BaseEntity { @NotBlank(message = "补充说明不能为空", groups = { AddGroup.class, EditGroup.class }) private String note; + /** + * 严重度 + */ + private Integer situation; + /** * 预警时间 */ @NotNull(message = "预警时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date warnTime; - } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java index fbaa94e..baccec9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysWarnRecordVo.java @@ -54,6 +54,11 @@ public class SysWarnRecordVo implements Serializable { @ExcelProperty(value = "补充说明") private String note; + /** + * 干预状态 + */ + private Integer situation; + /** * 预警时间 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java index 6347f3f..b193076 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysWarnRecordMapper.java @@ -1,16 +1,16 @@ package org.dromara.scale.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.scale.domain.SysWarnRecord; -import org.dromara.scale.domain.vo.SysWarnConfigVo; -import org.dromara.scale.domain.vo.TimeAxisVo; +import org.dromara.scale.domain.bo.BaseQueryBo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; +import org.dromara.scale.domain.vo.SysWarnConfigVo; import org.dromara.scale.domain.vo.SysWarnRecordVo; +import org.dromara.scale.domain.vo.TimeAxisVo; import java.util.List; @@ -23,20 +23,18 @@ import java.util.List; @Mapper public interface SysWarnRecordMapper extends BaseMapperPlus { - Page selectPageWarnList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageWarnList(@Param("page") Page page, @Param(Constants.ENTITY) BaseQueryBo query); List selectEvaluationRecordListByWarnId(Long warnId); - int updateConfigByIds(String ids); + int updateConfigByIds(String ids); - List selectUseConfig(); + List selectUseConfig(); - List selectTimeList(Long userId); + List selectTimeList(Long userId); List selectWarnConfig(); - - } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java index 98ed708..dba512f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysWarnRecordService.java @@ -3,6 +3,7 @@ package org.dromara.scale.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.scale.domain.SysWarnRecord; +import org.dromara.scale.domain.bo.BaseQueryBo; import org.dromara.scale.domain.bo.SysWarnRecordBo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysWarnConfigVo; @@ -26,7 +27,7 @@ public interface ISysWarnRecordService { /** * 查询预警记录列表 */ - TableDataInfo queryPageList(SysWarnRecordBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(BaseQueryBo query, PageQuery pageQuery); /** * 查询预警记录列表 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index 89a95da..0fe5ed3 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -86,10 +86,11 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { private LambdaQueryWrapper buildQueryWrapper(SysScalePublishBo bo) { //Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); -// lqw.eq(StringUtils.isNotBlank(bo.getScaleIds()), SysScalePublish::getScaleIds, bo.getScaleIds()); -// lqw.eq(StringUtils.isNotBlank(bo.getScaleNames()), SysScalePublish::getScaleNames, bo.getScaleNames()); +// lqw.eq(StringUtils.isNotBlank(bo.getScaleIds()), SysScalePublish::getScaleIds, bo.getScaleIds()); + lqw.like(StringUtils.isNotBlank(bo.getScaleNames()), SysScalePublish::getScaleNames, bo.getScaleNames()); lqw.like(StringUtils.isNotBlank(bo.getSessionName()), SysScalePublish::getSessionName, bo.getSessionName()); - lqw.eq(bo.getExpireTime() != null, SysScalePublish::getExpireTime, bo.getExpireTime()); +// lqw.(StringUtils.isNotBlank(bo.getDeptIds()), SysScalePublish::getSessionName, bo.getSessionName()); +// lqw.eq(bo.getExpireTime() != null, SysScalePublish::getExpireTime, bo.getExpireTime()); lqw.eq(bo.getStatus() != null, SysScalePublish::getStatus, bo.getStatus()); lqw.eq(bo.getAllowQueryResult() != null, SysScalePublish::getAllowQueryResult, bo.getAllowQueryResult()); return lqw; diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java index 214efd0..e96eb6f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.scale.constant.StatusEnum; import org.dromara.scale.domain.SysWarnRecord; +import org.dromara.scale.domain.bo.BaseQueryBo; import org.dromara.scale.domain.bo.SysWarnRecordBo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysWarnConfigVo; @@ -48,9 +49,8 @@ public class SysWarnRecordServiceImpl implements ISysWarnRecordService { * 查询预警记录列表 */ @Override - public TableDataInfo queryPageList(SysWarnRecordBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectPageWarnList(pageQuery.build(), lqw); + public TableDataInfo queryPageList(BaseQueryBo query, PageQuery pageQuery) { + Page result = baseMapper.selectPageWarnList(pageQuery.build(), query); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml index 3a62cda..2d0c5ba 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysScalePublishMapper.xml @@ -17,9 +17,9 @@ left join sys_dept d on d.dept_id = er.dept_id left join sys_user u on u.dept_id = d.dept_id where er.batch_no = #{batchNo} - and er.scale_id = #{scaleId} - - and er.dept_id = #{deptId} + and (FIND_IN_SET(#{deptId}, d.ancestors) OR d.dept_id = #{deptId}) + + and er.scale_id = #{scaleId} order by d.dept_id diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml index 05ce868..1b2c5f8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/SysWarnRecordMapper.xml @@ -8,7 +8,14 @@ from sys_warn_record wr left join sys_scale_publish sp on sp.batch_no = wr.batch_no left join sys_user u on u.user_id = wr.user_id - ${ew.getCustomSqlSegment} + + + u.nick_name like CONCAT('%', #{et.nickName}, '%') + + + and wr.situation = #{et.situation} + +