Commit fa98c6b8c27e31433e24a4ab6291579d562e2f13

Authored by lawrencehj
1 parent 03ec48e3

修正loggor提示信息

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java
@@ -17,8 +17,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcesso @@ -17,8 +17,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcesso
17 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; 17 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
18 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 18 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
19 19
20 -import org.apache.log4j.Logger;  
21 -  
22 import java.text.ParseException; 20 import java.text.ParseException;
23 import java.util.HashMap; 21 import java.util.HashMap;
24 import java.util.Map; 22 import java.util.Map;
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -60,7 +60,7 @@ public class PlatformController { @@ -60,7 +60,7 @@ public class PlatformController {
60 public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){ 60 public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
61 61
62 if (logger.isDebugEnabled()) { 62 if (logger.isDebugEnabled()) {
63 - logger.debug("查询所有上级设备API调用"); 63 + logger.debug("保存上级平台信息API调用");
64 } 64 }
65 if (StringUtils.isEmpty(parentPlatform.getName()) 65 if (StringUtils.isEmpty(parentPlatform.getName())
66 ||StringUtils.isEmpty(parentPlatform.getServerGBId()) 66 ||StringUtils.isEmpty(parentPlatform.getServerGBId())
@@ -87,13 +87,13 @@ public class PlatformController { @@ -87,13 +87,13 @@ public class PlatformController {
87 if (parentPlatform.isEnable()) { 87 if (parentPlatform.isEnable()) {
88 // 只要保存就发送注册 88 // 只要保存就发送注册
89 commanderForPlatform.register(parentPlatform); 89 commanderForPlatform.register(parentPlatform);
90 - }else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 关闭启用时注销 90 + } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 关闭启用时注销
91 commanderForPlatform.unregister(parentPlatform, null, null); 91 commanderForPlatform.unregister(parentPlatform, null, null);
92 } 92 }
93 93
94 - 94 +
95 return new ResponseEntity<>("success", HttpStatus.OK); 95 return new ResponseEntity<>("success", HttpStatus.OK);
96 - }else { 96 + } else {
97 return new ResponseEntity<>("fail", HttpStatus.OK); 97 return new ResponseEntity<>("fail", HttpStatus.OK);
98 } 98 }
99 } 99 }
@@ -103,7 +103,7 @@ public class PlatformController { @@ -103,7 +103,7 @@ public class PlatformController {
103 public ResponseEntity<String> deletePlatform(@RequestBody ParentPlatform parentPlatform){ 103 public ResponseEntity<String> deletePlatform(@RequestBody ParentPlatform parentPlatform){
104 104
105 if (logger.isDebugEnabled()) { 105 if (logger.isDebugEnabled()) {
106 - logger.debug("查询所有上级设备API调用"); 106 + logger.debug("删除上级平台API调用");
107 } 107 }
108 if (StringUtils.isEmpty(parentPlatform.getServerGBId()) 108 if (StringUtils.isEmpty(parentPlatform.getServerGBId())
109 ){ 109 ){
@@ -138,7 +138,7 @@ public class PlatformController { @@ -138,7 +138,7 @@ public class PlatformController {
138 public ResponseEntity<String> exitPlatform(@PathVariable String deviceGbId){ 138 public ResponseEntity<String> exitPlatform(@PathVariable String deviceGbId){
139 139
140 if (logger.isDebugEnabled()) { 140 if (logger.isDebugEnabled()) {
141 - logger.debug("查询所有上级设备API调用"); 141 + logger.debug("查询上级平台是否存在API调用:" + deviceGbId);
142 } 142 }
143 ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId); 143 ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId);
144 return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK); 144 return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
@@ -184,7 +184,7 @@ public class PlatformController { @@ -184,7 +184,7 @@ public class PlatformController {
184 public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){ 184 public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){
185 185
186 if (logger.isDebugEnabled()) { 186 if (logger.isDebugEnabled()) {
187 - logger.debug("给上级平台添加国标通道API调用"); 187 + logger.debug("给上级平台删除国标通道API调用");
188 } 188 }
189 int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces()); 189 int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
190 190