From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 148 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 120 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 345191f..b546be7 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -16,12 +16,15 @@
*/
package org.springblade.modules.place.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xxl.job.core.util.FileUtil;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -30,19 +33,24 @@
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.place.dto.PlaceCheckDTO;
import org.springblade.modules.place.entity.PlaceCheckEntity;
-import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.excel.PlaceCheckExcel;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.mapper.PlaceCheckMapper;
import org.springblade.modules.place.service.IPlaceCheckService;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
-import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
+import org.springblade.modules.task.entity.TaskPlaceRectificationEntity;
+import org.springblade.modules.task.service.ITaskPlaceRectificationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 场所检查表 服务实现类
@@ -55,9 +63,34 @@
private static Logger logger = LoggerFactory.getLogger(PlaceCheckServiceImpl.class);
+ @Autowired
+ private IDictBizService dictBizService;
+
@Override
public IPage<PlaceCheckVO> selectPlaceCheckPage(IPage<PlaceCheckVO> page, PlaceCheckVO placeCheck) {
- List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page, placeCheck);
+ List<String> strings = new ArrayList<>();
+ if (null!=placeCheck.getNineType()){
+ QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("dict_key",placeCheck.getNineType()).eq("code","nineType");
+ // 先查询当前
+ DictBiz one = dictBizService.getOne(queryWrapper);
+ // 查询本身和子集的key
+ List<DictBiz> list = dictBizService.getList("nineType", one.getId());
+ if (list.size()==0){
+ strings.add(placeCheck.getNineType().toString());
+ }else {
+ strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
+ }
+ }
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceCheckVO.class,placeCheck);
+ List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page,
+ placeCheck,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ strings);
+ List<DictBiz> nineType = dictBizService.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
for (PlaceCheckVO placeCheckVO : placeCheckVOS) {
int number = 0;
for (PatrolRecord patrolRecord : placeCheckVO.getPatrolRecordVOList()) {
@@ -66,6 +99,17 @@
}
}
placeCheckVO.setNumber(number);
+ for (DictBiz dictBiz : nineType) {
+ if (StringUtils.isNotBlank(placeCheckVO.getNineType()) && placeCheckVO.getNineType().equals(dictBiz.getDictKey())) {
+ if (placeCheckVO.getNineType().contains("10,11,12")) {
+ placeCheckVO.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (placeCheckVO.getNineType().contains("13,14,15")) {
+ placeCheckVO.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ placeCheckVO.setNineType(dictBiz.getDictValue());
+ }
+ }
+ }
}
return page.setRecords(placeCheckVOS);
}
@@ -89,33 +133,36 @@
item.setPlaceCheckId(placeCheck.getId());
item.setCreateUser(AuthUtil.getUserId());
});
- boolean b = bean.saveBatch(patrolRecordVOList);
- updateById(placeCheck);
- if (b) {
- // 隐患问题大于0 则创建任务
- try {
- Integer integer = number.get();
- if (integer > 0) {
- // 保存任务表
- ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
- Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
- "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT);
- if (aLong > 0) {
- // 保存任务详情表
- ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
- TaskPlaceRectificationEntity copy = BeanUtil.copy(placeCheck, TaskPlaceRectificationEntity.class);
- copy.setTaskId(aLong);
- copy.setPlaceCheckId(placeCheck.getId());
- copy.setId(null);
- bean1.save(copy);
+ // List<PatrolRecord> collect = patrolRecordVOList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
+ if (patrolRecordVOList != null && patrolRecordVOList.size() > 0) {
+ boolean b = bean.saveBatch(patrolRecordVOList);
+ if (b) {
+ // 隐患问题大于0 则创建任务
+ try {
+ Integer integer = number.get();
+ if (integer > 0) {
+ // 保存任务表
+ ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
+ Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
+ "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT, 4);
+ if (aLong > 0) {
+ // 保存任务详情表
+ ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
+ TaskPlaceRectificationEntity copy = BeanUtil.copy(placeCheck, TaskPlaceRectificationEntity.class);
+ copy.setTaskId(aLong);
+ copy.setPlaceCheckId(placeCheck.getId());
+ copy.setId(null);
+ copy.setStatus(4);
+ bean1.save(copy);
+ }
}
+ } catch (Exception e) {
+ logger.error("任务保存失败！", e);
}
- } catch (Exception e) {
- logger.error("任务保存失败！", e);
+ return b;
}
- return b;
}
- throw new Exception("保存失败！");
+ return save;
}
return false;
}
@@ -141,4 +188,49 @@
public List<PlaceCheckDTO> selectPlaceCheckList(PlaceCheckDTO placeCheckDTO) {
return this.baseMapper.selectPlaceCheckList(placeCheckDTO);
}
+
+ /**
+ * 导出场所检查信息
+ * @param placeCheck
+ */
+ @Override
+ public List<PlaceCheckExcel> exportPlaceCheck(PlaceCheckVO placeCheck) {
+ List<String> strings = new ArrayList<>();
+ if (null!=placeCheck.getNineType()){
+ QueryWrapper<DictBiz> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("dict_key",placeCheck.getNineType()).eq("code","nineType");
+ // 先查询当前
+ DictBiz one = dictBizService.getOne(queryWrapper);
+ // 查询本身和子集的key
+ List<DictBiz> list = dictBizService.getList("nineType", one.getId());
+ if (list.size()==0){
+ strings.add(placeCheck.getNineType());
+ }else {
+ strings = list.stream().map(DictBiz::getDictKey).collect(Collectors.toList());
+ }
+ }
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceCheckVO.class,placeCheck);
+ List<PlaceCheckExcel> placeCheckVOS = baseMapper.selectPlaceCheckListExcel(placeCheck,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ strings);
+ List<DictBiz> nineType = dictBizService.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
+ for (PlaceCheckExcel placeCheckVO : placeCheckVOS) {
+ for (DictBiz dictBiz : nineType) {
+ if (StringUtils.isNotBlank(placeCheckVO.getNineType()) && placeCheckVO.getNineType().equals(dictBiz.getDictKey())) {
+ if (placeCheckVO.getNineType().contains("10,11,12")) {
+ placeCheckVO.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (placeCheckVO.getNineType().contains("13,14,15")) {
+ placeCheckVO.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ placeCheckVO.setNineType(dictBiz.getDictValue());
+ }
+ }
+ }
+ }
+ // 返回
+ return placeCheckVOS;
+ }
}
--
Gitblit v1.9.3