From 081467c514cd610bc5b62def94ebc42916e4de0e Mon Sep 17 00:00:00 2001
From: liyuqi <btobab@126.com>
Date: Sun, 23 Feb 2025 20:33:09 +0800
Subject: [PATCH] add countAvailable

---
 .../ruoyi/web/controller/app/AppLocationController.java    | 6 ++++++
 .../java/com/ruoyi/framework/config/SecurityConfig.java    | 2 +-
 .../main/java/com/ruoyi/app/mapper/AppLocationMapper.java  | 3 +++
 .../java/com/ruoyi/app/service/IAppLocationService.java    | 3 +++
 .../com/ruoyi/app/service/impl/AppLocationServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/app/AppLocationMapper.xml    | 7 +++++++
 6 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java
index 4db7fe27..73bc7862 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppLocationController.java
@@ -208,4 +208,10 @@ public class AppLocationController extends BaseController
         }
         return success("创建成功。");
     }
+
+    @Anonymous
+    @GetMapping("/count")
+    public AjaxResult count() {
+        return success(appLocationService.countAvailable());
+    }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index ccd91577..9f850928 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -114,7 +114,7 @@ public class SecurityConfig
                 requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn","/app/task/sendLocation", "/app/task/taskResult","/app/task/kk", "/system/storage/**").permitAll()
+                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn","/app/task/sendLocation", "/app/task/taskResult","/app/task/kk", "/system/storage/**", "/app/location/count").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java
index ec91d183..24b96dd4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppLocationMapper.java
@@ -3,6 +3,7 @@ package com.ruoyi.app.mapper;
 import com.ruoyi.app.domain.AppLocation;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -66,4 +67,6 @@ public interface AppLocationMapper
      * @return 结果
      */
     int deleteAppLocationByLocationIds(String[] locationIds);
+
+    Map<String, Integer> countAvailableStock();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java
index 6443f28e..14a16588 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppLocationService.java
@@ -3,6 +3,7 @@ package com.ruoyi.app.service;
 import com.ruoyi.app.domain.AppLocation;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Service接口
@@ -75,4 +76,6 @@ public interface IAppLocationService
     AppLocation requestLocation(int equipmentId);
 
     String sendLocation();
+
+    Map<String, Integer> countAvailable();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java
index c79706b7..24599213 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.app.service.impl;
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -217,4 +218,8 @@ public class AppLocationServiceImpl implements IAppLocationService {
         }
         return result;
     }
+
+    public Map<String, Integer> countAvailable() {
+        return appLocationMapper.countAvailableStock();
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml
index aed4b117..89ad3c2b 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml
@@ -65,6 +65,13 @@
         where location_id = #{locationId}
     </select>
 
+    <select id="countAvailableStock" resultType="java.util.Map">
+        SELECT
+                (SELECT COUNT(*) FROM app_location) AS total_count,
+                (SELECT COUNT(*) FROM app_location WHERE location_status = 0) AS available_count
+    </select>
+
+
     <insert id="insertAppLocation" parameterType="AppLocation">
         insert into app_location
         <trim prefix="(" suffix=")" suffixOverrides=",">