소스 검색

添加同步海康区域脚本

qiuzijian 4 년 전
부모
커밋
25c91569ab
2개의 변경된 파일8개의 추가작업 그리고 14개의 파일을 삭제
  1. 7 13
      .idea/workspace.xml
  2. 1 1
      Modules/Camera/Http/Controllers/Api/HaiKangController.php

+ 7 - 13
.idea/workspace.xml

@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraDownload.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -102,8 +96,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="117" column="122" selection-start-line="117" selection-start-column="122" selection-end-line="117" selection-end-column="122" />
+            <state relative-caret-position="272">
+              <caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -127,7 +121,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>菜单标识</find>
       <find>layui.extend</find>
       <find>formSelect</find>
       <find>formSelects.</find>
@@ -157,6 +150,7 @@
       <find>mkdir</find>
       <find>CameraDownload</find>
       <find>redis</find>
+      <find>getRegionsList</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -524,12 +518,12 @@
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
       <workItem from="1618368497550" duration="219162000" />
-      <workItem from="1621301484015" duration="13857000" />
+      <workItem from="1621301484015" duration="13956000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="233162000" />
+    <option name="totallyTimeSpent" value="233261000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -904,8 +898,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="117" column="122" selection-start-line="117" selection-start-column="122" selection-end-line="117" selection-end-column="122" />
+        <state relative-caret-position="272">
+          <caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
           <folding>
             <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>

+ 1 - 1
Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -54,7 +54,7 @@ class HaiKangController extends BaseController
      * 获取区域列表
      * @return bool|mixed|string
      */
-    public function M1getRegionsList()
+    public function getRegionsList()
     {
         $url = $this->artemis . '/api/resource/v1/regions';
         //请求参数