优化

application/admin/controller/Command.php

@@ -0,0 +1,248 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+use think\Config;
+use think\console\Input;
+use think\Db;
+use think\Exception;
+
+/**
+ * 在线命令管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Command extends Backend
+{
+
+    /**
+     * Command模型对象
+     */
+    protected $model = null;
+    protected $noNeedRight = ['get_controller_list', 'get_field_list'];
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Command;
+        $this->view->assign("statusList", $this->model->getStatusList());
+    }
+
+    /**
+     * 添加
+     */
+    public function add()
+    {
+
+        $tableList = [];
+        $list = \think\Db::query("SHOW TABLES");
+        foreach ($list as $key => $row) {
+            $tableList[reset($row)] = reset($row);
+        }
+
+        $this->view->assign("tableList", $tableList);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 获取字段列表
+     * @internal
+     */
+    public function get_field_list()
+    {
+        $dbname = Config::get('database.database');
+        $prefix = Config::get('database.prefix');
+        $table = $this->request->request('table');
+        //从数据库中获取表字段信息
+        $sql = "SELECT * FROM `information_schema`.`columns` "
+            . "WHERE TABLE_SCHEMA = ? AND table_name = ? "
+            . "ORDER BY ORDINAL_POSITION";
+        //加载主表的列
+        $columnList = Db::query($sql, [$dbname, $table]);
+        $fieldlist = [];
+        foreach ($columnList as $index => $item) {
+            $fieldlist[] = $item['COLUMN_NAME'];
+        }
+        $this->success("", null, ['fieldlist' => $fieldlist]);
+    }
+
+    /**
+     * 获取控制器列表
+     * @internal
+     */
+    public function get_controller_list()
+    {
+        //搜索关键词,客户端输入以空格分开,这里接收为数组
+        $word = (array)$this->request->request("q_word/a");
+        $word = implode('', $word);
+
+        $adminPath = dirname(__DIR__) . DS;
+        $controllerDir = $adminPath . 'controller' . DS;
+        $files = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($controllerDir), \RecursiveIteratorIterator::LEAVES_ONLY
+        );
+        $list = [];
+        foreach ($files as $name => $file) {
+            if (!$file->isDir()) {
+                $filePath = $file->getRealPath();
+                $name = str_replace($controllerDir, '', $filePath);
+                $name = str_replace(DS, "/", $name);
+                if (!preg_match("/(.*)\.php\$/", $name)) {
+                    continue;
+                }
+                if (!$word || stripos($name, $word) !== false) {
+                    $list[] = ['id' => $name, 'name' => $name];
+                }
+            }
+        }
+        $pageNumber = $this->request->request("pageNumber");
+        $pageSize = $this->request->request("pageSize");
+        return json(['list' => array_slice($list, ($pageNumber - 1) * $pageSize, $pageSize), 'total' => count($list)]);
+    }
+
+    /**
+     * 详情
+     */
+    public function detail($ids)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 执行
+     */
+    public function execute($ids)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $result = $this->doexecute($row['type'], json_decode($row['params'], true));
+        $this->success("", null, ['result' => $result]);
+    }
+
+    /**
+     * 生成命令
+     */
+    public function command($action = '')
+    {
+        $commandtype = $this->request->request("commandtype");
+        $params = $this->request->request();
+        $allowfields = [
+            'crud' => 'table,controller,model,fields,force,local,delete,menu',
+            'menu' => 'controller,delete,force',
+            'min'  => 'module,resource,optimize',
+            'api'  => 'url,module,output,template,force,title,author,class,language,addon',
+        ];
+        $argv = [];
+        $allowfields = isset($allowfields[$commandtype]) ? explode(',', $allowfields[$commandtype]) : [];
+        $allowfields = array_filter(array_intersect_key($params, array_flip($allowfields)));
+        if (isset($params['local']) && !$params['local']) {
+            $allowfields['local'] = $params['local'];
+        } else {
+            unset($allowfields['local']);
+        }
+        foreach ($allowfields as $key => $param) {
+            $argv[] = "--{$key}=" . (is_array($param) ? implode(',', $param) : $param);
+        }
+        if ($commandtype == 'crud') {
+            $extend = 'setcheckboxsuffix,enumradiosuffix,imagefield,filefield,intdatesuffix,switchsuffix,citysuffix,selectpagesuffix,selectpagessuffix,ignorefields,sortfield,editorsuffix,headingfilterfield,tagsuffix,jsonsuffix,fixedcolumns';
+            $extendArr = explode(',', $extend);
+            foreach ($params as $index => $item) {
+                if (in_array($index, $extendArr)) {
+                    foreach (explode(',', $item) as $key => $value) {
+                        if ($value) {
+                            $argv[] = "--{$index}={$value}";
+                        }
+                    }
+                }
+            }
+            $isrelation = (int)$this->request->request('isrelation');
+            if ($isrelation && isset($params['relation'])) {
+                foreach ($params['relation'] as $index => $relation) {
+                    foreach ($relation as $key => $value) {
+                        $argv[] = "--{$key}=" . (is_array($value) ? implode(',', $value) : $value);
+                    }
+                }
+            }
+        } else {
+            if ($commandtype == 'menu') {
+                if (isset($params['allcontroller']) && $params['allcontroller']) {
+                    $argv[] = "--controller=all-controller";
+                } else {
+                    foreach (explode(',', $params['controllerfile']) as $index => $param) {
+                        if ($param) {
+                            $argv[] = "--controller=" . substr($param, 0, -4);
+                        }
+                    }
+                }
+            } else {
+                if ($commandtype == 'min') {
+
+                } else {
+                    if ($commandtype == 'api') {
+
+                    } else {
+
+                    }
+                }
+            }
+        }
+        if ($action == 'execute') {
+            if (stripos(implode(' ', $argv), '--controller=all-controller') !== false) {
+                $this->error("只允许在命令行执行该命令，执行前请做好菜单规则备份！！！");
+            }
+            if (config('app_debug')) {
+                $result = $this->doexecute($commandtype, $argv);
+                $this->success("", null, ['result' => $result]);
+            } else {
+                $this->error("只允许在开发环境下执行命令");
+            }
+        } else {
+            $this->success("", null, ['command' => "php think {$commandtype} " . implode(' ', $argv)]);
+        }
+
+        return;
+    }
+
+    protected function doexecute($commandtype, $argv)
+    {
+        if (!config('app_debug')) {
+            $this->error("只允许在开发环境下执行命令");
+        }
+        if (preg_match("/([;\|&]+)/", implode(' ', $argv))) {
+            $this->error("不支持的命令参数");
+        }
+        $commandName = "\\app\\admin\\command\\" . ucfirst($commandtype);
+        $input = new Input($argv);
+        $output = new \addons\command\library\Output();
+        $command = new $commandName($commandtype);
+        $data = [
+            'type'        => $commandtype,
+            'params'      => json_encode($argv),
+            'command'     => "php think {$commandtype} " . implode(' ', $argv),
+            'executetime' => time(),
+        ];
+        $this->model->save($data);
+        try {
+            $command->run($input, $output);
+            $result = implode("\n", $output->getMessage());
+            $this->model->status = 'successed';
+        } catch (Exception $e) {
+            $result = implode("\n", $output->getMessage()) . "\n";
+            $result .= $e->getMessage();
+            $this->model->status = 'failured';
+        }
+        $result = trim($result);
+        $this->model->content = $result;
+        $this->model->save();
+        return $result;
+    }
+
+}

