增加查询参数修复

web-adapter/pom.xml

@@ -26,5 +26,9 @@
             <groupId>com.zcloud.fire.check</groupId>
             <artifactId>web-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jjb.saas</groupId>
+            <artifactId>jjb-saas-framework-job</artifactId>
+        </dependency>
     </dependencies>
 </project>

web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java

@@ -59,6 +59,7 @@ public class FireCheckListAddExe {
                     throw new BizException("检查器材保存失败");
                 }
             });
+            //TODO 消息提醒
         return true;
     }
 }

web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java

@@ -531,5 +531,54 @@ public class FireCheckListQueryExe {
     }
 
 
+    public void overTimeRecord(Map<String, Object> params) {
+
+
+        List<FireCheckListDO> noFinishedCheckList =fireCheckListRepository.overTimeRecord(params);
+        if(CollUtil.isEmpty(noFinishedCheckList)){
+            return;
+        }
+        List<String> fireCheckIdList = noFinishedCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
+        //查找所有负责人
+        List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
+        //fireCheckListUserDOList转换为key value map
+        /*Map<String, String> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
+                .collect(Collectors.groupingBy(
+                        FireCheckListUserDO::getFireCheckId,
+                        Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/
+        noFinishedCheckList.forEach(info->{
+            //TODO 进行超期 提醒
+            /**
+             * 清单负责人-待检查
+             * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。"
+             */
+
+
+        });
+    }
+
+    public void waitFireCheckList(String checkType) {
+        List<FireCheckListDO> waitCheckList =fireCheckListRepository.waitFireCheckList(checkType);
+        List<String> fireCheckIdList = waitCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
+        //查找所有负责人
+        List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
+        //fireCheckListUserDOList转换为key value map
+        /*Map<String, String> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
+                .collect(Collectors.groupingBy(
+                        FireCheckListUserDO::getFireCheckId,
+                        Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/
+        waitCheckList.forEach(info->{
+            //TODO 未完成 提醒
+            /**
+             * 清单负责人-待检查
+             * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。"
+             */
+
+        });
+
+
+
+
+    }
 }
 

web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java

@@ -34,6 +34,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -233,5 +235,21 @@ public class FireDeviceQueryExe {
 
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
+
+    public void deviceOverTimeMessage() {
+        //获取明天的时间,String类型的时间，年月日
+        LocalDateTime tomorrow = LocalDateTime.now().minusDays(1);
+        String tomorrowTime = tomorrow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+        //获取到期的消防设备
+        List<FireDeviceDO> fireDeviceDOList = fireDeviceRepository.getListByTime(tomorrowTime);
+        if (CollUtil.isEmpty(fireDeviceDOList)) {
+            return;
+        }
+        fireDeviceDOList.forEach(info->{
+            //TODO 设备过期提醒
+
+        });
+    }
 }
 

web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * web-app
@@ -116,5 +117,15 @@ public class FireCheckListServiceImpl implements FireCheckListServiceI {
     public void checkStandard(CheckPointListQry qry) {
          fireCheckListQueryExe.checkStandard(qry);
     }
+
+    @Override
+    public void overTimeRecord(Map<String, Object> params) {
+        fireCheckListQueryExe.overTimeRecord(params);
+    }
+
+    @Override
+    public void waitFireCheckList(String checkType) {
+        fireCheckListQueryExe.waitFireCheckList(checkType);
+    }
 }
 

web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java

@@ -88,5 +88,10 @@ public class FireDeviceServiceImpl implements FireDeviceServiceI {
     public PageResponse<FireDeviceCO> pageByPointId(FireDevicePageQry qry) {
         return fireDeviceQueryExe.pageByPointId(qry);
     }
+
+    @Override
+    public void deviceOverTimeMessage() {
+         fireDeviceQueryExe.deviceOverTimeMessage();
+    }
 }
 

web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java

@@ -6,6 +6,7 @@ import com.zcloud.fire.check.dto.*;
 import com.zcloud.fire.check.dto.clientobject.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * web-client
@@ -48,5 +49,9 @@ public interface FireCheckListServiceI {
     void checkStandard(CheckPointListQry qry);
 
     Integer checkListCount(FireCheckListPageQry qry);
+
+    void overTimeRecord(Map<String, Object> params);
+
+    void waitFireCheckList(String checkType);
 }
 

web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java

@@ -38,5 +38,7 @@ public interface FireDeviceServiceI {
     PageResponse<CorpStatisticsCO> corpStatisticslist(CorpStatisticsPageQry qry);
 
     PageResponse<FireDeviceCO> pageByPointId(FireDevicePageQry qry);
+
+    void deviceOverTimeMessage();
 }
 

web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java

@@ -30,5 +30,7 @@ public class PointDistributionPageQry extends PageQuery {
     @ApiModelProperty(value = "企业ID")
     @NotNull(message = "企业ID不能为空")
     private String corpinfoId;
+    @ApiModelProperty(value = "消防区域，消防点位，消防器材")
+    private String vagueKey;
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java

@@ -45,5 +45,9 @@ public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
     IPage<FireCheckListDO> checkListRecordList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE, String menuPerms);
 
     IPage<FireCheckListDO> getCheckListRecord(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE, String menuPerms);
