From 074cd8949b29fd414ca6c6b38b823976d1a03068 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Fri, 3 Mar 2023 09:51:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0common?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Geo.php           | 16 +++++++-------
 app/common/model/geo/GeoArea.php     | 26 +++++++++++++++++++++++
 app/common/model/geo/GeoBrigade.php  | 22 ++++++++++++++++++++
 app/common/model/geo/GeoCity.php     | 25 ++++++++++++++++++++++
 app/common/model/geo/GeoProvince.php | 31 ++++++++++++++++++++++++++++
 app/common/model/geo/GeoStreet.php   | 23 +++++++++++++++++++++
 app/common/model/geo/GeoVillage.php  | 25 ++++++++++++++++++++++
 7 files changed, 161 insertions(+), 7 deletions(-)
 create mode 100644 app/common/model/geo/GeoArea.php
 create mode 100644 app/common/model/geo/GeoBrigade.php
 create mode 100644 app/common/model/geo/GeoCity.php
 create mode 100644 app/common/model/geo/GeoProvince.php
 create mode 100644 app/common/model/geo/GeoStreet.php
 create mode 100644 app/common/model/geo/GeoVillage.php

diff --git a/app/api/controller/Geo.php b/app/api/controller/Geo.php
index 296557d..1480db5 100644
--- a/app/api/controller/Geo.php
+++ b/app/api/controller/Geo.php
@@ -11,12 +11,13 @@ namespace app\api\controller;
 
 use app\api\BaseController;
 use app\api\middleware\Auth;
-use app\api\model\GeoProvince as GeoProvinceModel;
-use app\api\model\GeoCity as GeoCityModel;
-use app\api\model\GeoArea as GeoAreaModel;
-use app\api\model\GeoStreet as GeoStreetModel;
-use app\api\model\GeoVillage as GeoVillageModel;
-use app\api\model\GeoBrigade as GeoBrigadeModel;
+use app\common\model\geo\GeoProvince as GeoProvinceModel;
+use app\common\model\geo\GeoCity as GeoCityModel;
+use app\common\model\geo\GeoArea as GeoAreaModel;
+use app\common\model\geo\GeoStreet as GeoStreetModel;
+use app\common\model\geo\GeoVillage as GeoVillageModel;
+use app\common\model\geo\GeoBrigade as GeoBrigadeModel;
+
 
 /**
  * 首页接口
@@ -29,7 +30,7 @@ class Geo extends BaseController
      * @var array
      */
     protected $middleware = [
-        Auth::class => ['except' => ['Province','City','Area','Street','Village', 'Brigade']]
+        Auth::class => ['except' => ['Province','City','Area','Street','Village', 'Brigade','test']]
     ];
 
     /**
@@ -124,4 +125,5 @@ class Geo extends BaseController
 
         $this->apiSuccess('OK',$list);
     }
+
 }
\ No newline at end of file
diff --git a/app/common/model/geo/GeoArea.php b/app/common/model/geo/GeoArea.php
new file mode 100644
index 0000000..c1ca65e
--- /dev/null
+++ b/app/common/model/geo/GeoArea.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动模型
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+class GeoArea extends Model 
+{
+    protected $table = "fa_geo_area";
+
+    static function Get($pcode){
+        $list = self::where(['switch'=>1,'city_code'=>$pcode])
+        ->field('area_id id,area_code code,area_name name')
+        ->select();
+
+        return $list;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/common/model/geo/GeoBrigade.php b/app/common/model/geo/GeoBrigade.php
new file mode 100644
index 0000000..ec7385a
--- /dev/null
+++ b/app/common/model/geo/GeoBrigade.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动 - 大队
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+class GeoBrigade extends Model
+{
+    protected $table="fa_geo_brigade";
+
+    static function Get(){
+        $res = self::select();
+
+        return $res;
+    }
+}
\ No newline at end of file
diff --git a/app/common/model/geo/GeoCity.php b/app/common/model/geo/GeoCity.php
new file mode 100644
index 0000000..b576af8
--- /dev/null
+++ b/app/common/model/geo/GeoCity.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动模型
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+class GeoCity extends Model {
+    protected $table = "fa_geo_city";
+
+    static function Get($pcode){
+        $list = self::where(['switch'=>1,'province_code'=>$pcode])
+        ->field('city_id id,city_code code,city_name name')
+        ->select();
+
+        return $list;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/common/model/geo/GeoProvince.php b/app/common/model/geo/GeoProvince.php
new file mode 100644
index 0000000..5d5d161
--- /dev/null
+++ b/app/common/model/geo/GeoProvince.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动模型
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+class GeoProvince extends Model {
+    protected $table = "fa_geo_province";
+
+    // public function test(){
+    //     return $this->belongsToMany(User::class,'fa_geo_city','user_id','role_id');
+    // }
+
+    /**
+     * 省
+     */
+    static function Get(){
+        $res = self::where(['switch'=>1])
+        ->field('province_id id,province_code code,province_name name')
+        ->select();
+
+        return $res;
+    }
+
+}
\ No newline at end of file
diff --git a/app/common/model/geo/GeoStreet.php b/app/common/model/geo/GeoStreet.php
new file mode 100644
index 0000000..cf9b998
--- /dev/null
+++ b/app/common/model/geo/GeoStreet.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动模型
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+class GeoStreet extends Model{
+    protected $table = "fa_geo_street";
+
+    static function Get($pcode) {
+        $list = self::where(['switch'=>1,'area_code'=>$pcode])
+        ->field('street_id id,street_code code,street_name name')
+        ->select();
+
+        return $list;
+    }
+}
\ No newline at end of file
diff --git a/app/common/model/geo/GeoVillage.php b/app/common/model/geo/GeoVillage.php
new file mode 100644
index 0000000..20d98f1
--- /dev/null
+++ b/app/common/model/geo/GeoVillage.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @date ：2023年03月2日
+ * @author：刘孝全
+ * @email：q8197264@126.com
+ * 
+ * @ 地区联动模型
+ */
+namespace app\common\model\geo;
+
+use think\model;
+
+
+class GeoVillage extends Model
+{
+    protected $table = "fa_geo_village";
+
+    static function Get($pcode) {
+        $list = self::where(['switch'=>1,'street_code'=>$pcode])
+        ->field('village_id id,village_code code,village_name name')
+        ->select();
+
+        return $list;
+    }
+}
\ No newline at end of file

