From 41f8655aeb1c873864ac2a96561d498878388abe Mon Sep 17 00:00:00 2001
From: "675061370@qq.com" <you@example.com>
Date: Tue, 15 Oct 2024 21:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E4=B8=AA?=
 =?UTF-8?q?=E5=88=AB=E6=83=85=E5=86=B5=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Source.php | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/admin/controller/Source.php b/app/admin/controller/Source.php
index 7d68b0f..52c2713 100644
--- a/app/admin/controller/Source.php
+++ b/app/admin/controller/Source.php
@@ -207,6 +207,9 @@ class Source extends QfShop
                 if ($extension == 'csv') {
                     $PHPReader = new \PHPExcel_Reader_CSV();
                     $encoding = $this->detectFileEncoding($file_name);
+                    if (!$encoding || strtoupper($encoding) == 'UTF-8') {
+                        $encoding = 'GBK'; // 尝试将其强制转为GBK
+                    }
                     $PHPReader->setInputEncoding($encoding);
                     $PHPReader->setDelimiter(',');
                 } elseif ($extension == 'xlsx') {
@@ -217,21 +220,20 @@ class Source extends QfShop
                     return jerr('不支持的文件类型');
                 }
                 
-                // //读取excel文件
-                // $PHPReader = new \PHPExcel_Reader_CSV();
-                // //默认输入字符集// 判断文件编码
-                // $encoding = $this->detectFileEncoding($file_name);
-                // $PHPReader->setInputEncoding($encoding);
-                // //默认的分隔符
-                // $PHPReader->setDelimiter(',');
-                
-                
                 //载入文件
                 $objExcel = $PHPReader->load($file_name);
                 $excel_array = $objExcel ->getSheet(0)->toArray();
                 array_shift($excel_array);  //删除第一个数组(标题);
                 $data = [];
                 $i = 0;
+                $existing_data = [];
+
+                // 先查询数据库中所有已存在的 title 和 is_type 组合
+                $existing_records = $this->model->field('title, is_type')->select()->toArray();
+                // 将查询结果转换为关联数组用于快速查找
+                foreach ($existing_records as $record) {
+                    $existing_data[$record['title'] . '_' . $record['is_type']] = true;
+                }
 
                  //删除这个文件
                 unlink("./uploads/".$saveName);
@@ -254,17 +256,20 @@ class Source extends QfShop
                     }
                     
                     $is_type = $url?determineIsType($url):0;
-                    $map = [];
-                    $map[] = ['title', '=',$title];
-                    $map[] = ['is_type', '=',$is_type];
-                    $res = $this->model->where($map)->find();
-                    if (empty($res) && $url) {
+
+                    $key = $title . '_' . $is_type;
+
+                    // 先检查内存缓存的 existing_data，避免重复插入
+                    if (!isset($existing_data[$key]) && $url) {
                         $data[$k]['title'] = $title;
                         $data[$k]['url'] = $url;
                         $data[$k]["is_type"] = $is_type;
                         $data[$k]['source_category_id'] = input('source_category_id')??0;
                         $data[$k]['update_time'] = time();
                         $data[$k]['create_time'] = time();
+
+                        // 将新插入的记录加入缓存，防止后续重复处理
+                        $existing_data[$key] = true;
                         $i++;
                     }
                 }