From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/service/impl/RegionInspectionServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 69f9e05..78c8956 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,9 +9,13 @@
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;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +37,9 @@
@Autowired
private RegionInspectionMapper regionInspectionMapper;
+ @Autowired
+ private RegionInspectionRecordMapper regionInspectionRecordMapper;
+
private static final Object lock = new Object();
@Override
@Transactional(rollbackFor = Exception.class)
@@ -44,7 +51,7 @@
//默认给uuid
String regionInspectId = UUIDUtils.create();
//修改区域巡检判断
- if (!"".equals(regionInspectionEntity.getId())){
+ if (StringUtils.isNotBlank(regionInspectionEntity.getId())){
regionInspectId = regionInspectionEntity.getId();
//根据区域巡检id删除中间表
regionInspectionEntity.setUpdateTime(new Date());
@@ -52,32 +59,63 @@
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);
}
+
+ //添加或修改任务的时候添加打卡记录 是待打卡状态
+ for (String addUserId : userIds) {
+ for (String regionId : regionIds) {
+ RegionInspectionRecordEntity checkIsNull = regionInspectionRecordMapper.regionInfo(regionInspectionEntity.getId(), addUserId, regionId);
+ if (checkIsNull==null){
+ 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