From 40043859df19fd29d5bbb682fe9d2fb67bc76f3e Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Fri, 19 May 2023 15:06:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80/=E7=9F=AD=E4=BF=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81/=E7=BA=BF=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/ClewController.java    | 14 +++++++++-----
 .../controller/system/CompanyAppController.java  | 16 +++++++++++-----
 .../web/controller/tool/NoticeController.java    |  7 +++++++
 .../com/ruoyi/framework/config/ShiroConfig.java  |  4 ++++
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
index 5aae5d77..5e5a1171 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
@@ -5,11 +5,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.Clew;
@@ -89,6 +85,14 @@ public class ClewController extends BaseController
         return toAjax(clewService.insertClew(clew));
     }
 
+
+    @PostMapping("/app/add")
+    @ResponseBody
+    public AjaxResult appAddSave(@RequestBody Clew clew)
+    {
+        return toAjax(clewService.insertClew(clew));
+    }
+
     /**
      * 修改线索
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompanyAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompanyAppController.java
index 7a38d07d..484dfaa6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompanyAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompanyAppController.java
@@ -1,15 +1,14 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Collection;
 import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.CompanyApp;
@@ -54,6 +53,13 @@ public class CompanyAppController extends BaseController
         return getDataTable(list);
     }
 
+    @PostMapping("/app/getById")
+    @ResponseBody
+    public AjaxResult getById(@RequestBody CompanyApp companyApp)
+    {
+        return AjaxResult.success(companyAppService.selectCompanyAppById(companyApp.getId()));
+    }
+
     /**
      * 导出客户端列表
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
index 7c034e28..de3765e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
@@ -29,6 +29,13 @@ import javax.validation.Valid;
 @RequestMapping("/tool/notice")
 public class NoticeController {
 
+    @PostMapping("/logout")
+    @ResponseBody
+    public AjaxResult logout(@RequestBody NoticeRequest request){
+
+        return AjaxResult.success("注销成功!");
+    }
+
 
     @PostMapping("/sendSms")
     @ResponseBody
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index e179452f..63c88599 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -290,6 +290,10 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/captcha/captchaImage**", "anon");
         // 短信验证码接口
         filterChainDefinitionMap.put("/tool/notice/**", "anon");
+        // app查询
+        filterChainDefinitionMap.put("/system/app/app/**", "anon");
+        // 线索接口
+        filterChainDefinitionMap.put("/system/clew/app/**", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问