application/admin/controller/Feeds.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 生产投料
+ *
+ * @icon fa fa-circle-o
+ */
+class Feeds extends Backend
+{
+
+    /**
+     * Feeds模型对象
+     * @var \app\admin\model\Feeds
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Feeds;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['task'])
+                    ->where($where)
+                    ->order('feeds.bach', 'desc')
+                    ->order('feeds.create', 'desc')
+                    ->order('feeds.no', 'asc')
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+
+                $row->getRelation('task')->visible(['machine']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/lang/zh-cn/command.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'Id'            => 'ID',
+    'Type'          => '类型',
+    'Params'        => '参数',
+    'Command'       => '命令',
+    'Content'       => '返回结果',
+    'Executetime'   => '执行时间',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Execute again' => '再次执行',
+    'Successed'     => '成功',
+    'Failured'      => '失败',
+    'Status'        => '状态'
+];

application/admin/lang/zh-cn/feeds.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'Bach'          => '批次号',
+    'Material'      => '原材料',
+    'Weight'        => '投料重量',
+    'Gy_num'        => '工艺序号',
+    'Date'          => '日期',
+    'Operator'      => '操作人员',
+    'Inspector'     => '检验人员',
+    'Tid'           => '关联批次id',
+    'Nweight'       => '应投重量',
+    'Create'        => '投料时间',
+    'No'            => '操作顺序',
+    'Remark'        => '操作顺序(记录批次号)',
+    'Material_bach' => '原材料批次号',
+    'Task.machine'  => '机台编号',
+    'Task.warehouse'  => '车间编号'
+];