修改后台

.idea/workspace.xml

@@ -2,9 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
     </list>
@@ -34,8 +31,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="140" column="38" selection-start-line="140" selection-start-column="38" selection-end-line="140" selection-end-column="38" />
+            <state relative-caret-position="573">
+              <caret line="138" column="34" selection-start-line="138" selection-start-column="34" selection-end-line="138" selection-end-column="34" />
               <folding>
                 <element signature="e#49#93#0#PHP" expanded="true" />
               </folding>
@@ -55,8 +52,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="282">
-              <caret line="132" column="45" selection-start-line="132" selection-start-column="45" selection-end-line="132" selection-end-column="45" />
+            <state relative-caret-position="531">
+              <caret line="159" column="8" selection-start-line="159" selection-start-column="8" selection-end-line="159" selection-end-column="8" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -419,12 +416,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="157867000" />
+      <workItem from="1618368497550" duration="158229000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="158010000" />
+    <option name="totallyTimeSpent" value="158372000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -741,13 +738,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -800,10 +790,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="13" column="19" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="140" column="38" selection-start-line="140" selection-start-column="38" selection-end-line="140" selection-end-column="38" />
+        <state relative-caret-position="573">
+          <caret line="138" column="34" selection-start-line="138" selection-start-column="34" selection-end-line="138" selection-end-column="34" />
           <folding>
             <element signature="e#49#93#0#PHP" expanded="true" />
           </folding>
@@ -812,8 +809,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="132" column="45" selection-start-line="132" selection-start-column="45" selection-end-line="132" selection-end-column="45" />
+        <state relative-caret-position="531">
+          <caret line="159" column="8" selection-start-line="159" selection-start-column="8" selection-end-line="159" selection-end-column="8" />
           <folding>
             <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>

Modules/Mine/Http/Controllers/MineController.php

@@ -104,13 +104,11 @@ class MineController extends BaseController
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList, $titleOne->parent_id);
         $formObj->input('title', '矿区单位名称');
         $formObj->input('sort', '排序', 10);
-        if (isset($titleOne->is_hak)) {
-            $formObj->radio('is_hak', '是否使用海康视频服务器', [MineEnum::IS_HAK_NO => '否', MineEnum::IS_HAK_YES => '是'], 0);
-            $formObj->input('ip', 'id地址');
-            $formObj->input('port', '端口');
-            $formObj->input('key', '请求key');
-            $formObj->input('secret', '请求secret');
-        }
+        $formObj->radio('is_hak', '是否使用海康视频服务器', [MineEnum::IS_HAK_NO => '否', MineEnum::IS_HAK_YES => '是'], 0);
+        $formObj->input('ip', 'id地址');
+        $formObj->input('port', '端口');
+        $formObj->input('key', '请求key');
+        $formObj->input('secret', '请求secret');
         $formObj->title = '修改矿区单位';
         return $this->from($formObj);
     }

Modules/Mine/Services/MineServices.php

@@ -130,18 +130,34 @@ class MineServices{
     //编辑矿区扩展信息表
     public static function editMineListExt($mine_id, $params)
     {
-        $result = MineListExt::where('mine_id', $mine_id)->update(
-            [
-                'ip'         => $params['ip'],
-                'port'       => $params['port'],
-                'key'        => $params['key'],
-                'secret'     => $params['secret'],
-                'is_hak'     => $params['is_hak'],
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]
-        );
+        $query = MineListExt::where('mine_id', $mine_id)->first();
 
+        if ($query) {
+            $result = MineListExt::where('mine_id', $mine_id)->update(
+                [
+                    'ip'         => $params['ip'],
+                    'port'       => $params['port'],
+                    'key'        => $params['key'],
+                    'secret'     => $params['secret'],
+                    'is_hak'     => $params['is_hak'],
+                    'updated_at' => date('Y-m-d H:i:s'),
+                ]
+            );
+        } else {
+            $result = MineListExt::insert(
+                [
+                    'mine_id'    => $mine_id,
+                    'ip'         => $params['ip'],
+                    'port'       => $params['port'],
+                    'key'        => $params['key'],
+                    'secret'     => $params['secret'],
+                    'is_hak'     => $params['is_hak'],
+                    'created_at' => date('Y-m-d H:i:s'),
+                    'updated_at' => date('Y-m-d H:i:s'),
+                ]
+            );
+        }
+        
         return $result;
     }
 
@@ -200,21 +216,22 @@ class MineServices{
     //查询后台单个矿区
     public static function getAdminMineOne($mine_id)
     {
-        $mine_list = MineList::leftJoin(
-            'mine_list_ext', 'mine_list.id', '=', 'mine_list_ext.mine_id'
-            )->where('mine_list.id', $mine_id)->select(
-                [
-                    'mine_list.id',
-                    'mine_list.parent_id',
-                    'mine_list.title',
-                    'mine_list.sort',
-                    'mine_list_ext.ip',
-                    'mine_list_ext.port',
-                    'mine_list_ext.key',
-                    'mine_list_ext.secret',
-                    'mine_list_ext.is_hak'
-                ]
-        )->first();
+        $mine_list = MineList::find($mine_id);
+        $mine_list->ip = '';
+        $mine_list->port = '';
+        $mine_list->key = '';
+        $mine_list->secret = '';
+        $mine_list->is_hak = MineEnum::IS_HAK_NO;
+
+        $mine_list_ext = MineListExt::where('mine_id', $mine_id)->first();
+
+        if ($mine_list_ext) {
+            $mine_list->ip     = $mine_list_ext->ip;
+            $mine_list->port   = $mine_list_ext->port;
+            $mine_list->key    = $mine_list_ext->key;
+            $mine_list->secret = $mine_list_ext->secret;
+            $mine_list->is_hak = $mine_list_ext->is_hak;
+        }
 
         return $mine_list;
     }