Merge branch 'feature' into 'release'

新增情报方案和关键词配置2

See merge request !342

src/main/java/com/zhiwei/brandkbs2/controller/app/AppWarnController.java

@@ -126,6 +126,18 @@ public class AppWarnController extends BaseController {
         }
     }
 
+    @ApiOperation("情报预警-推送任务删除")
+    @DeleteMapping("/project")
+    @Auth(role = RoleEnum.ADMIN)
+    public ResponseResult deletePushTaskId(@RequestParam(value = "taskId") String taskId) {
+        try {
+            return pushTaskId(taskId, null, HttpMethod.DELETE);
+        } catch (Exception e) {
+            log.error("情报预警-推送任务删除失败", e);
+            return ResponseResult.failure("情报预警-推送任务删除失败");
+        }
+    }
+
     @ApiOperation("情报预警-获取项目预警更新条件")
     @GetMapping("/warnCriteria")
     public ResponseResult getProjectWarnCriteria(@RequestParam(value = "type") String type) {
@@ -309,6 +321,11 @@ public class AppWarnController extends BaseController {
             request = new HttpEntity<>(headers);
             return ResponseResult.success(restTemplate.exchange(warnProjectUrl + "?projectId={1}&projectName={2}", httpMethod, request, JSONObject.class, projectId, projectName).getBody().getJSONArray("data"));
         }
+        if (HttpMethod.DELETE == httpMethod) {
+            request = new HttpEntity<>(headers);
+            return ResponseResult.success(restTemplate.exchange(warnProjectUrl + "/"+taskId, httpMethod, request, JSONObject.class).getBody().getJSONArray(
+                    "data"));
+        }
        JSONObject paramMap = new JSONObject();
         paramMap.put("planName", planName);
         if (HttpMethod.PUT == httpMethod) {