|
@@ -221,9 +221,9 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
o.setEndMiles(end);
|
|
|
String begin = AppendUtils.stringAppend(o.getBeginMile());
|
|
|
o.setBeginMiles(begin);
|
|
|
- if (roleName.size()>0){
|
|
|
+ if (roleName.size() > 0) {
|
|
|
for (String s : roleName) {
|
|
|
- if ("超级管理员".equals(s)){
|
|
|
+ if ("超级管理员".equals(s)) {
|
|
|
o.setIsStartRecording(1);
|
|
|
}
|
|
|
}
|
|
@@ -246,14 +246,14 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
@Log(title = "相机台账管理", businessType = BusinessType.DELETE)
|
|
|
@Transactional
|
|
|
public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
|
|
|
- LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
|
|
|
for (Long accountManagementId : accountManagementIds) {
|
|
|
+ LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
|
|
|
BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(accountManagementId);
|
|
|
- baseCameraManagementService.removeById(accountManagementId);
|
|
|
if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
|
|
|
queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
|
|
|
}
|
|
|
baseDeviceDynamicManagementService.remove(queryWrapper);
|
|
|
+ baseCameraManagementService.removeById(accountManagementId);
|
|
|
}
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -624,9 +624,9 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
/**
|
|
|
* 视频服务树形结构
|
|
|
*
|
|
|
- * @param railwayCode 线路
|
|
|
- * @param lineDir 行别
|
|
|
- * @param mils 里程位置
|
|
|
+ * @param railwayCode 线路
|
|
|
+ * @param lineDir 行别
|
|
|
+ * @param mils 里程位置
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation("视频服务树形结构")
|
|
@@ -687,7 +687,7 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
@Log(title = "相机台账管理", businessType = BusinessType.OTHER)
|
|
|
public AjaxResult endRecording(@PathVariable Long id) {
|
|
|
BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
|
|
|
- if (ObjectUtils.isEmpty(baseCameraManagement)){
|
|
|
+ if (ObjectUtils.isEmpty(baseCameraManagement)) {
|
|
|
return error("查不到该ID的相机台账数据!!!");
|
|
|
}
|
|
|
log.info("endRecording------------" + baseCameraManagement.getTaskId());
|
|
@@ -697,11 +697,11 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
baseCameraManagement.setStartRecording(2);
|
|
|
baseCameraManagement.setTaskId("");
|
|
|
baseCameraManagement.setUpdateBy(getUserId());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
baseCameraManagement.setStartRecording(2);
|
|
|
baseCameraManagement.setTaskId("");
|
|
|
baseCameraManagement.setUpdateBy(getUserId());
|
|
|
- log.error("关闭视频录制异常日志如下:"+start);
|
|
|
+ log.error("关闭视频录制异常日志如下:" + start);
|
|
|
}
|
|
|
if (baseCameraManagementService.updateById(baseCameraManagement)) {
|
|
|
return success();
|