diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index 5d224cf1..cfe481a5 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -91,7 +91,7 @@ public interface FireRecordMapper { List datalistPage(Page page); - PageData getCheckingByCid(String fireCheckId); + List getCheckingByCid(String fireCheckId); PageData getCheckingNoFinByCid(String fireCheckId); void removeRecordPointByCidRidPids(PageData pd); diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index f7da6d39..982a1b70 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -89,7 +89,7 @@ public interface FireRecordService { * @Param: [java.lang.String] [fireCheckId] * @Return: com.zcloud.entity.PageData */ - PageData getCheckingByCid(String fireCheckId); + List getCheckingByCid(String fireCheckId); /** * @Description: 根据checkid,pointid,recordid 删除点位 diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java index 583f8ceb..68acf3a8 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.firemanager.impl; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -574,58 +575,60 @@ public class FireCheckListServiceImpl implements FireCheckListService { * 2. 点位下删除了器材,把检查的器材删除 * 3. * */ - PageData checkingData = fireRecordService.getCheckingByCid(FIRE_CHECK_ID); + List checkingByCid = fireRecordService.getCheckingByCid(FIRE_CHECK_ID); // 无检查记录 什么也不干 - if (checkingData != null) { - String FIRE_RECORD_ID = checkingData.getString("FIRE_RECORD_ID"); + if (CollUtil.isNotEmpty(checkingByCid)) { + checkingByCid.stream().forEach(checkingData -> { + String FIRE_RECORD_ID = checkingData.getString("FIRE_RECORD_ID"); - // 有删除的点位那么 删除记录中的点位 - if (deletedPoints.size() > 0) { - PageData delRecordData = new PageData(); - initPageDataUtil.initEdit(delRecordData); - delRecordData.put("FIRE_CHECK_ID", FIRE_CHECK_ID); - delRecordData.put("FIRE_RECORD_ID", FIRE_RECORD_ID); - delRecordData.put("list", deletedPoints); - fireRecordService.removeRecordPointByCidRidPids(delRecordData); - } - // 有新增的点位 把点位初始化 - if (addPoints.size() > 0) { - for (PageData addedRecordPointData : addPoints) { - initPageDataUtil.initSave(addedRecordPointData, "EQUIPMENT_POINT_ID"); - addedRecordPointData.put("FIRE_CHECK_ID", FIRE_CHECK_ID); - addedRecordPointData.put("FIRE_RECORD_ID", FIRE_RECORD_ID); - addedRecordPointData.put("CORPINFO_ID", CORPINFO_ID); - addedRecordPointData.put("P_ISCHECKED", 1); + // 有删除的点位那么 删除记录中的点位 + if (deletedPoints.size() > 0) { + PageData delRecordData = new PageData(); + initPageDataUtil.initEdit(delRecordData); + delRecordData.put("FIRE_CHECK_ID", FIRE_CHECK_ID); + delRecordData.put("FIRE_RECORD_ID", FIRE_RECORD_ID); + delRecordData.put("list", deletedPoints); + fireRecordService.removeRecordPointByCidRidPids(delRecordData); } - fireRecordService.addedRecordPoint(addPoints); - } - // 有删除的器材那么 删除记录中的器材 - if (deviceIds.length > 0) { - PageData removeRecordDevice = new PageData(); - initPageDataUtil.initSave(removeRecordDevice); - removeRecordDevice.put("FIRE_CHECK_ID", FIRE_CHECK_ID); - removeRecordDevice.put("FIRE_RECORD_ID", FIRE_RECORD_ID); - removeRecordDevice.put("list", deviceIds); - fireRecordService.removeDeviceByCIdRid(removeRecordDevice); - } - // 有新增的器材那么 新增记录中的器材, 点位信息变更为也未检查完的状态。 - if (DEVICE_PREPARED_DATA.size() > 0) { - // 准备变更状态的 点位id - HashSet preChangesPid = new HashSet<>(); - for (PageData device_prepared_info : DEVICE_PREPARED_DATA) { - initPageDataUtil.initSave(device_prepared_info, "EQUIPMENT_RECORD_ID"); - device_prepared_info.put("ISCHECKED", 0); - device_prepared_info.put("FIRE_RECORD_ID", FIRE_RECORD_ID); - device_prepared_info.put("ISNORMAL", 2); - preChangesPid.add(device_prepared_info.getString("FIRE_POINT_ID")); + // 有新增的点位 把点位初始化 + if (addPoints.size() > 0) { + for (PageData addedRecordPointData : addPoints) { + initPageDataUtil.initSave(addedRecordPointData, "EQUIPMENT_POINT_ID"); + addedRecordPointData.put("FIRE_CHECK_ID", FIRE_CHECK_ID); + addedRecordPointData.put("FIRE_RECORD_ID", FIRE_RECORD_ID); + addedRecordPointData.put("CORPINFO_ID", CORPINFO_ID); + addedRecordPointData.put("P_ISCHECKED", 1); + } + fireRecordService.addedRecordPoint(addPoints); } - fireRecordService.addedRecordDeviceList(DEVICE_PREPARED_DATA); - PageData checkedPageData = new PageData(); - initPageDataUtil.initEdit(checkedPageData); - checkedPageData.put("FIRE_RECORD_ID",FIRE_RECORD_ID); - checkedPageData.put("list",preChangesPid); - fireRecordService.updCheckedByRidPid(checkedPageData); - } + // 有删除的器材那么 删除记录中的器材 + if (deviceIds.length > 0) { + PageData removeRecordDevice = new PageData(); + initPageDataUtil.initSave(removeRecordDevice); + removeRecordDevice.put("FIRE_CHECK_ID", FIRE_CHECK_ID); + removeRecordDevice.put("FIRE_RECORD_ID", FIRE_RECORD_ID); + removeRecordDevice.put("list", deviceIds); + fireRecordService.removeDeviceByCIdRid(removeRecordDevice); + } + // 有新增的器材那么 新增记录中的器材, 点位信息变更为也未检查完的状态。 + if (DEVICE_PREPARED_DATA.size() > 0) { + // 准备变更状态的 点位id + HashSet preChangesPid = new HashSet<>(); + for (PageData device_prepared_info : DEVICE_PREPARED_DATA) { + initPageDataUtil.initSave(device_prepared_info, "EQUIPMENT_RECORD_ID"); + device_prepared_info.put("ISCHECKED", 0); + device_prepared_info.put("FIRE_RECORD_ID", FIRE_RECORD_ID); + device_prepared_info.put("ISNORMAL", 2); + preChangesPid.add(device_prepared_info.getString("FIRE_POINT_ID")); + } + fireRecordService.addedRecordDeviceList(DEVICE_PREPARED_DATA); + PageData checkedPageData = new PageData(); + initPageDataUtil.initEdit(checkedPageData); + checkedPageData.put("FIRE_RECORD_ID",FIRE_RECORD_ID); + checkedPageData.put("list",preChangesPid); + fireRecordService.updCheckedByRidPid(checkedPageData); + } + }); } } diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index e45b77da..771b1771 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.zcloud.service.firemanager.impl; import java.util.*; -import java.util.stream.Collectors; import javax.annotation.Resource; @@ -730,7 +729,7 @@ public class FireRecordServiceImpl implements FireRecordService { } @Override - public PageData getCheckingByCid(String fireCheckId) { + public List getCheckingByCid(String fireCheckId) { return fireRecordMapper.getCheckingByCid(fireCheckId); }