xiewj il y a 6 mois
Parent
commit
9b75bf3e98

+ 1 - 5
720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneListener.java

@@ -3,11 +3,8 @@ package com.gis.listener;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.FileWriter;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -36,11 +33,9 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -287,6 +282,7 @@ public class SceneListener {
 
 
     private void initData(WorkAddDto workAddDto, WorkEntity entity){
+        workNavigationSettingService.removeByWorkId(entity.getId());
         //添加默认分组
         WorkNavigationDTO defaultGroup = WorkNavigationDTO.builder().parentId(0L).name("一级分组").sort(0).build();
         defaultGroup.setWorkId(entity.getId());

+ 1 - 4
720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkNavigationSettingService.java

@@ -1,14 +1,11 @@
 package com.gis.service;
 
-import cn.hutool.core.lang.tree.Tree;
 import com.gis.dto.WorkNavigationDTO;
 import com.gis.entity.WorkNavigationVo;
 
-import java.util.List;
-import java.util.Map;
-
 public interface WorkNavigationSettingService {
 
     WorkNavigationVo addGroup(WorkNavigationDTO dto);
 
+    void removeByWorkId(String id);
 }

+ 13 - 1
720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkNavigationSettingServiceImpl.java

@@ -1,17 +1,21 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gis.constant.NavigationTypeEnum;
 import com.gis.dto.WorkNavigationDTO;
 import com.gis.entity.WorkNavigationEntity;
 import com.gis.entity.WorkNavigationVo;
+import com.gis.mapper.WorkNavigationMapper;
 import com.gis.service.WorkNavigationService;
 import com.gis.service.WorkNavigationSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class WorkNavigationSettingServiceImpl implements WorkNavigationSettingService {
+public class WorkNavigationSettingServiceImpl  implements WorkNavigationSettingService {
     @Autowired
     private WorkNavigationService workNavigationService;
     @Override
@@ -23,4 +27,12 @@ public class WorkNavigationSettingServiceImpl implements WorkNavigationSettingSe
 
         return BeanUtil.toBean(entity, WorkNavigationVo.class);
     }
+
+    @Override
+    public void removeByWorkId(String workId) {
+        LambdaQueryWrapper<WorkNavigationEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(WorkNavigationEntity::getWorkId, workId);
+        wrapper.eq(WorkNavigationEntity::getIsDelete, 0);
+        workNavigationService.remove(wrapper);
+    }
 }