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;
@@ -58,8 +58,6 @@
    @GetMapping(value = "/media_server/list")
    @ResponseBody
    public WVPResult<List<MediaServerItem>> getMediaServerList(boolean detail){
        List<MediaServerItem> all = mediaServerService.getAll();
        WVPResult<List<MediaServerItem>> result = new WVPResult<>();
        result.setCode(0);
        result.setMsg("success");
@@ -129,11 +127,43 @@
    })
    @PostMapping(value = "/media_server/save")
    @ResponseBody
    public WVPResult<String> checkMediaServer(@RequestBody  MediaServerItem mediaServerItem){
        if (mediaServerService.getOne(mediaServerItem.getId()) != null) {
    public WVPResult<String> saveMediaServer(@RequestBody  MediaServerItem mediaServerItem){
        MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
        if (mediaServerItemInDatabase != null) {
            if (StringUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange())
                    && StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
                mediaServerItem.setSendRtpPortRange("30000,30500");
            }
           mediaServerService.update(mediaServerItem);
        }else {
            if (StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
                mediaServerItem.setSendRtpPortRange("30000,30500");
            }
            return mediaServerService.add(mediaServerItem);
        }
        WVPResult<String> result = new WVPResult<>();
        result.setCode(0);
        result.setMsg("success");
        return result;
    }
    @ApiOperation("移除流媒体服务")
    @ApiImplicitParams({
            @ApiImplicitParam(name="id", value = "流媒体ID", dataTypeClass = String.class)
    })
    @DeleteMapping(value = "/media_server/delete")
    @ResponseBody
    public WVPResult<String> deleteMediaServer(@RequestParam  String id){
        if (mediaServerService.getOne(id) != null) {
            mediaServerService.delete(id);
            mediaServerService.deleteDb(id);
        }else {
            WVPResult<String> result = new WVPResult<>();
            result.setCode(-1);
            result.setMsg("未找到此节点");
            return result;
        }
        WVPResult<String> result = new WVPResult<>();
        result.setCode(0);
@@ -202,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;