优化细节

pom.xml

@@ -23,6 +23,7 @@
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
         <poi.version>5.2.3</poi.version>
         <easyexcel.version>3.3.3</easyexcel.version>
+        <poi-tl.version>1.12.2</poi-tl.version>
         <velocity.version>2.3</velocity.version>
         <satoken.version>1.37.0</satoken.version>
         <mybatis-plus.version>3.5.4</mybatis-plus.version>
@@ -163,6 +164,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.deepoove</groupId>
+                <artifactId>poi-tl</artifactId>
+                <version>${poi-tl.version}</version>
+            </dependency>
 
             <!-- velocity代码生成使用模板 -->
             <dependency>

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<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysWarnRecordVo> list(BaseQueryBo query, PageQuery pageQuery) {
-        return sysWarnRecordService.queryPageList(bo, pageQuery);
+        return sysWarnRecordService.queryPageList(query, pageQuery);
     }
 
     /**

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;
+    private Long batchNo;
-    Long scaleId;
+    private String sessionName;
-    Long deptId;
+    private Long scaleId;
-
+    private Long deptId;
+    private Long userId;
+    private String nickName;
+    private Integer status;
+    private Integer situation;
 }

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;
 
-
 }

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;
+
     /**
      * 预警时间
      */

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.bo.BaseQueryBo;
-import org.dromara.scale.domain.vo.TimeAxisVo;
 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,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface SysWarnRecordMapper extends BaseMapperPlus<SysWarnRecord, SysWarnRecordVo> {
 
-    Page<SysWarnRecordVo> selectPageWarnList(@Param("page") Page<SysWarnRecord> page, @Param(Constants.WRAPPER) Wrapper<SysWarnRecord> queryWrapper);
+    Page<SysWarnRecordVo> selectPageWarnList(@Param("page") Page<SysWarnRecord> page, @Param(Constants.ENTITY) BaseQueryBo query);
 
     List<SysEvaluationRecordVo> selectEvaluationRecordListByWarnId(Long warnId);
 
@@ -37,6 +37,4 @@ public interface SysWarnRecordMapper extends BaseMapperPlus<SysWarnRecord, SysWa
     List<SysWarnConfigVo> selectWarnConfig();
 
 
-
-
 }

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<SysWarnRecordVo> queryPageList(SysWarnRecordBo bo, PageQuery pageQuery);
+    TableDataInfo<SysWarnRecordVo> queryPageList(BaseQueryBo query, PageQuery pageQuery);
 
     /**
      * 查询预警记录列表

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java

@@ -87,9 +87,10 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
         //Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysScalePublish> lqw = Wrappers.lambdaQuery();
 //       lqw.eq(StringUtils.isNotBlank(bo.getScaleIds()), SysScalePublish::getScaleIds, bo.getScaleIds());
-//        lqw.eq(StringUtils.isNotBlank(bo.getScaleNames()), SysScalePublish::getScaleNames, bo.getScaleNames());
+        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;

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<SysWarnRecordVo> queryPageList(SysWarnRecordBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysWarnRecordVo> queryPageList(BaseQueryBo query, PageQuery pageQuery) {
-        LambdaQueryWrapper<SysWarnRecord> lqw = buildQueryWrapper(bo);
+        Page<SysWarnRecordVo> result = baseMapper.selectPageWarnList(pageQuery.build(), query);
-        Page<SysWarnRecordVo> result = baseMapper.selectPageWarnList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 

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 (FIND_IN_SET(#{deptId}, d.ancestors) OR d.dept_id = #{deptId})
+        <if test="scaleId != null">
             and er.scale_id = #{scaleId}
-        <if test="deptId != null">
-            and er.dept_id = #{deptId}
         </if>
         order by d.dept_id
     </select>

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}
+        <where>
+            <if test="et.nickName != null and et.nickName != ''">
+                u.nick_name like CONCAT('%', #{et.nickName}, '%')
+            </if>
+            <if test="et.situation != null">
+                and wr.situation = #{et.situation}
+            </if>
+        </where>
     </select>
 
     <select id="selectEvaluationRecordListByWarnId" resultType="org.dromara.scale.domain.vo.SysEvaluationRecordVo">