diff --git a/web-adapter/pom.xml b/web-adapter/pom.xml
index 0ca9462..edf3107 100644
--- a/web-adapter/pom.xml
+++ b/web-adapter/pom.xml
@@ -26,5 +26,9 @@
com.zcloud.fire.check
web-client
+
+ com.jjb.saas
+ jjb-saas-framework-job
+
diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java
index b9f8dee..f2fd89c 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/command/FireCheckListAddExe.java
+++ b/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;
}
}
diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
index 577d9f0..f941f97 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
@@ -531,5 +531,54 @@ public class FireCheckListQueryExe {
}
+ public void overTimeRecord(Map params) {
+
+
+ List noFinishedCheckList =fireCheckListRepository.overTimeRecord(params);
+ if(CollUtil.isEmpty(noFinishedCheckList)){
+ return;
+ }
+ List fireCheckIdList = noFinishedCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
+ //查找所有负责人
+ List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
+ //fireCheckListUserDOList转换为key value map
+ /*Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
+ .collect(Collectors.groupingBy(
+ FireCheckListUserDO::getFireCheckId,
+ Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/
+ noFinishedCheckList.forEach(info->{
+ //TODO 进行超期 提醒
+ /**
+ * 清单负责人-待检查
+ * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。"
+ */
+
+
+ });
+ }
+
+ public void waitFireCheckList(String checkType) {
+ List waitCheckList =fireCheckListRepository.waitFireCheckList(checkType);
+ List fireCheckIdList = waitCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
+ //查找所有负责人
+ List fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
+ //fireCheckListUserDOList转换为key value map
+ /*Map fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
+ .collect(Collectors.groupingBy(
+ FireCheckListUserDO::getFireCheckId,
+ Collectors.mapping(FireCheckListUserDO::getUserName, Collectors.joining(","))));*/
+ waitCheckList.forEach(info->{
+ //TODO 未完成 提醒
+ /**
+ * 清单负责人-待检查
+ * "您有一条【点检表名称（排查周期）】已超期，请尽快处理。"
+ */
+
+ });
+
+
+
+
+ }
}
diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java
index 0635ef1..8a8a52f 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java
+++ b/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 fireDeviceDOList = fireDeviceRepository.getListByTime(tomorrowTime);
+ if (CollUtil.isEmpty(fireDeviceDOList)) {
+ return;
+ }
+ fireDeviceDOList.forEach(info->{
+ //TODO 设备过期提醒
+
+ });
+ }
}
diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java
index 04861cf..fff9bee 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java
+++ b/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 params) {
+ fireCheckListQueryExe.overTimeRecord(params);
+ }
+
+ @Override
+ public void waitFireCheckList(String checkType) {
+ fireCheckListQueryExe.waitFireCheckList(checkType);
+ }
}
diff --git a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java
index b9a05de..f16fc52 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireDeviceServiceImpl.java
@@ -88,5 +88,10 @@ public class FireDeviceServiceImpl implements FireDeviceServiceI {
public PageResponse pageByPointId(FireDevicePageQry qry) {
return fireDeviceQueryExe.pageByPointId(qry);
}
+
+ @Override
+ public void deviceOverTimeMessage() {
+ fireDeviceQueryExe.deviceOverTimeMessage();
+ }
}
diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java
index 9528a08..670f3d4 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java
+++ b/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 params);
+
+ void waitFireCheckList(String checkType);
}
diff --git a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java
index 6bb78c0..8985ba4 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireDeviceServiceI.java
@@ -38,5 +38,7 @@ public interface FireDeviceServiceI {
PageResponse corpStatisticslist(CorpStatisticsPageQry qry);
PageResponse pageByPointId(FireDevicePageQry qry);
+
+ void deviceOverTimeMessage();
}
diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java
index 47fa3bc..4801b14 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/PointDistributionPageQry.java
+++ b/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;
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
index ad5df5d..62d8249 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
@@ -45,5 +45,9 @@ public interface FireCheckListMapper extends BaseMapper {
IPage checkListRecordList(IPage iPage, Map params, DateTimeE dateTimeE, String menuPerms);
IPage getCheckListRecord(IPage iPage, Map params, DateTimeE dateTimeE, String menuPerms);
+
+ List getNoFinishedCheckList(DateTimeE dateTimeE);
+
+ List overTimeRecord(Map params);
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java
index 87d8c78..8d4009e 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java
+++ b/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 getInfoByUUIdState(String fireCheckId, Integer code);
PageResponse getCheckListRecord(Map params);
+
+
+ List waitFireCheckList(String checkType);
+
+ List overTimeRecord(@Param("params") Map params);
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java
index 9a7710a..ee776aa 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckRecordRepository.java
+++ b/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 getCheckRecordPageH5New(Map params);
+
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java
index 08c1698..7971609 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireDeviceRepository.java
@@ -41,5 +41,7 @@ public interface FireDeviceRepository extends BaseRepository {
PageResponse pageByPointId(Map params);
FireDeviceDO getInfoByCode(@NotEmpty(message = "器材编号不能为空") String fireDeviceCode);
+
+ List getListByTime(String tomorrowTime);
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
index 59e9f8e..87fa02a 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
+++ b/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 waitFireCheckList(String checkType) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("fire_check_type", checkType);
+ queryWrapper.eq("state", FireCheckListStateEnum.ENABLE.getCode());
+ List result = fireCheckListMapper.selectList(queryWrapper);
+ return result;
+ }
+
+ @Override
+ public List overTimeRecord(Map params) {
+ List result = fireCheckListMapper.overTimeRecord(params);
+ return result;
+ }
}
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java
index 6f11612..56e595e 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java
@@ -137,5 +137,12 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl getListByTime(String tomorrowTime) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("validity_end_time", tomorrowTime);
+ return fireDeviceMapper.selectList(queryWrapper);
+ }
}
diff --git a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
index c927b8b..4ccc10d 100644
--- a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
@@ -147,6 +147,9 @@
where d.delete_enum = 'FALSE'
and d.corpinfo_id = #{params.corpinfoId}
+
+ and (r.fire_region_name like '%${params.vagueKey}%' or p.fire_point_name like '%${params.vagueKey}%' or d.fire_device_code like '%${params.vagueKey}%' )
+
+
+
+
+