+
+    List<FireCheckListDO> getNoFinishedCheckList(DateTimeE dateTimeE);
+
+    List<FireCheckListDO> overTimeRecord(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java

@@ -6,8 +6,8 @@ import com.zcloud.fire.check.persistence.FireCheckPointListDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
 import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
 import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
+import org.apache.ibatis.annotations.Param;
 
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.Map;
 
@@ -38,5 +38,10 @@ public interface FireCheckListRepository extends BaseRepository<FireCheckListDO>
     FireCheckListDO getInfoByUUIdState(String fireCheckId, Integer code);
 
     PageResponse<FireCheckListDO> getCheckListRecord(Map<String, Object> params);
+
+
+    List<FireCheckListDO> waitFireCheckList(String checkType);
+
+    List<FireCheckListDO> overTimeRecord(@Param("params") Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java

@@ -3,6 +3,7 @@ package com.zcloud.fire.check.persistence.repository;
 import com.alibaba.cola.dto.PageResponse;
 import com.jjb.saas.framework.repository.repo.BaseRepository;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
+import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckRecordStatisticDO;
 
@@ -33,5 +34,6 @@ public interface FireCheckRecordRepository extends BaseRepository<FireCheckRecor
     FireCheckRecordDO getCheckRecordInfoByFireRecordId(String fireRecordId);
 
     PageResponse<FireCheckRecordDO> getCheckRecordPageH5New(Map<String, Object> params);
+
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java

@@ -41,5 +41,7 @@ public interface FireDeviceRepository extends BaseRepository<FireDeviceDO> {
     PageResponse<FireDeviceDO> pageByPointId(Map<String, Object> params);
 
     FireDeviceDO getInfoByCode(@NotEmpty(message = "器材编号不能为空") String fireDeviceCode);
+
+    List<FireDeviceDO> getListByTime(String tomorrowTime);
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java

@@ -1,12 +1,12 @@
 package com.zcloud.fire.check.persistence.repository.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.dto.PageResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.zcloud.fire.check.domain.enums.FireCheckListStateEnum;
 import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.model.CorpInfoE;
 import com.zcloud.fire.check.domain.model.DateTimeE;
@@ -18,13 +18,11 @@ import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
 import com.zcloud.fire.check.persistence.mapper.FireCheckListMapper;
 import com.zcloud.fire.check.persistence.repository.CorpInfoRepository;
 import com.zcloud.fire.check.persistence.repository.FireCheckListRepository;
-import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -175,5 +173,21 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
         return PageHelper.pageToResponse(result, result.getRecords());
 
     }
+
+
+    @Override
+    public List<FireCheckListDO> waitFireCheckList(String checkType) {
+        QueryWrapper<FireCheckListDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("fire_check_type", checkType);
+        queryWrapper.eq("state", FireCheckListStateEnum.ENABLE.getCode());
+        List<FireCheckListDO> result = fireCheckListMapper.selectList(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public List<FireCheckListDO> overTimeRecord(Map<String, Object> params) {
+        List<FireCheckListDO> result = fireCheckListMapper.overTimeRecord(params);
+        return result;
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java

@@ -137,5 +137,12 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl<FireDeviceMappe
         queryWrapper.eq("fire_device_code", fireDeviceCode);
         return fireDeviceMapper.selectOne(queryWrapper);
     }
+
+    @Override
+    public List<FireDeviceDO> getListByTime(String tomorrowTime) {
+        QueryWrapper<FireDeviceDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("validity_end_time", tomorrowTime);
+        return fireDeviceMapper.selectList(queryWrapper);
+    }
 }
 

web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml

@@ -147,6 +147,9 @@
         where d.delete_enum = 'FALSE'
           and d.corpinfo_id = #{params.corpinfoId}
 
+        <if test="params.vagueKey != null and params.vagueKey != ''">
+           and (r.fire_region_name like '%${params.vagueKey}%' or p.fire_point_name like '%${params.vagueKey}%' or d.fire_device_code like '%${params.vagueKey}%' )
+        </if>
 
     </select>
     <select id="getCheckPointList" resultType="com.zcloud.fire.check.persistence.FireCheckPointListDO">
@@ -343,5 +346,51 @@
         GROUP BY cl.fire_check_id
         ORDER BY cl.create_time desc
     </select>
+
+    <select id="getNoFinishedCheckList" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListDO">
+        -- 待排查的记录
+        select
+            cl.*,
+            COUNT(distinct cr.id) AS checkCycleCount
+        from fire_check_list cl
+                 LEFT JOIN fire_check_list_user fclu on cl.fire_check_id = fclu.fire_check_id
+                 LEFT JOIN fire_check_record cr ON cl.fire_check_id = cr.fire_check_id
+            AND cr.delete_enum = 'FALSE'
+            AND (
+               (cl.fire_check_type = 'fireCheckPeriod0001' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0002' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0003' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'FireCheckPeriod0004' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0005' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0006' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0007' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0008' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime} and cr.finished_flag=1)
+                   OR (cl.fire_check_type = 'fireCheckPeriod0009' AND cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} AND cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime} and cr.finished_flag=1)
+               )
+        WHERE
+            cl.delete_enum = 'FALSE'
+          AND cl.state = 0
+        GROUP BY cl.fire_check_id
+        HAVING
+          checkedCount = 0
+        ORDER BY cl.create_time desc
+    </select>
+    
+    <select id="overTimeRecord" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListDO">
+        select m.*
+        from fire_check_list m
+        WHERE m.delete_enum = 'FALSE'
+          and m.state = 0
+          and m.fire_check_type = #{checkType}
+          and m.fire_check_id not in (select cr.fire_check_id
+                                      from fire_check_record cr
+                                      where cr.delete_enum = 'FALSE'
+                                        and (
+                                          cr.CHECK_TIME BETWEEN #{startDate} AND #{endDate}
+                                          )
+                                        and cr.fire_check_type = #{checkType}
+                                         and cr.finished_flag=1
+                                        and cr.delete_enum = 'FALSE')
+    </select>
 </mapper>