Commit 1edc3d07 authored by tianyiming's avatar tianyiming

修改bug

parent 2b5eedb4
...@@ -333,7 +333,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -333,7 +333,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
if (diffMinute <= 5) { if (diffMinute <= 5) {
time = true; time = true;
} }
item.put("upTime",diffMinute); item.put("upTime", diffMinute);
} }
} }
item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常"); item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
...@@ -369,7 +369,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -369,7 +369,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
@RequestMapping(value = "/replaceVideo", method = RequestMethod.POST) @RequestMapping(value = "/replaceVideo", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "替换视频", produces = "application/json;charset=UTF-8", notes = "替换视频") @ApiOperation(httpMethod = "POST", value = "替换视频", produces = "application/json;charset=UTF-8", notes = "替换视频")
public ResponseModel replaceVideo(@RequestBody Map<String,String> ids) { public ResponseModel replaceVideo(@RequestBody Map<String, String> ids) {
String bizOrgCode = null; String bizOrgCode = null;
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity(); ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
...@@ -391,7 +391,11 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -391,7 +391,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity(); ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (!ValidationUtil.isEmpty(personIdentity)) { if (!ValidationUtil.isEmpty(personIdentity)) {
if (personIdentity.getCompanyBizOrgCode() == null) {
bizOrgCode = personIdentity.getBizOrgCode();
} else {
bizOrgCode = personIdentity.getCompanyBizOrgCode(); bizOrgCode = personIdentity.getCompanyBizOrgCode();
}
if (bizOrgCode == null) { if (bizOrgCode == null) {
return CommonResponseUtil.success(null); return CommonResponseUtil.success(null);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment