Commit af885ca4d9f2836567505bb41a3f677ef4827aca
1 parent
b225b535
节点管理--某个zlm节点删除之后,数据库中仍有数据,导致再次添加该zlm节点
Showing
3 changed files
with
8 additions
and
0 deletions
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
| @@ -76,6 +76,8 @@ public interface IMediaServerService { | @@ -76,6 +76,8 @@ public interface IMediaServerService { | ||
| 76 | 76 | ||
| 77 | void delete(String id); | 77 | void delete(String id); |
| 78 | 78 | ||
| 79 | + void deleteDb(String id); | ||
| 80 | + | ||
| 79 | MediaServerItem getDefaultMediaServer(); | 81 | MediaServerItem getDefaultMediaServer(); |
| 80 | 82 | ||
| 81 | void updateMediaServerKeepalive(String mediaServerId, JSONObject data); | 83 | void updateMediaServerKeepalive(String mediaServerId, JSONObject data); |
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
| @@ -608,6 +608,11 @@ public class MediaServerServiceImpl implements IMediaServerService { | @@ -608,6 +608,11 @@ public class MediaServerServiceImpl implements IMediaServerService { | ||
| 608 | String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + id; | 608 | String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + id; |
| 609 | redisUtil.del(key); | 609 | redisUtil.del(key); |
| 610 | } | 610 | } |
| 611 | + @Override | ||
| 612 | + public void deleteDb(String id){ | ||
| 613 | + //同步删除数据库中的数据 | ||
| 614 | + mediaServerMapper.delOne(id); | ||
| 615 | + } | ||
| 611 | 616 | ||
| 612 | @Override | 617 | @Override |
| 613 | public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) { | 618 | public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) { |
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
| @@ -158,6 +158,7 @@ public class ServerController { | @@ -158,6 +158,7 @@ public class ServerController { | ||
| 158 | public WVPResult<String> deleteMediaServer(@RequestParam String id){ | 158 | public WVPResult<String> deleteMediaServer(@RequestParam String id){ |
| 159 | if (mediaServerService.getOne(id) != null) { | 159 | if (mediaServerService.getOne(id) != null) { |
| 160 | mediaServerService.delete(id); | 160 | mediaServerService.delete(id); |
| 161 | + mediaServerService.deleteDb(id); | ||
| 161 | }else { | 162 | }else { |
| 162 | WVPResult<String> result = new WVPResult<>(); | 163 | WVPResult<String> result = new WVPResult<>(); |
| 163 | result.setCode(-1); | 164 | result.setCode(-1); |