From c50cce7ac8e4b0d1cd1d35feedfe479180ac03ae Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 3479ba4..625a132 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
@@ -17,21 +17,32 @@
package org.springblade.modules.place.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xxl.job.core.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.constant.DictConstant;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.patrol.entity.PatrolRecord;
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.vo.PlaceCheckVO;
import org.springblade.modules.place.mapper.PlaceCheckMapper;
import org.springblade.modules.place.service.IPlaceCheckService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
+import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
/**
@@ -42,6 +53,8 @@
*/
@Service
public class PlaceCheckServiceImpl extends ServiceImpl<PlaceCheckMapper, PlaceCheckEntity> implements IPlaceCheckService {
+
+ private static Logger logger = LoggerFactory.getLogger(PlaceCheckServiceImpl.class);
@Override
public IPage<PlaceCheckVO> selectPlaceCheckPage(IPage<PlaceCheckVO> page, PlaceCheckVO placeCheck) {
@@ -62,16 +75,47 @@
@Transactional(rollbackFor = Exception.class)
public Boolean savePlace(PlaceCheckVO placeCheck) throws Exception {
placeCheck.setCreateUser(AuthUtil.getUserId());
+ List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList();
+ AtomicReference<Integer> number = new AtomicReference<>(0);
+ patrolRecordVOList.stream().forEach(item -> {
+ if (item.getState().equals(0)) {
+ number.getAndSet(number.get() + 1);
+ }
+ });
+ placeCheck.setHiddenDangerNumber(number.get());
boolean save = save(placeCheck);
if (save) {
IPatrolRecordService bean = SpringUtil.getBean(IPatrolRecordService.class);
- List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList();
patrolRecordVOList.stream().forEach(item -> {
item.setPlaceCheckId(placeCheck.getId());
item.setCreateUser(AuthUtil.getUserId());
});
- boolean b = bean.saveBatch(placeCheck.getPatrolRecordVOList());
+ List<PatrolRecord> collect = patrolRecordVOList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
+ boolean b = bean.saveBatch(collect);
+ 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,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);
+ }
return b;
}
throw new Exception("保存失败！");
--
Gitblit v1.9.3