支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug

648540858

2022-04-01 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4

 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -5,7 +5,7 @@
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
@@ -48,7 +48,7 @@
    SipConfig sipConfig;

    @Autowired
    UserSetup userSetup;
    UserSetting userSetting;

    @Value("${server.port}")
    private int serverPort;
@@ -232,14 +232,14 @@
        jsonObject.put("server.port", serverPort);
        if (StringUtils.isEmpty(type)) {
            jsonObject.put("sip", JSON.toJSON(sipConfig));
            jsonObject.put("base", JSON.toJSON(userSetup));
            jsonObject.put("base", JSON.toJSON(userSetting));
        }else {
            switch (type){
                case "sip":
                    jsonObject.put("sip", sipConfig);
                    break;
                case "base":
                    jsonObject.put("base", userSetup);
                    jsonObject.put("base", userSetting);
                    break;
                default:
                    break;