From e3c6cc1068c1fbb25672f7ac865109b96e4f5b57 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 9 Oct 2026 10:05:18 +0800
Subject: [PATCH] =?UTF-8?q?2026-10-09=20PDA=E6=A0=87=E9=A2=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=85=8D=E7=BD=AE=EF=BC=88application-dev.yml?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heai/common/config/PdaTitleAdvice.java    | 39 +++++++++++++++++++
 src/main/resources/application-dev.yml        |  6 ++-
 src/main/resources/mapper/pms/QcMapper.xml    |  2 +-
 src/main/resources/templates/login.ftl        |  4 +-
 src/main/resources/templates/pdaBase.ftl      |  4 +-
 5 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/heai/common/config/PdaTitleAdvice.java

diff --git a/src/main/java/com/heai/common/config/PdaTitleAdvice.java b/src/main/java/com/heai/common/config/PdaTitleAdvice.java
new file mode 100644
index 0000000..13c3767
--- /dev/null
+++ b/src/main/java/com/heai/common/config/PdaTitleAdvice.java
@@ -0,0 +1,39 @@
+package com.heai.common.config;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import java.util.Properties;
+
+/**
+ * 从 application-dev.yml 读取 PDA 标题并注入 Freemarker。
+ * 不依赖当前 spring.profiles.active，避免 test/prod 环境读不到该文件。
+ */
+@ControllerAdvice
+public class PdaTitleAdvice {
+
+    private static final String DEFAULT_TITLE = "赫艾-PDA";
+
+    @ModelAttribute("project_title")
+    public String projectTitle() {
+        return loadPdaTitle();
+    }
+
+    private String loadPdaTitle() {
+        try {
+            YamlPropertiesFactoryBean yaml = new YamlPropertiesFactoryBean();
+            yaml.setResources(new ClassPathResource("application-dev.yml"));
+            Properties properties = yaml.getObject();
+            if (properties != null) {
+                String title = properties.getProperty("pda.title");
+                if (title != null && !title.trim().isEmpty()) {
+                    return title.trim();
+                }
+            }
+        } catch (Exception ignored) {
+        }
+        return DEFAULT_TITLE;
+    }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index dc14fd9..00c7180 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -52,4 +52,8 @@ spring:
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://localhost:5432/gaotao_security
 #      username: gaotao
-#      password: 123456
\ No newline at end of file
+#      password: 123456
+
+# PDA 登录页 / 首页标题
+pda:
+  title: 赫艾-PDA
\ No newline at end of file
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index a2905f7..dac2dc9 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -4942,7 +4942,7 @@
         from
             part
         where
-            site = #{query.site}
+            site = #{query.site} and Active = 'Y'
             <if test="query.partNo != null and query.partNo != ''">
                 AND PartNo LIKE '%' + #{query.partNo} + '%'
             </if>
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index ee9ec79..d064f83 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <title>${project_title!"赫艾管理系统"}</title>
+    <title>${project_title!"赫艾-PDA"}</title>
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap-theme.min.css">
@@ -27,7 +27,7 @@
 </head>
 <body>
 <div class="container" style="margin-top: 30%;">
-    <h4 class="form-signin-heading" >赫艾-PDA</h4>
+    <h4 class="form-signin-heading">${project_title!"赫艾-PDA"}</h4>
     <label for="username" class="sr-only">用户名</label>
     <input type="text" id="username" name="username" class="form-control" autocomplete="off" placeholder="用户名" required autofocus><br>
     <label for="inputPassword" class="sr-only">Password</label>
diff --git a/src/main/resources/templates/pdaBase.ftl b/src/main/resources/templates/pdaBase.ftl
index b85569d..a3be2eb 100644
--- a/src/main/resources/templates/pdaBase.ftl
+++ b/src/main/resources/templates/pdaBase.ftl
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="description" content="">
 	<meta name="author" content="">
-	<title>${project_title!"赫艾Pda"}</title>
+	<title>${project_title!"赫艾-PDA"}</title>
 	<!-- Bootstrap core CSS -->
 	<link rel="stylesheet" type="text/css" href="/js/bootstrap-3.3.7/css/bootstrap.css">
 
@@ -31,7 +31,7 @@
 		<header data-v-45aee492="" class="mint-header is-fixed" style="background-color: #17b3a3">  <#--style="background-color: #FF7F24"-->
 			<div class="mint-header-button is-left">
 				<div data-v-45aee492="" class="header-title">
-					<span data-v-45aee492="" style="font-size: 16px;">赫艾-PDA</span>
+					<span data-v-45aee492="" style="font-size: 16px;">${project_title!"赫艾-PDA"}</span>
 					<#--						<img data-v-45aee492=""-->
 					<#--							 src="data:image/png;base64,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"-->
 					<#--							 class="logo" style="width: 11%;height: 23px;margin-left: 10px;">-->