上饶市公安局wvp平台
parent: 853dec6e | patch | commit | show whitespace
zhongrj
2023-08-14 5fc561c8e3ece6b7101a9f949366123f16433c34 
移动位置保存配置修改
4 files modified
130 ■■■■■ changed files
.idea/workspace.xml 124 ●●●●● patch | view | raw | blame | history
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 2 ●●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 2 ●●●●● patch | view | raw | blame | history 
 .idea/workspace.xml


@@ -6,18 +6,31 @@


        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />


      </path>


      <path>


        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />


      </path>


      <path>


        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />


      </path>


    </expand>


    <select>


      <path>


        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="BRANCH:update-v" type="e8cecc67:BranchNodeDescriptor" />


        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />


        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />


        <item name="BRANCH:origin/update-v" type="e8cecc67:BranchNodeDescriptor" />


      </path>


    </select>


  </component>


  <component name="ChangeListManager">


    <list default="true" id="208daac0-1abd-465d-abf2-6a0414be019b" name="默认的" comment="配置提交">


      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-test.yml" afterDir="false" />


    </list>


    <option name="SHOW_DIALOG" value="false" />


    <option name="HIGHLIGHT_CONFLICTS" value="true" />


@@ -57,7 +70,7 @@


    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />


    <property name="WebServerToolWindowFactoryState" value="false" />


    <property name="aspect.path.notification.shown" value="true" />


    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../geoserver/geoserver-2.19.6" />


    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources" />


    <property name="node.js.detected.package.eslint" value="true" />


    <property name="node.js.detected.package.tslint" value="true" />


    <property name="node.js.path.for.package.eslint" value="project" />


@@ -83,11 +96,11 @@


      <recent name="com.genersoft.iot.vmp.netty.business.service" />


    </key>


    <key name="CopyFile.RECENT_KEYS">


      <recent name="F:\code\server\srjw\srgis-wvp\src\main\resources" />


      <recent name="F:\code\server\shangraoshiju\wvp-GB281181-pro\src\main\java\com\genersoft\iot\vmp\netty\business\mapper" />


      <recent name="F:\code\server\shangraoshiju\wvp-GB281181-pro\src\main\java\com\genersoft\iot\vmp\netty\business" />


      <recent name="F:\code\server\shangraoshiju\wvp-GB281181-pro\src\main\java\com\genersoft\iot\vmp\netty\entity" />


      <recent name="F:\code\server\shangraoshiju\wvp-GB281181-pro\src\main\resources" />


      <recent name="F:\code\server\shangraoshiju\wvp-GB281181-pro\src\main\java\com\genersoft\iot\vmp\netty" />


    </key>


  </component>


  <component name="RunManager" selected="Spring Boot.VManageBootstrap">


@@ -192,7 +205,14 @@


      <workItem from="1687772319116" duration="68000" />


      <workItem from="1687846557234" duration="1264000" />


      <workItem from="1687851016900" duration="5366000" />


      <workItem from="1691477919332" duration="708000" />


      <workItem from="1691477919332" duration="4948000" />


      <workItem from="1691650074273" duration="650000" />


      <workItem from="1691657056268" duration="47000" />


      <workItem from="1691660079454" duration="169000" />


      <workItem from="1691718970919" duration="895000" />


      <workItem from="1691722357487" duration="19000" />


      <workItem from="1691747390209" duration="1238000" />


      <workItem from="1691999964457" duration="1102000" />


    </task>


    <task id="LOCAL-00001" summary="默认的">


      <created>1676691639632</created>


@@ -285,7 +305,28 @@


      <option name="project" value="LOCAL" />


      <updated>1687847681236</updated>


    </task>


    <option name="localTasksCounter" value="14" />


    <task id="LOCAL-00014" summary="丢失配置文件补回">


      <created>1691479025737</created>


      <option name="number" value="00014" />


      <option name="presentableId" value="LOCAL-00014" />


      <option name="project" value="LOCAL" />


      <updated>1691479025738</updated>


    </task>


    <task id="LOCAL-00015" summary="test 配置修改">


      <created>1691479104028</created>


      <option name="number" value="00015" />


      <option name="presentableId" value="LOCAL-00015" />


      <option name="project" value="LOCAL" />


      <updated>1691479104028</updated>


    </task>


    <task id="LOCAL-00016" summary="sip 发送订阅请求过期时间修改为100">


      <created>1691482827275</created>


      <option name="number" value="00016" />


      <option name="presentableId" value="LOCAL-00016" />


      <option name="project" value="LOCAL" />


      <updated>1691482827276</updated>


    </task>


    <option name="localTasksCounter" value="17" />


    <servers />


  </component>


  <component name="TypeScriptGeneratedFilesManager">


@@ -302,7 +343,7 @@


                  <entry key="branch">


                    <value>


                      <list>


                        <option value="update-v" />


                        <option value="origin/update-v" />


                      </list>


                    </value>


                  </entry>


