From 942fd08345fe0f3b04b4a0e919516257213ad2e5 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期一, 20 十一月 2023 15:59:51 +0800
Subject: [PATCH] 20231120_qiuyh_区域巡检打卡、防患举报、物料web端
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
index 8c97aa0..9cd46f2 100644
--- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
+++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java
@@ -9,8 +9,11 @@
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.secure.modules.biz.regionInspection.entity.RegionInspectionEntity;
import com.thhy.secure.modules.biz.regionInspection.entity.RegionInspectionHazardInformEntity;
+import com.thhy.secure.modules.biz.regionInspection.entity.RegionInspectionRecordEntity;
import com.thhy.secure.modules.biz.regionInspection.entity.RegionInspectionUserEntity;
import com.thhy.secure.modules.biz.regionInspection.mapper.RegionInspectionMapper;
+import com.thhy.secure.modules.biz.regionInspection.mapper.RegionInspectionRecordMapper;
+import com.thhy.secure.modules.biz.regionInspection.service.RegionInspectionRecordService;
import com.thhy.secure.modules.biz.regionInspection.service.RegionInspectionService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +37,9 @@
@Autowired
private RegionInspectionMapper regionInspectionMapper;
+ @Autowired
+ private RegionInspectionRecordMapper regionInspectionRecordMapper;
+
private static final Object lock = new Object();
@Override
@Transactional(rollbackFor = Exception.class)
@@ -53,32 +59,61 @@
regionInspectionMapper.deleteUser(regionInspectId);
regionInspectionMapper.deleteInspectionHazardInform(regionInspectId);
}
- //添加/修改区域巡检
+ List<String> userIds = new ArrayList<>();
+ List<String> regionIds = new ArrayList<>();
synchronized (lock) {
- regionInspectionEntity.setId(regionInspectId);
- regionInspectionEntity.setCreateUser(userId);
- regionInspectionMapper.insert(regionInspectionEntity);
//添加巡检人
for (RegionInspectionUserEntity userEntity : regionInspectionEntity.getRegionUsersList()) {
- userEntity.setId(UUIDUtils.create());
+ String id = UUIDUtils.create();
+ userIds.add(userEntity.getUserId());
+ userEntity.setId(id);
userEntity.setRegionInspectionId(regionInspectId);
regionInspectionMapper.insertUser(userEntity);
}
//添加巡检的区域
for (RegionInspectionHazardInformEntity region : regionInspectionEntity.getRegionList()) {
- region.setId(UUIDUtils.create());
+ String id = UUIDUtils.create();
+ regionIds.add(region.getRegionHazardInformId());
+ region.setId(id);
region.setRegionInspectionId(regionInspectId);
regionInspectionMapper.insertInspectionHazardInform(region);
}
+
+ //添加任务的时候添加打卡记录 新增的是待打卡状态
+ if (StringUtils.isBlank(regionInspectionEntity.getId())){
+ for (String addUserId : userIds) {
+ for (String regionId : regionIds) {
+ RegionInspectionRecordEntity regionInspectionRecordEntity =
+ RegionInspectionRecordEntity
+ .builder()
+ .id(UUIDUtils.create())
+ .userId(addUserId)
+ .regionHazardInformId(regionId)
+ .regionInspectionId(regionInspectId)
+ .createUser(userId)
+ .build();
+ regionInspectionRecordMapper.insert(regionInspectionRecordEntity);
+ }
+ }
+ }
+
+ //添加/修改区域巡检
+ regionInspectionEntity.setId(regionInspectId);
+ regionInspectionEntity.setCreateUser(userId);
+ regionInspectionMapper.insert(regionInspectionEntity);
+
}
+
return BasicResult.success();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public BasicResult delete(String id) {
regionInspectionMapper.delete(id);
regionInspectionMapper.deleteUser(id);
regionInspectionMapper.deleteInspectionHazardInform(id);
+ regionInspectionRecordMapper.deleteByRegionInspectionId(id);
return BasicResult.success();
}
--
Gitblit v1.9.3