修改

catch/fan/FanService.php

@@ -1,23 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-namespace catchAdmin\fan;
-
-use catcher\ModuleService;
-
-class FanService extends ModuleService
-{
-    public function loadRouteFrom()
-    {
-        // TODO: Implement loadRouteFrom() method.
-        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
-    }
-}

catch/fan/database/migrations/20220510063603_fan_add_field.php

@@ -1,50 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-
-class FanAddField extends Migrator
-{
-    /**
-     * Change Method.
-     *
-     * Write your reversible migrations using this method.
-     *
-     * More information on writing migrations is available here:
-     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
-     *
-     * The following commands can be used in this method and Phinx will
-     * automatically reverse them when rolling back:
-     *
-     *    createTable
-     *    renameTable
-     *    addColumn
-     *    renameColumn
-     *    addIndex
-     *    addForeignKey
-     *
-     * Remember to call "create()" or "update()" and NOT "save()" when working
-     * with the Table class.
-     */
-    public function change()
-    {
-        if ($this->hasTable('fan')) {
-            $table = $this->table('fan');
-
-            $table->addColumn('name', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '风机名称',])
-            ->addColumn('img', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '图片',])
-            ->update();
-        }
-
-
-    }
-}

catch/fan/module.json

@@ -1,15 +0,0 @@
-{
-    "name": "fan",
-    "alias": "fan",
-    "description": "风机管理",
-    "version": "1.0.0",
-    "keywords": ["fan"],
-    "order": 0,
-    "services": [
-        "\\catchAdmin\\fan\\FanService"
-    ],
-    "aliases": {},
-    "files": [],
-    "requires": [],
-    "enable": true
-}

catch/fan/route.php

@@ -1,16 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-// you should use `$router`
-$router->group(function () use ($router){
-    $router->resource('fan', '\catchAdmin\fan\controller\Fan');
-})->middleware('auth');
-

catch/permissions/model/Area.php

@@ -53,7 +53,7 @@ class Area extends Model
                   ->where($cond)
                   ->select()
                   ->toTree();
-      return $res;                     
+      return $res;
     }
     /**
      * 获取区域组件数据

catch/fan/controller/Fan.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace catchAdmin\fan\controller;
+namespace catchAdmin\wind\controller;
 
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
-use catchAdmin\fan\model\Fan as fanModel;
+use catchAdmin\wind\model\Fan as fanModel;
 use think\facade\Db;
 
 class Fan extends CatchController

catch/fan/database/migrations/20220428195332_fan.php

@@ -31,12 +31,10 @@ class Fan extends Migrator
     {
         $table = $this->table('fan', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '风机表' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
         $table->addColumn('wind_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '风厂的id',])
-			->addColumn('number', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '编号',])
-			->addColumn('supplier', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '供应商',])
-			->addColumn('production_date', 'date', ['null' => true,'signed' => true,'comment' => '出厂日期',])
-			->addColumn('install_date', 'date', ['null' => true,'signed' => true,'comment' => '安装日期',])
-			->addColumn('location', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '位置',])
-			->addColumn('lng_lat', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '经纬度（json）',])
+			->addColumn('number', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '机位号',])
+			->addColumn('fan_model', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '风机型号',])
+            ->addColumn('longitude', 'decimal', ['precision' => 10,'scale' => 6,'null' => true,'signed' => true,'comment' => '经度',])
+            ->addColumn('latitude', 'decimal', ['precision' => 10,'scale' => 6,'null' => true,'signed' => true,'comment' => '纬度',])
 			->addColumn('info', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '备注',])
 			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建人ID',])
 			->addColumn('created_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建时间',])

catch/fan/model/Fan.php

@@ -1,17 +1,16 @@
 <?php
 
-namespace catchAdmin\fan\model;
+namespace catchAdmin\wind\model;
 
 use catcher\base\CatchModel as Model;
-use catcher\traits\db\BaseOptionsTrait;
-use catcher\traits\db\ScopeTrait;
 use think\facade\Db;
-use catchAdmin\fan\model\get\FanGet;
-use catchAdmin\fan\model\search\FanSearch;
-
+use catchAdmin\wind\model\get\FanGet;
+use catchAdmin\wind\model\search\FanSearch;
+use catchAdmin\permissions\model\DataRangScopeTrait;
 class Fan extends Model
 {
-    use BaseOptionsTrait, ScopeTrait;
+
+    use DataRangScopeTrait;
     use FanGet;
     use FanSearch;
     // 表名
@@ -23,17 +22,9 @@ class Fan extends Model
         'wind_id',
         // 编号
         'number',
-        // 供应商
-        'supplier',
-        // 出厂日期
-        'production_date',
-        // 安装日期
-        'install_date',
-        // 位置
-        'location',
-        // 经纬度（json）
-        'lng_lat',
-        // 备注
+        'fan_model',
+        'longitude',
+        'latitude',
         'info',
         // 创建人ID
         'creator_id',
@@ -43,14 +34,12 @@ class Fan extends Model
         'updated_at',
         // 软删除
         'deleted_at',
-        // 风机名称 
-        'name',
-        // 图片
-        'img',
+ 
     );
     public function getList()
     {
-        return $this->catchSearch()
+        return $this->dataRange()
+        ->catchSearch()
         ->append(['wind_name'])
         ->field('*')
         ->catchOrder()

catch/fan/model/get/FanGet.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\fan\model\get;
+namespace catchAdmin\wind\model\get;
 
 use think\facade\Db;
 

catch/fan/model/search/FanSearch.php

@@ -1,5 +1,5 @@
 <?php
-namespace catchAdmin\fan\model\search;
+namespace catchAdmin\wind\model\search;
 trait FanSearch
 {
 

catch/wind/route.php

@@ -14,4 +14,5 @@ $router->group(function () use ($router){
 	// wind路由
 	$router->get('wind/getWindList', '\catchAdmin\wind\controller\Wind@getWindList');
 	$router->resource('wind', '\catchAdmin\wind\controller\Wind');
+	$router->resource('fan', '\catchAdmin\wind\controller\Fan');
 })->middleware('auth');