ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java
@@ -74,19 +74,6 @@ if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) { return ResponseUtil.fail("缺少对应用户权限"); } // int result = lightTaskService.updateLightTask(taskId, param); // if (result == 0) { // return ResponseUtil.success("全部成功"); // } else if (result == 1) { // return ResponseUtil.success("全部失败"); // } else if (result == 2) { // return ResponseUtil.fail("只有旧任务"); // } else if (result == 3) { // return ResponseUtil.fail("部分成功，部分失败"); // } else { // return ResponseUtil.fail("未知错误"); // } String result = lightTaskService.updateLightTask(taskId, param); return ResponseUtil.success(result);
@@ -14,6 +14,7 @@ import com.sandu.ximon.admin.vo.TerminalVO; import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo; import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity; import com.sandu.ximon.dao.enums.AdministratorEnums; import com.sandu.ximon.dao.enums.OrderByEnums; import com.sandu.ximon.dao.enums.PoleBindingEnums; import com.sandu.ximon.dao.mapper.IPBroadcastMapper; @@ -287,9 +288,11 @@ if (byId == null) { throw new BusinessException("终端不存在"); } boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME); if (!belong) { throw new BusinessException("该设备不属于您,不能修改设备信息"); if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) { boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME); if (!belong) { throw new BusinessException("该设备不属于您,不能修改设备信息"); } } byId.setTerminalName(name); boolean flag = updateById(byId); ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -302,37 +302,6 @@ * 下发路灯任务日志记录结束 */ // if (oldPoleFail.isEmpty() && closePoleFail.isEmpty()) { // //全部成功 // return 0; // } else if (!closeLight.isEmpty() || !oldPoleFail.isEmpty()) { // //关灯失败 或者覆盖任务失败 // return 1; // } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closeSuccess.isEmpty()) { // //编辑全部失败 // return 2; // } else { // //其他情况 // return -1; // } // if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) { // //编辑成功 // return 0; // } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) { // //编辑失败 // return 1; // } else { // //在旧任务基础上编辑 // if (lightTask.getTaskId().equals(newLightTask.getTaskId())) { // //只有旧任务 // return 2; // } else { // //有新任务，有旧任务 // return 3; // } // } if (newPoleFail.isEmpty() && oldPoleFail.isEmpty() && closePoleFail.isEmpty()) { return "编辑成功"; } else if (newPoleSuccess.isEmpty() && oldPoleSuccess.isEmpty() && closePoleSuccess.isEmpty()) {