From dac8701e955fb8ab51a0e43b8e8763f70890a2c2 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Fri, 3 Mar 2023 09:57:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4api=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=B9=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0common?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/model/GeoArea.php     | 26 --------------------------
 app/api/model/GeoBrigade.php  | 22 ----------------------
 app/api/model/GeoCity.php     | 25 -------------------------
 app/api/model/GeoProvince.php | 31 -------------------------------
 app/api/model/GeoStreet.php   | 23 -----------------------
 app/api/model/GeoVillage.php  | 25 -------------------------
 6 files changed, 152 deletions(-)
 delete mode 100644 app/api/model/GeoArea.php
 delete mode 100644 app/api/model/GeoBrigade.php
 delete mode 100644 app/api/model/GeoCity.php
 delete mode 100644 app/api/model/GeoProvince.php
 delete mode 100644 app/api/model/GeoStreet.php
 delete mode 100644 app/api/model/GeoVillage.php

diff --git a/app/api/model/GeoArea.php b/app/api/model/GeoArea.php
deleted file mode 100644
index 1b54431..0000000
--- a/app/api/model/GeoArea.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动模型
- */
-namespace app\api\model;
-
-use think\model;
-
-class GeoArea extends Model 
-{
-    protected $table = "fa_geo_area";
-
-    static function Get($pcode){
-        $list = self::where(['switch'=>1,'city_code'=>$pcode])
-        ->field('area_id id,area_code code,area_name name')
-        ->select();
-
-        return $list;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/api/model/GeoBrigade.php b/app/api/model/GeoBrigade.php
deleted file mode 100644
index 5ad8392..0000000
--- a/app/api/model/GeoBrigade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动 - 大队
- */
-namespace app\api\model;
-
-use think\model;
-
-class GeoBrigade extends Model
-{
-    protected $table="fa_geo_brigade";
-
-    static function Get(){
-        $res = self::select();
-
-        return $res;
-    }
-}
\ No newline at end of file
diff --git a/app/api/model/GeoCity.php b/app/api/model/GeoCity.php
deleted file mode 100644
index 876b58c..0000000
--- a/app/api/model/GeoCity.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动模型
- */
-namespace app\api\model;
-
-use think\model;
-
-class GeoCity extends Model {
-    protected $table = "fa_geo_city";
-
-    static function Get($pcode){
-        $list = self::where(['switch'=>1,'province_code'=>$pcode])
-        ->field('city_id id,city_code code,city_name name')
-        ->select();
-
-        return $list;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/api/model/GeoProvince.php b/app/api/model/GeoProvince.php
deleted file mode 100644
index 7083f2e..0000000
--- a/app/api/model/GeoProvince.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动模型
- */
-namespace app\api\model;
-
-use think\model;
-
-class GeoProvince extends Model {
-    protected $table = "fa_geo_province";
-
-    // public function test(){
-    //     return $this->belongsToMany(User::class,'fa_geo_city','user_id','role_id');
-    // }
-
-    /**
-     * 省
-     */
-    static function Get(){
-        $res = self::where(['switch'=>1])
-        ->field('province_id id,province_code code,province_name name')
-        ->select();
-
-        return $res;
-    }
-
-}
\ No newline at end of file
diff --git a/app/api/model/GeoStreet.php b/app/api/model/GeoStreet.php
deleted file mode 100644
index cdbaaf3..0000000
--- a/app/api/model/GeoStreet.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动模型
- */
-namespace app\api\model;
-
-use think\model;
-
-class GeoStreet extends Model{
-    protected $table = "fa_geo_street";
-
-    static function Get($pcode) {
-        $list = self::where(['switch'=>1,'area_code'=>$pcode])
-        ->field('street_id id,street_code code,street_name name')
-        ->select();
-
-        return $list;
-    }
-}
\ No newline at end of file
diff --git a/app/api/model/GeoVillage.php b/app/api/model/GeoVillage.php
deleted file mode 100644
index 0913832..0000000
--- a/app/api/model/GeoVillage.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @date ：2023年03月2日
- * @author：刘孝全
- * @email：q8197264@126.com
- * 
- * @ 地区联动模型
- */
-namespace app\api\model;
-
-use think\model;
-
-
-class GeoVillage extends Model
-{
-    protected $table = "fa_geo_village";
-
-    static function Get($pcode) {
-        $list = self::where(['switch'=>1,'street_code'=>$pcode])
-        ->field('village_id id,village_code code,village_name name')
-        ->select();
-
-        return $list;
-    }
-}
\ No newline at end of file