修改后台导入过滤空格

.idea/workspace.xml

@@ -63,8 +63,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="351">
-              <caret line="50" column="98" selection-start-line="50" selection-start-column="70" selection-end-line="50" selection-end-column="98" />
+            <state relative-caret-position="380">
+              <caret line="236" column="34" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="34" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -72,11 +72,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="177">
-              <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
+            <state relative-caret-position="313">
+              <caret line="106" column="47" lean-forward="true" selection-start-line="106" selection-start-column="47" selection-end-line="106" selection-end-column="47" />
               <folding>
                 <element signature="e#39#68#0#PHP" expanded="true" />
               </folding>
@@ -84,11 +84,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-774">
-              <caret line="123" column="30" selection-start-line="123" selection-start-column="30" selection-end-line="123" selection-end-column="30" />
+            <state relative-caret-position="526">
+              <caret line="73" column="48" selection-start-line="73" selection-start-column="48" selection-end-line="73" selection-end-column="48" />
               <folding>
                 <element signature="e#129#166#0#PHP" expanded="true" />
               </folding>
@@ -455,12 +455,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="126517000" />
+      <workItem from="1618368497550" duration="127659000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="126660000" />
+    <option name="totallyTimeSpent" value="127802000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -829,16 +829,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-774">
-          <caret line="123" column="30" selection-start-line="123" selection-start-column="30" selection-end-line="123" selection-end-column="30" />
-          <folding>
-            <element signature="e#129#166#0#PHP" expanded="true" />
-          </folding>
-        </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="151">
@@ -851,8 +841,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="50" column="98" selection-start-line="50" selection-start-column="70" selection-end-line="50" selection-end-column="98" />
+        <state relative-caret-position="380">
+          <caret line="236" column="34" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="34" />
           <folding>
             <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
@@ -861,13 +851,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
+        <state relative-caret-position="313">
+          <caret line="106" column="47" lean-forward="true" selection-start-line="106" selection-start-column="47" selection-end-line="106" selection-end-column="47" />
           <folding>
             <element signature="e#39#68#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="526">
+          <caret line="73" column="48" selection-start-line="73" selection-start-column="48" selection-end-line="73" selection-end-column="48" />
+          <folding>
+            <element signature="e#129#166#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

Modules/Camera/Jobs/CameraListExcel.php

@@ -44,8 +44,8 @@ class CameraListExcel implements ShouldQueue
     protected function fieldsMap($rows)
     {
         //矿区信息
-        $mine_name = $rows[0][0];
-        $area_name = isset($rows[0][1]) ? $rows[0][1] : '';
+        $mine_name = trim($rows[0][0]);
+        $area_name = isset($rows[0][1]) ? trim($rows[0][1]) : '';
 
         $mine_parent_id = MineList::where('title', $mine_name)->value('id');
         if (!$mine_parent_id) {
@@ -88,11 +88,11 @@ class CameraListExcel implements ShouldQueue
             }
 
             $params = [
-                'user_name'  => $item[1],
-                'password'   => $item[2],
-                'ip'         => $item[3],
-                'port'       => $item[4],
-                'com_number' => $item[5],
+                'user_name'  => trim($item[1]),
+                'password'   => trim($item[2]),
+                'ip'         => trim($item[3]),
+                'port'       => trim($item[4]),
+                'com_number' => trim($item[5]),
             ];
 
             //通过ip+端口+通道号作为唯一标识判断数据是否存在
@@ -110,13 +110,13 @@ class CameraListExcel implements ShouldQueue
                 $res = CameraList::where('id', $query->id)->update(
                     [
                         'mine_id'     => $mine_id,
-                        'camera_name' => $item[0],
-                        'user_name'   => $item[1],
-                        'password'    => $item[2],
-                        'ip'          => $item[3],
-                        'port'        => $item[4],
-                        'com_number'  => $item[5],
-                        'sort'        => $item[6],
+                        'camera_name' => trim($item[0]),
+                        'user_name'   => trim($item[1]),
+                        'password'    => trim($item[2]),
+                        'ip'          => trim($item[3]),
+                        'port'        => trim($item[4]),
+                        'com_number'  => trim($item[5]),
+                        'sort'        => trim($item[6]),
 //                        'status'     => $params['status'],
                         'camera_url'  => $camera_url,
                         'updated_at'  => date('Y-m-d H:i:s'),
@@ -127,13 +127,13 @@ class CameraListExcel implements ShouldQueue
 
             $data[] = [
                 'mine_id'     => $mine_id,
-                'camera_name' => $item[0],
-                'user_name'   => $item[1],
-                'password'    => $item[2],
-                'ip'          => $item[3],
-                'port'        => $item[4],
-                'com_number'  => $item[5],
-                'sort'        => $item[6],
+                'camera_name' => trim($item[0]),
+                'user_name'   => trim($item[1]),
+                'password'    => trim($item[2]),
+                'ip'          => trim($item[3]),
+                'port'        => trim($item[4]),
+                'com_number'  => trim($item[5]),
+                'sort'        => trim($item[6]),
                 'revert_id'   => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
 //                'status'     => $params['status'],
                 'camera_url'  => $camera_url,