From 443d08670abc474accf385fa26578995a49dc848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Wed, 8 Feb 2023 16:36:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E9=95=87=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Village.php | 90 ++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/app/api/controller/Village.php b/app/api/controller/Village.php
index 011fe1e..2765d33 100644
--- a/app/api/controller/Village.php
+++ b/app/api/controller/Village.php
@@ -453,6 +453,96 @@ class Village extends BaseController
         }
     }
 
+    //  我的镇
+    public function get_my_town(){
+        $user_id = JWT_UID;
+        if (empty($user_id)) {
+            $this->apiError('请先登录');
+        }
+        $where[] = ['user_id', '=', $user_id];
+//        获取用户地区
+        $address = Db::table('fa_szxc_information_useraddress')->where($where)->find();
+        //            组装地址名
+        if ($address['area_id'] != '') {
+            $area_name = Db::table('fa_geo_area')->where('area_code', $address['area_id'])->value('area_name');
+        }
+        if ($address['street_id'] != '') {
+            $street_name = Db::table('fa_geo_street')->where('street_code', $address['street_id'])->value('street_name');
+        }
+//        if ($address['village_id'] != '') {
+//            $village = Db::table('fa_geo_village')->where('village_code', $address['village_id'])->value('village_name');
+//        }
+//        if ($address['brigade_id'] != '') {
+//            $brigade_name = Db::table('fa_geo_brigade')->where('id', $address['brigade_id'])->value('brigade_name');
+//        }
+        $address_name = '泸州市'.$area_name . $street_name ;
+
+            // 判断redis
+            if(JWT_UID){
+                $name = JWT_UID . $address['street_id'];
+                $is_zan = Cache::store('redis')->get($name);
+                if($is_zan){
+                    $news['is_dz'] = 1;
+                }else{
+                    $news['is_dz'] = 0;
+                }
+            }else{
+                $news['is_dz'] = 0;
+            }
+            $news['id'] = $address['street_id'];
+            $news['title'] = $address_name;
+            $news['address'] = $address_name;
+            $news['images'] = ["https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230115/4dc84e69408fef859e8553a5c7091197.jpg"];
+            $news['info'] = $address_name;
+            $news['area_id'] = $address['area_id'];
+            $news['street_id'] = $address['street_id'];
+            $news['village_id'] = $address['village_id'];
+            //            获取天气
+//            101271007 纳溪    510503
+//            101271002 江阳区  510502
+//            101271008 龙马潭区  510504
+//            101271003 泸县   510521
+//            101271004 合江   510522
+//            101271006 古蔺   510525
+//            101271005 叙永  510524
+//            判断区域
+            if($news['area_id'] == '510503'){
+                $name = '101271007';
+            }
+            if($news['area_id'] == '510502'){
+                $name = '101271002';
+            }
+            if($news['area_id'] == '510504'){
+                $name = '101271008';
+            }
+            if($news['area_id'] == '510521'){
+                $name = '101271003';
+            }
+            if($news['area_id'] == '510522'){
+                $name = '101271004';
+            }
+            if($news['area_id'] == '510525'){
+                $name = '101271006';
+            }
+            if($news['area_id'] == '510524'){
+                $name = '101271005';
+            }
+            $url = "https://devapi.qweather.com/v7/weather/now?key=b3e94fa75aae4551b6a5db150b409261&location=".$name;
+            $is_cun = Cache::store('redis')->get($name);
+            if($is_cun){
+                $data = json_decode($is_cun,1);
+                $news['weather'] = $data;
+            }else{
+                $data = file_get_contents("compress.zlib://".$url);
+                Cache::store('redis')->set($name,$data,1800);
+                $data = json_decode($data,1);
+                $news['weather'] = $data;
+            }
+//            halt($data);die;
+            $news['people_num'] = Db::table('fa_szxc_information_useraddress')->where('village_id',$news['village_id'])->where('status',1)->count();
+            $this->apiSuccess('获取成功', $news);
+        }
+
 
 
 }

From 936cd5d64813925e740b6eb953ca43c34235af4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Wed, 8 Feb 2023 16:43:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Village.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/controller/Village.php b/app/api/controller/Village.php
index 2765d33..4097690 100644
--- a/app/api/controller/Village.php
+++ b/app/api/controller/Village.php
@@ -489,6 +489,7 @@ class Village extends BaseController
             }else{
                 $news['is_dz'] = 0;
             }
+            $news['dz_num'] = Db::table('fa_szxc_village')->where('street_id',$address['street_id'])->sum('likes');
             $news['id'] = $address['street_id'];
             $news['title'] = $address_name;
             $news['address'] = $address_name;