save

src/plugin/admin/app/controller/DictController.php

@@ -2,6 +2,7 @@
 
 namespace plugin\admin\app\controller;
 
+use plugin\admin\app\model\Dict;
 use plugin\admin\app\model\Option;
 use support\exception\BusinessException;
 use support\Request;
@@ -26,6 +27,25 @@ class DictController extends Base
         return view('dict/index');
     }
 
+    /**
+     * 查询
+     * @param Request $request
+     * @return Response
+     */
+    public function select(Request $request): Response
+    {
+        $name = $request->get('name', '');
+        if ($name && is_string($name)) {
+            $items = Option::where('name', 'like', "dict_$name%")->get()->toArray();
+        } else {
+            $items = Option::where('name', 'like', 'dict_%')->get()->toArray();
+        }
+        foreach ($items as &$item) {
+            $item['name'] = Dict::optionNameTodictName($item['name']);
+        }
+        return $this->json(0, 'ok', $items);
+    }
+
     /**
      * 插入
      * @param Request $request
@@ -36,20 +56,11 @@ class DictController extends Base
     {
         if ($request->method() === 'POST') {
             $name = $request->post('name');
-            if (!preg_match('/[a-zA-Z]/', $name)) {
+            if (Dict::get($name)) {
-                return $this->json(1, '字典名只能包含字母');
+                return $this->json(1, '字典已经存在');
-            }
-            $option_name = $this->dictNameToOptionName($name);
-            if (Option::where('name', $option_name)->first()) {
-                return $this->json(1, '字典已经存在' . $option_name);
             }
             $values = (array)$request->post('value', []);
-            $format_values = $this->filterValue($values);
+            Dict::save($name, $values);
-            $option = new Option;
-            $option->name = $option_name;
-            $option->value = json_encode($format_values, JSON_UNESCAPED_UNICODE);
-            $option->save();
-            return $this->json(0);
         }
         return view('dict/insert');
     }
@@ -64,55 +75,26 @@ class DictController extends Base
     {
         if ($request->method() === 'POST') {
             $name = $request->post('name');
-            if (!preg_match('/[a-zA-Z]/', $name)) {
+            if (!Dict::get($name)) {
-                return $this->json(1, '字典名只能包含字母');
-            }
-            $name = $this->dictNameToOptionName($name);
-            $option = Option::where('name', $name)->first();
-            if (!$option) {
                 return $this->json(1, '字典不存在');
             }
-            $format_values = $this->filterValue($request->post('value'));
+            Dict::save($name, $request->post('value'));
-            $option->name = $this->dictNameToOptionName($request->post('name'));
-            $option->value = json_encode($format_values, JSON_UNESCAPED_UNICODE);
-            $option->save();
         }
         return view('dict/update');
     }
 
     /**
+     * 删除
      * @param Request $request
      * @return Response
      */
-    public function delete(Request $request)
+    public function delete(Request $request): Response
     {
         $names = (array)$request->post('name');
-        foreach ($names as $index => $name) {
+        Dict::delete($names);
-            $names[$index] = $this->dictNameToOptionName($name);
-        }
-        Option::whereIn('name', $names)->delete();
         return $this->json(0);
     }
 
-    /**
-     * 查询
-     * @param Request $request
-     * @return Response
-     */
-    public function select(Request $request): Response
-    {
-        $name = $request->get('name', '');
-        if ($name && is_string($name)) {
-            $items = Option::where('name', 'like', "dict_$name%")->get()->toArray();
-        } else {
-            $items = Option::where('name', 'like', 'dict_%')->get()->toArray();
-        }
-        foreach ($items as &$item) {
-            $item['name'] = $this->optionNameTodictName($item['name']);
-        }
-        return $this->json(0, 'ok', $items);
-    }
-
     /**
      * 获取
      * @param Request $request
@@ -121,47 +103,7 @@ class DictController extends Base
      */
     public function get(Request $request, $name): Response
     {
-        $value = Option::where('name', $this->dictNameToOptionName($name))->value('value');
+        return $this->json(0, 'ok', Dict::get($name));
-        if ($value === null) {
-            return $this->json(1, '字典不存在');
-        }
-        return $this->json(1, 'ok', json_decode($value, true));
-    }
-
-    /**
-     * 过滤字典选项
-     * @param array $values
-     * @return array
-     * @throws BusinessException
-     */
-    protected function filterValue(array $values): array
-    {
-        $format_values = [];
-        foreach ($values as $item) {
-            if (!isset($item['value']) || !isset($item['name'])) {
-                throw new BusinessException('格式错误', 1);
-            }
-            $format_values[] =  ['value' => $item['value'], 'name' => $item['name']];
-        }
-        return $format_values;
-    }
-
-    /**
-     * @param string $name
-     * @return string
-     */
-    protected function dictNameToOptionName(string $name): string
-    {
-        return "dict_$name";
-    }
-
-    /**
-     * @param string $name
-     * @return string
-     */
-    protected function optionNameToDictName(string $name): string
-    {
-        return substr($name, 5);
     }
 
 }

src/plugin/admin/app/model/Dict.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace plugin\admin\app\model;
+
+
+use support\exception\BusinessException;
+
+/**
+ * 字典相关
+ */
+class Dict
+{
+    /**
+     * 获取字典
+     * @param $name
+     * @return mixed|null
+     */
+    public static function get($name)
+    {
+        $value = Option::where('name', static::dictNameToOptionName($name))->value('value');
+        return $value ? json_decode($value, true) : null;
+    }
+
+    /**
+     * 保存字典
+     * @param $name
+     * @param $values
+     * @return void
+     * @throws BusinessException
+     */
+    public static function save($name, $values)
+    {
+        if (!preg_match('/[a-zA-Z]/', $name)) {
+            throw new BusinessException('字典名只能包含字母');
+        }
+        $option_name = static::dictNameToOptionName($name);
+        if (!$option = Option::where('name', $option_name)->first()) {
+            $option = new Option;
+        }
+        $format_values = static::filterValue($values);
+        $option->name = $option_name;
+        $option->value = json_encode($format_values, JSON_UNESCAPED_UNICODE);
+        $option->save();
+    }
+
+    /**
+     * 删除字典
+     * @param array $names
+     * @return void
+     */
+    public static function delete(array $names)
+    {
+        foreach ($names as $index => $name) {
+            $names[$index] = static::dictNameToOptionName($name);
+        }
+        Option::whereIn('name', $names)->delete();
+    }
+
+    /**
+     * 字典名到option名转换
+     * @param string $name
+     * @return string
+     */
+    public static function dictNameToOptionName(string $name): string
+    {
+        return "dict_$name";
+    }
+
+    /**
+     * option名到字典名转换
+     * @param string $name
+     * @return string
+     */
+    public static function optionNameToDictName(string $name): string
+    {
+        return substr($name, 5);
+    }
+
+    /**
+     * 过滤值
+     * @param array $values
+     * @return array
+     * @throws BusinessException
+     */
+    public static function filterValue(array $values): array
+    {
+        $format_values = [];
+        foreach ($values as $item) {
+            if (!isset($item['value']) || !isset($item['name'])) {
+                throw new BusinessException('字典格式错误', 1);
+            }
+            $format_values[] =  ['value' => $item['value'], 'name' => $item['name']];
+        }
+        return $format_values;
+    }
+}