接口联调修改

@@ -12,6 +12,8 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.dto.TkPreserveDetailStatusDTO;
 import org.thingsboard.server.common.data.yunteng.enums.PreserveDetailStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
+import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
+import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkPreserveDetailStatusEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkPreserveDetailStatusMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -44,6 +46,15 @@ public class TkPreserveDetailStatusServiceImpl extends AbstractBaseService<TkPre
     }
 
     @Override
+    public void deleteNotInIdEqRecordId(String recordId, List<String> notinIds) throws ThingsboardException {
+        baseMapper.delete(new QueryWrapper<TkPreserveDetailStatusEntity>()
+                .lambda().eq(TkPreserveDetailStatusEntity::getPreserveRecordId, recordId)
+                .eq(TenantBaseEntity::getTenantId, SpringBeanUtils.getTenantId().getId().toString())
+                .notIn(TkPreserveDetailStatusEntity::getId, notinIds)
+        );
+    }
+
+    @Override
     public List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException {
         if (CollectionUtils.isEmpty(preserveRecordId)) {
             throw new TkDataValidationException("保养记录id不能为空！");

@@ -88,11 +88,12 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
     @Transactional
     public TkPreserveRecordDTO save(TkPreserveRecordDTO dto) throws ThingsboardException {
         checkDto(dto);
-
+        Boolean isAdd = false;
         TkPreserveRecordEntity entity = new TkPreserveRecordEntity();
         if (StringUtils.isBlank(dto.getId())) {
             dto.copyToEntity(entity);
             baseMapper.insert(entity);
+            isAdd = true;
         } else {
             LambdaQueryWrapper<TkPreserveRecordEntity> filter = new QueryWrapper<TkPreserveRecordEntity>().lambda()
                     .eq(TkPreserveRecordEntity::getId, dto.getId());
@@ -103,6 +104,14 @@ public class TkPreserveRecordServcieImpl extends AbstractBaseService<TkPreserveR
         String id = dto.getId();
         List<TkPreserveDetailStatusDTO> preserveDetailStatusList = dto.getPreserveDetailStatusList();
         if (CollectionUtils.isNotEmpty(preserveDetailStatusList)) {
+            List<String> detaulStatusIdList = preserveDetailStatusList.stream().filter(e -> StringUtils.isNotBlank(e.getId()))
+                    .map(BaseDTO::getId).collect(Collectors.toList());
+            if (isAdd == false) {
+                if (CollectionUtils.isEmpty(detaulStatusIdList)) {
+                    detaulStatusIdList.add("empty");
+                }
+                tkPreserveDetailStatusService.deleteNotInIdEqRecordId(id, detaulStatusIdList);
+            }
             for (TkPreserveDetailStatusDTO tkPreserveDetailStatusDTO : preserveDetailStatusList) {
                 tkPreserveDetailStatusDTO.setPreserveRecordId(id);
                 tkPreserveDetailStatusService.save(tkPreserveDetailStatusDTO);

@@ -9,5 +9,7 @@ import java.util.List;
 public interface TkPreserveDetailStatusService  extends BaseService<TkPreserveDetailStatusEntity> {
     TkPreserveDetailStatusDTO save(TkPreserveDetailStatusDTO dto) throws ThingsboardException;
 
+    void deleteNotInIdEqRecordId(String recordId, List<String> notinIds) throws ThingsboardException;
+
     List<TkPreserveDetailStatusDTO> listByPreserveRecordId(List<String> preserveRecordId) throws ThingsboardException;
 }