smlz99
diff --git a/‎api/app/Http/Controllers/Admin/TableConfigController.php
Lines changed: 400 additions & 0 deletions b/‎api/app/Http/Controllers/Admin/TableConfigController.php
Lines changed: 400 additions & 0 deletions
diff --git a/‎api/app/Http/Controllers/Admin/TableController.php
Lines changed: 106 additions & 9 deletions b/‎api/app/Http/Controllers/Admin/TableController.php
Lines changed: 106 additions & 9 deletions
diff --git a/‎api/app/Http/Controllers/Admin/WechatController.php
Lines changed: 9 additions & 8 deletions b/‎api/app/Http/Controllers/Admin/WechatController.php
Lines changed: 9 additions & 8 deletions
diff --git a/‎api/app/Http/Resources/TableConfig.php
Lines changed: 40 additions & 0 deletions b/‎api/app/Http/Resources/TableConfig.php
Lines changed: 40 additions & 0 deletions
diff --git a/‎api/app/Http/Resources/TableConfigCollection.php
Lines changed: 23 additions & 0 deletions b/‎api/app/Http/Resources/TableConfigCollection.php
Lines changed: 23 additions & 0 deletions
diff --git a/‎api/app/Http/Resources/Template.php
Lines changed: 0 additions & 2 deletions b/‎api/app/Http/Resources/Template.php
Lines changed: 0 additions & 2 deletions
diff --git a/‎api/app/Http/Resources/Wechat.php
Lines changed: 6 additions & 3 deletions b/‎api/app/Http/Resources/Wechat.php
Lines changed: 6 additions & 3 deletions
diff --git a/‎api/app/Http/Resources/WechatCollection.php
Lines changed: 3 additions & 3 deletions b/‎api/app/Http/Resources/WechatCollection.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎api/app/Models/TableConfig.php
Lines changed: 20 additions & 0 deletions b/‎api/app/Models/TableConfig.php
Lines changed: 20 additions & 0 deletions
diff --git a/‎api/app/Models/Template.php
Lines changed: 1 addition & 5 deletions b/‎api/app/Models/Template.php
Lines changed: 1 addition & 5 deletions
@@ -243,11 +243,112 @@ public function download()
         // 处理后端控制器数据
         $code = $this->createCodeBySnippet($snippet->back_api, $config);
         $code = str_replace("##fillable##", $fillable, $code);
+        $format = "\$this->model::paginate(\$pageSize)";
+        $value = '';
+        foreach ($tableConfig as $v) {
+            if ($v->query_type) {
+                $title = ucfirst($v->column_name);
+                $content = <<<STR
+                 $title()->
+                 STR;
+             $value = $value . $content;
+            }
+        }
+        $value = "\$this->model::".trim($value)."paginate(\$pageSize)";
+        $code = str_replace($format, $value, $code);
         $fileName = $config['back_model'] . 'Controller.php';
         $path = 'api/app/Http/Controllers/Admin';
         file_put_contents(public_path('code/' . $tableName . '/' . $path) . "/$fileName", $code);
         // 后端模型
         $code = $this->createCodeBySnippet($snippet->back_model, $config);
+        // 模型中的条件
+        $format = "##scopeItem##";
+        $value = '';
+        foreach ($tableConfig as $v) {
+            if ($v->query_type) {
+                switch ($v->query_type) {
+                    case "=":
+                        $title = ucfirst($v->column_name);
+                        $content = <<<STR
+    public function scope$title(\$query)
+    {
+        \$params = request()->input('$v->column_name');
+        if (\$params) {
+            return \$query = \$query->where('$v->column_name', \$params);
+        } else {
+            return \$query;
+        }
+    }
+    
+STR;
+                        break;
+                    case "like":
+                        $title = ucfirst($v->column_name);
+                        $content = <<<STR
+    public function scope$title(\$query)
+    {
+        \$params = request()->input('$v->column_name');
+        if (\$params) {
+            return \$query = \$query->where('$v->column_name', 'like', "%".\$params."%");
+        } else {
+            return \$query;
+        }
+    }
+    
+STR;
+
+                        break;
+                    case "<>":
+                        $title = ucfirst($v->column_name);
+                        $content = <<<STR
+    public function scope$title(\$query)
+    {
+        \$params = request()->input('$v->column_name');
+        if (\$params) {
+            return \$query = \$query->where('$v->column_name', '<>', \$params);
+        } else {
+            return \$query;
+        }
+    }
+    
+STR;
+                        break;
+                    case "null":
+                        $title = ucfirst($v->column_name);
+                        $content = <<<STR
+    public function scope$title(\$query)
+    {
+        \$params = request()->input('$v->column_name');
+        if (\$params) {
+            return \$query = \$query->whereNull('$v->column_name');
+        } else {
+            return \$query;
+        }
+    }
+    
+STR;
+                        break;
+                    case "notnull":
+                        $title = ucfirst($v->column_name);
+                        $content = <<<STR
+    public function scope$title(\$query)
+    {
+        \$params = request()->input('$v->column_name');
+        if (\$params) {
+            return \$query = \$query->whereNotNull('$v->column_name');
+        } else {
+            return \$query;
+        }
+    }
+    
+STR;
+                        break;
+                }
+                $value = $value . $content;
+            }
+        }
+        $code = str_replace($format, $value, $code);
+
         $fileName = $config['back_model'] . '.php';
         $path = 'api/app/Models';
         file_put_contents(public_path('code/' . $tableName . '/' . $path) . "/$fileName", $code);
@@ -397,7 +498,7 @@ public function download()
                       </el-col>
             STR;
                         break;
