|
@@ -110,9 +110,9 @@ public class MonitorSystemController extends BaseController {
|
|
@PutMapping
|
|
@PutMapping
|
|
@ApiOperation(value = "监测系统-修改")
|
|
@ApiOperation(value = "监测系统-修改")
|
|
public AjaxResult update(@RequestBody MonitorSystem monitorSystem){
|
|
public AjaxResult update(@RequestBody MonitorSystem monitorSystem){
|
|
-// if (UserConstants.EXCEPTION.equals(monitorSystemService.checkSystemOnline(monitorSystem))) {
|
|
|
|
-// return error("监测系统修改'" + monitorSystem.getClientId() + "'失败,该系统正在使用中,无法修改");
|
|
|
|
-// }
|
|
|
|
|
|
+ if (UserConstants.EXCEPTION.equals(monitorSystemService.checkSystemOnline(monitorSystem))) {
|
|
|
|
+ return error("监测系统修改'" + monitorSystem.getClientId() + "'失败,该系统正在使用中,无法修改");
|
|
|
|
+ }
|
|
monitorSystem.setUpdateBy(getUsername());
|
|
monitorSystem.setUpdateBy(getUsername());
|
|
monitorSystem.setUpdateTime(new Date());
|
|
monitorSystem.setUpdateTime(new Date());
|
|
return AjaxResult.success(monitorSystemService.updateMonitorSystem(monitorSystem));
|
|
return AjaxResult.success(monitorSystemService.updateMonitorSystem(monitorSystem));
|
|
@@ -129,7 +129,6 @@ public class MonitorSystemController extends BaseController {
|
|
public AjaxResult getSecret(){
|
|
public AjaxResult getSecret(){
|
|
UUID id = UUID.randomUUID();
|
|
UUID id = UUID.randomUUID();
|
|
String[] idd = id.toString().split("-");
|
|
String[] idd = id.toString().split("-");
|
|
- String secret = idd[0]+idd[1]+idd[2];
|
|
|
|
- return AjaxResult.success("获取密钥成功!",secret);
|
|
|
|
|
|
+ return AjaxResult.success(idd[0]+idd[1]+idd[2]);
|
|
}
|
|
}
|
|
}
|
|
}
|