@@ -329,69 +370,88 @@


    <MESSAGE value="执法记录仪同步去除" />


    <MESSAGE value="gb28181版本升级" />


    <MESSAGE value="gb28181版本升级-补充" />


    <option name="LAST_COMMIT_MESSAGE" value="gb28181版本升级-补充" />


    <MESSAGE value="丢失配置文件补回" />


    <MESSAGE value="test 配置修改" />


    <MESSAGE value="sip 发送订阅请求过期时间修改为100" />


    <option name="LAST_COMMIT_MESSAGE" value="sip 发送订阅请求过期时间修改为100" />


  </component>


  <component name="WindowStateProjectService">


    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1686903824574">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686903824574" />


    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog" timestamp="1686965187217">


    <state x="170" y="590" width="1736" height="856" key="DiffContextDialog" timestamp="1691748473061">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="92" y="92" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686965187217" />


    <state width="1877" height="387" key="GridCell.Tab.0.bottom" timestamp="1687856409237">


    <state x="170" y="590" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1691748473061" />


    <state width="1877" height="433" key="GridCell.Tab.0.bottom" timestamp="1692001072251">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687856409237" />


    <state width="1877" height="387" key="GridCell.Tab.0.center" timestamp="1687856409237">


    <state width="1877" height="433" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072251" />


    <state width="1877" height="433" key="GridCell.Tab.0.center" timestamp="1692001072251">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687856409237" />


    <state width="1877" height="387" key="GridCell.Tab.0.left" timestamp="1687856409237">


    <state width="1877" height="433" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072251" />


    <state width="1877" height="433" key="GridCell.Tab.0.left" timestamp="1692001072251">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687856409237" />


    <state width="1877" height="387" key="GridCell.Tab.0.right" timestamp="1687856409237">


    <state width="1877" height="433" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072251" />


    <state width="1877" height="433" key="GridCell.Tab.0.right" timestamp="1692001072251">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687856409237" />


    <state width="1877" height="387" key="GridCell.Tab.1.bottom" timestamp="1687856361203">


    <state width="1877" height="433" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072251" />


    <state width="1877" height="433" key="GridCell.Tab.1.bottom" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1687856361203" />


    <state width="1877" height="387" key="GridCell.Tab.1.center" timestamp="1687856361203">


    <state width="1877" height="433" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.1.center" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1687856361203" />


    <state width="1877" height="387" key="GridCell.Tab.1.left" timestamp="1687856361203">


    <state width="1877" height="433" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.1.left" timestamp="1692001072251">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1687856361203" />


    <state width="1877" height="387" key="GridCell.Tab.1.right" timestamp="1687856361203">


    <state width="1877" height="433" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072251" />


    <state width="1877" height="433" key="GridCell.Tab.1.right" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="387" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1687856361203" />


    <state width="1877" height="433" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.2.bottom" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="433" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.2.center" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="433" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.2.left" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="433" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state width="1877" height="433" key="GridCell.Tab.2.right" timestamp="1692001072252">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="1877" height="433" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1692001072252" />


    <state x="184" y="86" key="MergeDialog" timestamp="1691477993456">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="184" y="86" key="MergeDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1691477993456" />


    <state x="644" y="221" key="RollbackChangesDialog" timestamp="1686904469155">


    <state x="644" y="221" key="RollbackChangesDialog" timestamp="1692000988870">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="644" y="221" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1686904469155" />


    <state x="552" y="239" key="Vcs.Push.Dialog.v2" timestamp="1687847692563">


    <state x="644" y="221" key="RollbackChangesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1692000988870" />


    <state x="552" y="239" key="Vcs.Push.Dialog.v2" timestamp="1691482829063">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="552" y="239" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1687847692563" />


    <state x="552" y="239" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1691482829063" />


    <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1687851764290">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1687851764290" />


    <state x="661" y="252" width="866" height="536" key="find.popup" timestamp="1687852785509">


    <state x="420" y="83" width="1107" height="705" key="find.popup" timestamp="1692001005945">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>


    <state x="661" y="252" width="866" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1687852785509" />


    <state x="420" y="83" width="1107" height="705" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1692001005945" />


    <state x="720" y="232" key="git4idea.branch.GitSmartOperationDialog" timestamp="1691478017364">


      <screen x="0" y="0" width="1920" height="1040" />


    </state>




 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java


@@ -200,7 +200,7 @@


    }




    public Request createSubscribeRequest(Device device, String content, SIPRequest requestOld, Integer expires, String event, CallIdHeader callIdHeader) throws ParseException, InvalidArgumentException, PeerUnavailableException {


        expires = 100;


        expires = 1000;


        Request request = null;


        // sipuri


        SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());




 src/main/resources/application-dev.yml


@@ -92,6 +92,8 @@


    record-push-live: true


    # 国标是否录制


    record-sip: true


    # 保存移动位置历史轨迹：true:保留历史数据，false:仅保留最后的位置(默认)


    save-position-history: true


# 版本信息， 不需修改


version:


    version: "@project.version@"




 src/main/resources/application-test.yml


@@ -92,6 +92,8 @@


  record-push-live: true


  # 国标是否录制


  record-sip: true


  # 保存移动位置历史轨迹：true:保留历史数据，false:仅保留最后的位置(默认)


  save-position-history: true


# 版本信息， 不需修改


version:


  version: "@project.version@"