-                        case "datetime":
+                    case "datetime":
                         $content = <<<STR
                         <el-col :span="12">
                             <el-form-item label="$v->column_comment" prop="$v->column_name">
@@ -434,7 +535,7 @@ public function download()
         $value = '';
         foreach ($tableConfig as $v) {
             if ($v->query_type) {
-                switch ($v->form_type){
+                switch ($v->form_type) {
                     case 'datetime':
                         $content = <<<STR
                             <el-form-item label="$v->column_comment">
@@ -450,7 +551,7 @@ public function download()
 
             STR;
                         break;
-                        case 'date':
+                    case 'date':
                         $content = <<<STR
                             <el-form-item label="$v->column_comment">
                                      <el-date-picker
@@ -467,7 +568,7 @@ public function download()
                         break;
                     case 'select':
                     case 'radio':
-                          $content = <<<STR
+                        $content = <<<STR
                             <el-form-item label="$v->column_comment">
                                 <el-select v-model="searchForm.$v->column_name" placeholder="请选择$v->column_comment">
                                   <el-option :value="true" :label="是"></el-option>
@@ -478,23 +579,19 @@ public function download()
             STR;
                         break;
                     default:
-                         $content = <<<STR
+                        $content = <<<STR
                             <el-form-item label="$v->column_comment">
                                 <el-input v-model="searchForm.$v->column_name" placeholder="请输入$v->column_comment">
                                 </el-input>
                             </el-form-item>
 
             STR;
-
                 }
-
-
                 $value = $value . $content;
             }
         }
         $code = str_replace($format, $value, $code);
 
-
         $fileName = 'index.vue';
         $path = "element/src/views/" . $config['front_model'];
         $file = public_path('code/' . $tableName . '/' . $path) . "/$fileName";
 
@@ -1,18 +1,19 @@
 <?php
 
+
 namespace App\Http\Controllers\Admin;
 
-use App\Models\Wechat;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Rap2hpoutre\FastExcel\FastExcel;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Http\Request;
 
 class WechatController extends Controller
 {
     use Tool;
     protected  $model = 'App\Models\Wechat';  // 当前模型
-    protected  $fillable = [];  // 当前模型可以修改和新增的字段
+    protected  $fillable = ['app_id', 'app_secret', 'type', 'status'];  // 当前模型可以修改和新增的字段
     protected  $resource = 'App\Http\Resources\Wechat'; // 显示个体资源
     protected  $resourceCollection = 'App\Http\Resources\WechatCollection'; // 显示资源集合
     protected  $map = [];   // 导入导出时候  数据表字段与说明的映射表
@@ -27,7 +28,7 @@ public function index(Request $request)
 
     protected  function  getListData($pageSize){
         // 当前列表数据  对应于原来的index
-        $data = $this->model::paginate($pageSize);
+        $data = $this->model::App_id()->App_secret()->paginate($pageSize);
         return new $this->resourceCollection($data);
     }
 
@@ -277,8 +278,8 @@ protected  function UpdateRule($id){
     }
 
 
-//    protected function  message(){
-//        return [];
-//    }
+   protected function  message(){
+       return [];
+   }
 
-}
+}
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TableConfig extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+//        $data = parent::toArray($request);
+//        $data = [
+//          'id' => $this->id?:0,
+//          'table_name' => $this->table_name,
+//          'column_name' => $this->column_name,
+//          'data_type' => $this->data_type,
+//          'column_comment' => $this->column_comment,
+//          'is_required' => is_bool($this->is_required)?$this->is_required:false,
+//
+//        ];
+
+        // 数据转换
+         $data = parent::toArray($request);
+        return $data;
+    }
+
+    public function with($request)
+    {
+        return [
+            'status' => 'success',
+            'status_code' => 200
+        ];
+    }
+}
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class TableConfigCollection extends ResourceCollection
+{
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => $this->collection,
+            'status' => 'success',
+            'status_code' => 200
+        ];
+    }
+}
@@ -15,8 +15,6 @@ class ##name## extends JsonResource
     public function toArray($request)
     {
         $data = parent::toArray($request);
-        $data['created_at'] = $data['created_at'] * 1000;
-        $data['updated_at'] = $data['updated_at'] * 1000;
         // 数据转换
 
         return $data;
 
@@ -15,14 +15,17 @@ class Wechat extends JsonResource
     public function toArray($request)
     {
         $data = parent::toArray($request);
+
+        // 数据转换
+
         return $data;
     }
 
     public function with($request)
     {
         return [
-          'status' => 'success',
-          'status_code' => 200
+            'status' => 'success',
+            'status_code' => 200
         ];
     }
-}
+}
@@ -15,9 +15,9 @@ class WechatCollection extends ResourceCollection
     public function toArray($request)
     {
         return [
-          'data' => $this->collection,
-          'status' => 'success',
-          'status_code' => 200
+            'data' => $this->collection,
+            'status' => 'success',
+            'status_code' => 200
         ];
   
57AE
  }
 }
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TableConfig extends Model
+{
+    //
+    protected $dateFormat = "Y-m-d H:i:s";
+    protected $casts = [
+      'is_required' => 'boolean',
+      'is_list' => 'boolean',
+      'is_form' => 'boolean',
+    ];
+
+    protected $guarded = [];
+
+
+}
@@ -7,11 +7,7 @@
 class ##name## extends Model
 {
     //
-    protected $casts =[
-      'created_at' => 'timestamp',
-      'updated_at' => 'timestamp'
-    ];
-
+    protected $dateFormat = "Y-m-d H:i:s";
     protected $guarded = [];