呼叫删除优化

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/OrganizeController.java

@@ -2,6 +2,7 @@ package com.baiye.modules.system.rest;
 
 import com.baiye.http.CommonResponse;
 import com.baiye.http.ResponseCode;
+import com.baiye.model.dto.ClueDto;
 import com.baiye.model.dto.OrganizeQueryCriteria;
 import com.baiye.modules.system.domain.Organize;
 import com.baiye.modules.system.domain.OrganizeUser;
@@ -144,9 +145,9 @@ public class OrganizeController {
     }
 
     @ApiOperation("查询组标签和任务标签")
-    @GetMapping("/getLabel")
-    public ResponseEntity<Map<String, List<String>>> getLabel(@RequestParam("taskId") Long taskId, @RequestParam("organizeId") Long organizeId) {
-        return new ResponseEntity<>(organizeService.getLabel(taskId, organizeId), HttpStatus.OK);
+    @PostMapping("/getLabel")
+    public ResponseEntity<Map<String, List<String>>> getLabel(@RequestBody ClueDto clueDto) {
+        return new ResponseEntity<>(organizeService.getLabel(clueDto), HttpStatus.OK);
     }
 
     @ApiOperation("查询所有的组和组线索数量")

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/OrganizeService.java

@@ -1,5 +1,6 @@
 package com.baiye.modules.system.service;
 
+import com.baiye.model.dto.ClueDto;
 import com.baiye.model.dto.OrganizeQueryCriteria;
 import com.baiye.model.dto.UserDto;
 import com.baiye.modules.system.domain.Organize;
@@ -137,14 +138,13 @@ public interface OrganizeService {
      */
     List<UserDto> selectMemberList(OrganizeQueryCriteria organizeQueryCriteria);
 
+
     /**
      * (资源服务)查询组标签和任务标签
-     *
-     * @param taskId
-     * @param organizeId
+     * @param clueDto
      * @return
      */
-    Map<String, List<String>> getLabel(Long taskId, Long organizeId);
+    Map<String, List<String>> getLabel(ClueDto clueDto);
 
     /**
      * 查询所有组

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -100,7 +100,7 @@ public class OrganizeServiceImpl implements OrganizeService {
             if (organize.getCallMode() == 1) {
                 organizeList.forEach(oe -> extensionNumberService.assignExtensionNum(oe.getOrganizeId(), oe.getUserId()));
             }else if (updateOrganize.getCallMode() == 1){
-                extensionUserRepository.deleteByOrganizeId(updateOrganize.getId());
+                extensionNumberService.unbindExtension(updateOrganize.getId());
             }
         }
         if (organize.getOrganizeName() != null) {
@@ -515,8 +515,10 @@ public class OrganizeServiceImpl implements OrganizeService {
      * (资源服务)查询组标签和任务标签
      */
     @Override
-    public Map<String, List<String>> getLabel(Long taskId, Long organizeId) {
+    public Map<String, List<String>> getLabel(ClueDto clueDto) {
         TaskOrganizeQueryCriteria taskOrganizeQueryCriteria = new TaskOrganizeQueryCriteria();
+        Long organizeId = clueDto.getOrganizeId();
+        Long taskId = clueDto.getTaskId();
         if (organizeId != null) {
             taskOrganizeQueryCriteria.setOrganizeId(organizeId);
         }

services/ad-platform-source/src/main/java/com/baiye/feign/OrganizeClient.java

@@ -1,11 +1,13 @@
 package com.baiye.feign;
 
 import com.baiye.feign.fallback.OrganizeClientFallback;
+import com.baiye.model.dto.ClueDto;
 import com.baiye.model.dto.OrganizeQueryCriteria;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -19,12 +21,11 @@ public interface OrganizeClient {
 
     /**
      * 查询组标签和任务标签
-     * @param taskId
-     * @param organizeId
+     * @param clueDto
      * @return
      */
-    @GetMapping(PAY_PREFIX + "/getLabel")
-    ResponseEntity<Map<String, List<String>>> getLabel(@RequestParam("taskId") Long taskId,@RequestParam("organizeId") Long organizeId);
+    @PostMapping(PAY_PREFIX + "/getLabel")
+    ResponseEntity<Map<String, List<String>>> getLabel(@RequestBody ClueDto clueDto);
 
     @ApiOperation("查询组")
     @GetMapping(PAY_PREFIX + "/query")

services/ad-platform-source/src/main/java/com/baiye/feign/fallback/OrganizeClientFallback.java

@@ -1,6 +1,7 @@
 package com.baiye.feign.fallback;
 
 import com.baiye.feign.OrganizeClient;
+import com.baiye.model.dto.ClueDto;
 import com.baiye.model.dto.OrganizeQueryCriteria;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -10,8 +11,10 @@ import java.util.Map;
 
 @Component
 public class OrganizeClientFallback implements OrganizeClient {
+
+
     @Override
-    public ResponseEntity<Map<String, List<String>>> getLabel(Long taskId, Long organizeId) {
+    public ResponseEntity<Map<String, List<String>>> getLabel(ClueDto clueDto) {
         return null;
     }
 

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -144,7 +144,9 @@ public class ClueServiceImpl implements ClueService {
             for (ClueDto clueDto : clueDtoList) {
                 String str = (String) redisUtils.get(String.valueOf(clueDto.getTaskId()));
                 if (StringUtils.isBlank(str)) {
-                    Map<String, List<String>> body = organizeClient.getLabel(clueDto.getTaskId(), null).getBody();
+                    //设置空,取值判断空
+                    clueDto.setOrganizeId(null);
+                    Map<String, List<String>> body = organizeClient.getLabel(clueDto).getBody();
                     str = body.get("taskName").get(0);
                 }
                 clueDto.setTaskName(str);
@@ -165,7 +167,7 @@ public class ClueServiceImpl implements ClueService {
             if (clueQueryCriteria.getId() != null) {
                 for (ClueDto clueDto : clueDtoList) {
                     //循环查库，ID查询只一次循环
-                    Map<String, List<String>> mapList = organizeClient.getLabel(clueDto.getTaskId(), clueDto.getOrganizeId()).getBody();
+                    Map<String, List<String>> mapList = organizeClient.getLabel(clueDto).getBody();
                     clueDto.setBaseLabel(mapList.get("baseLabel"));
                     clueDto.setOrganizeLabel(mapList.get("organizeLabel"));
                 }