Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -150,9 +150,14 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String lineDirStr;
 
-//    /**
-//     *是否显示启用录像按钮(1显示2不显示)
-//     */
-//    @TableField(exist = false)
-//    private Integer isStartRecording;
+    /**
+     * 是否开启录像(1开启2不开启)
+     */
+    private Integer startRecording;
+
+    /**
+     * 是否显示启用录像按钮(1显示2不显示)
+     */
+    @TableField(exist = false)
+    private Integer isStartRecording;
 }

business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -43,4 +43,6 @@ public interface BaseVehicleService extends IService<BaseVehicle> {
      * /列表，不分页
      */
     List<BaseVehicleTerminalDto> vehicleList();
+
+    AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal);
 }

business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -90,7 +90,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                     accountManagement.setCreateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
+//                    if (!ObjectUtils.isEmpty(deptId)) {
                         accountManagement.setDeptId(deptId);
                         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                         if (!ObjectUtils.isEmpty(accountManagement.getRailwayName())) {
@@ -126,37 +126,36 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                             failureMsg.append(msg);
                             log.error(msg);
                         }
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
-                    }
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else if (updateSupport) {
                     BeanValidators.validateWithException(validator, accountManagement);
                     accountManagement.setUpdateBy(userId);
                     Long deptId = baseDeptMapper.selectDeptByDeptName(accountManagement.getDeptName());
                     log.debug(accountManagement.getDeptName() + "主键id:" + deptId);
-                    if (!ObjectUtils.isEmpty(deptId)) {
-                        accountManagement.setDeptId(deptId);
-                        baseCameraManagementMapper.update(accountManagement, lw);
-                        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-                        if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
-                            wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
-                        }
-                        BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
-                        baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                        baseDeviceDynamicManagement.setUpdateBy(userId);
-                        baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
-                        successNum++;
-                        successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
-                    } else {
-                        failureNum++;
-                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
-                        failureMsg.append(msg);
-                        log.error(msg);
+//                    if (!ObjectUtils.isEmpty(deptId)) {
+                    accountManagement.setDeptId(deptId);
+                    baseCameraManagementMapper.update(accountManagement, lw);
+                    LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+                    if (!ObjectUtils.isEmpty(baseAccountManagement.getCameraCode())) {
+                        wrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseAccountManagement.getCameraCode());
                     }
-
+                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementMapper.selectOne(wrapper);
+                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                    baseDeviceDynamicManagement.setUpdateBy(userId);
+                    baseDeviceDynamicManagementMapper.updateById(baseDeviceDynamicManagement);
+                    successNum++;
+                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 更新成功");
+//                    } else {
+//                        failureNum++;
+//                        String msg = failureNum + "、相机所属工务段 " + accountManagement.getDeptName() + "不存在， 导入失败：";
+//                        failureMsg.append(msg);
+//                        log.error(msg);
+//                    }
                 } else {
                     failureNum++;
                     failureMsg.append(failureNum + "、相机编码 " + accountManagement.getCameraCode() + " 已存在");

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -334,4 +334,14 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         }
         return dtoList;
     }
+
+    @Override
+    public AjaxResult vehicleTerminalUnmount(BaseTerminal baseTerminal) {
+        LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseTerminal) && !StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            wrapper.eq(BaseTerminal::getVehicleCode, baseTerminal.getVehicleCode());
+        }
+        baseTerminalMapper.delete(wrapper);
+        return AjaxResult.success();
+    }
 }

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -13,6 +13,7 @@ import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
+import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.*;
 import com.ozs.entity.vo.*;
@@ -166,8 +167,8 @@ public class BaseCameraManagementController extends BaseController {
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
-//        List<String> roleKey = baseUserService.getRoleName(getUserId());
-//        BaseUser baseUser = baseUserService.getUser(getUserId());
+        List<String> roleKey = baseUserService.getRoleName(getUserId());
+        BaseUser baseUser = baseUserService.getUser(getUserId());
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -187,17 +188,17 @@ public class BaseCameraManagementController extends BaseController {
                 o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
                 o.setMilesRange(begin + "-" + end);
                 o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
-//                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
-//                    o.setIsStartRecording(1);
-//                    for (String s : roleKey) {
-//                        if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
-//                            o.setIsStartRecording(1);
-//                            break;
-//                        } else {
-//                            o.setIsStartRecording(2);
-//                        }
-//                    }
-//                }
+                if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
+                    o.setIsStartRecording(1);
+                    for (String s : roleKey) {
+                        if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
+                            o.setIsStartRecording(1);
+                            break;
+                        } else {
+                            o.setIsStartRecording(2);
+                        }
+                    }
+                }
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -687,56 +688,56 @@ public class BaseCameraManagementController extends BaseController {
         return success(cameraTree);
     }
 
-//    @ApiOperation("关闭视频录制")
-//    @GetMapping("/endRecording/{id}")
-//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-//    public AjaxResult endRecording(@PathVariable Long id) {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        if (ObjectUtils.isEmpty(baseCameraManagement)) {
-//            return error("查不到该ID的相机台账数据!!!");
-//        }
-//        log.info("endRecording------------" + baseCameraManagement.getTaskId());
-//        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
-//        log.info("endRecording------------" + start);
-//        if ("success".equals(start)) {
-//            baseCameraManagement.setStartRecording(2);
-//            baseCameraManagement.setTaskId("");
-//            baseCameraManagement.setUpdateBy(getUserId());
-//        } else {
-//            baseCameraManagement.setStartRecording(2);
-//            baseCameraManagement.setTaskId("");
-//            baseCameraManagement.setUpdateBy(getUserId());
-//            log.error("关闭视频录制异常日志如下:" + start);
-//        }
-//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-//            return success();
-//        }
-//        return error();
-//    }
+    @ApiOperation("关闭视频录制")
+    @GetMapping("/endRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    public AjaxResult endRecording(@PathVariable Long id) {
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        if (ObjectUtils.isEmpty(baseCameraManagement)) {
+            return error("查不到该ID的相机台账数据!!!");
+        }
+        log.info("endRecording------------" + baseCameraManagement.getTaskId());
+        String start = HttpUtils.sendGet(CameraUtil.endRecording(baseCameraManagement.getTaskId()));
+        log.info("endRecording------------" + start);
+        if ("success".equals(start)) {
+            baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
+        } else {
+            baseCameraManagement.setStartRecording(2);
+            baseCameraManagement.setTaskId("");
+            baseCameraManagement.setUpdateBy(getUserId());
+            log.error("关闭视频录制异常日志如下:" + start);
+        }
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+            return success();
+        }
+        return error();
+    }
 
-//    @ApiOperation("开启视频录制")
-//    @GetMapping("/startRecording/{id}")
-//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-//    public AjaxResult startRecording(@PathVariable Long id) {
-//        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
-//        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
-//        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
-//        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
-//        log.info("startRecording------------" + start);
-//        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
-//            log.info("startRecording 返回成功！！1");
-//            baseCameraManagement.setStartRecording(1);
-//            baseCameraManagement.setTaskId(start);
-//            baseCameraManagement.setUpdateBy(getUserId());
-//        } else {
-//            return success("视频录制失败:请确认流是否存在或流是否开视频启开启");
-//        }
-//        if (baseCameraManagementService.updateById(baseCameraManagement)) {
-//            return success();
-//        } else {
-//            return error("开启视频录制失败");
-//        }
-//    }
+    @ApiOperation("开启视频录制")
+    @GetMapping("/startRecording/{id}")
+    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+    public AjaxResult startRecording(@PathVariable Long id) {
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        log.info("startRecording------CameraCode------" + baseCameraManagement.getCameraCode());
+        log.info("startRecording------Channel------" + baseCameraManagement.getChannel());
+        String start = HttpUtils.sendGet(CameraUtil.startRecording(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel()));
+        log.info("startRecording------------" + start);
+        if (start.startsWith(baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel())) {
+            log.info("startRecording 返回成功！！1");
+            baseCameraManagement.setStartRecording(1);
+            baseCameraManagement.setTaskId(start);
+            baseCameraManagement.setUpdateBy(getUserId());
+        } else {
+            return success("视频录制失败:请确认流是否存在或流是否开视频启开启");
+        }
+        if (baseCameraManagementService.updateById(baseCameraManagement)) {
+            return success();
+        } else {
+            return error("开启视频录制失败");
+        }
+    }
 
     @GetMapping(value = "/getAlarm/{cameraCode}")
     @ApiOperation("根据视频ID获取详细信息")

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -12,6 +12,7 @@ import com.ozs.common.utils.ChineseToPingyin;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseCameraManagement;
 import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
@@ -20,10 +21,10 @@ import com.ozs.entity.vo.BaseRailwayManagementVo;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.entity.vo.BaseVehicleVo;
 import com.ozs.entity.vo.VehicleTreeVo;
+import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.BaseRailwayManagementService;
 import com.ozs.service.BaseVehicleService;
-import com.ozs.service.VehiclePositionService;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.web.common.Constant;
@@ -38,12 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -60,6 +56,8 @@ import java.util.stream.Collectors;
 public class BaseVehicleController extends BaseController {
     @Resource
     BaseRailwayManagementService baseRailwayManagementService;
+    @Resource
+    BaseCameraManagementService cameraManagementService;
     @Autowired
     private DataScoreUtil dataScoreUtil;
     @Autowired
@@ -105,6 +103,22 @@ public class BaseVehicleController extends BaseController {
         return AjaxResult.success(isMount);
     }
 
+    /**
+     * 车载终端挂载 取消挂载
+     *
+     * @param baseTerminal
+     * @return
+     */
+    @ApiOperation(value = "车载终端挂载 取消挂载")
+    @PostMapping("/vehicleTerminalUnmount")
+    @Log(title = "机车信息管理", businessType = BusinessType.INSERT)
+    public AjaxResult vehicleTerminalUnmount(@RequestBody BaseTerminal baseTerminal) {
+        if (StringUtils.isEmptySunhh(baseTerminal) || StringUtils.isEmptySunhh(baseTerminal.getVehicleCode())) {
+            return AjaxResult.error("机车编码、终端编码不能为空！");
+        }
+        return baseVehicleService.vehicleTerminalUnmount(baseTerminal);
+    }
+
     /**
      * 车载终端挂载 保存
      *
@@ -335,8 +349,17 @@ public class BaseVehicleController extends BaseController {
             Object cameraCode = cacheMap.get("cameraCode");
             Object stream = cacheMap.get("currentStream");
             if (!ObjectUtils.isEmpty(cameraCode)) {
+                LambdaQueryWrapper<BaseCameraManagement> bcWrapper = new LambdaQueryWrapper<>();
+                bcWrapper.eq(BaseCameraManagement::getCameraCode, cameraCode.toString());
+                BaseCameraManagement one = cameraManagementService.getOne(bcWrapper);
+                //相机编码和实时流
                 ccMap.put("cameraCode", cameraCode.toString());
                 ccMap.put("currentStream", stream.toString());
+                //行别
+                String lineDirStr = one.getLineDir() == 1 ? "上行" : "下行";
+                ccMap.put("lineDir", lineDirStr);
+                //安装里程位置
+                ccMap.put("installMile", one.getInstallMiles());
                 return AjaxResult.success(ccMap);
             }
         }

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -145,12 +145,14 @@ public class SysRoleController extends BaseController {
 //        roleService.checkRoleDataScope(role.getRoleId());
         String roleKey = roleService.getRoleKey(role.getRoleId());
         if ("admin".equals(roleKey)) {
-            if (!ObjectUtils.isEmpty(role.getRoleKey())) {
-                role.setRoleKey("admin");
-            }
-            if (!ObjectUtils.isEmpty(role.getStatus())) {
-                role.setStatus("1");
-            }
+            return error("超级管理员角色不允许修改");
+
+            //if (!ObjectUtils.isEmpty(role.getRoleKey())) {
+            //    role.setRoleKey("admin");
+            //}
+            //if (!ObjectUtils.isEmpty(role.getStatus())) {
+            //    role.setStatus("1");
+            //}
         } else {
             if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
                 return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -437,10 +437,10 @@ public class SysUserController extends BaseController {
     @ApiOperation("数据权限分配")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
-//        BaseUser baseUser = baseUserService.getUserById(id);
-//        if (baseUser.getUserName().equals("admin")){
-//            return success("admin账号不能修改");
-//        }
+        BaseUser baseUser = baseUserService.getUserById(id);
+        if (baseUser.getUserName().equals("admin")) {
+            return success("admin账号不能修改");
+        }
         if (userService.dataPermission(id, dataPermission)) {
             return success();
         } else {