xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -74,6 +74,15 @@ PageInfo<SysUser> page = userService.getList(pageInfo, sysUserListQuery); return AjaxResult.success(page); } /** * 获取用户不分页列表 */ @GetMapping("/api/v1/sys-user/listAll") @ApiOperation(value = "账号管理不分页列表", tags = {"管理后台-账号管理"}) public R<List<SysUser>> listAll() { List<SysUser> listAll = userService.list(); return R.ok(listAll); }
@@ -85,6 +85,6 @@ @ApiModelProperty(value = "状态 0=待到达 1=待处理 2=已完成 3=已取消") private Integer status; private String belongUserIds; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrder.java
@@ -63,6 +63,7 @@ @ApiModelProperty(value = "处理状态 1待处理 2处理中 3已处理") private Integer handleStatus; @ApiModelProperty(value = "如果状态为待处理或者处理中 是否可以处理 0否 1是") @TableField(exist = false) private Integer isHandle; @ApiModelProperty(value = "处理人id") private Long handleUserId; @@ -72,6 +73,9 @@ @ApiModelProperty(value = "处理日志") @TableField(exist = false) private List<XpWorkOrderLog> workOrderLogs; @ApiModelProperty(value = "创建人id") private Long createById; @ApiModelProperty(value = "创建人头像") @TableField(exist = false) private String createByAvatar; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpWorkOrderLog.java
@@ -46,6 +46,10 @@ @ApiModelProperty(value = "所属处理人名称") @TableField(exist = false) private String handleUserName; @ApiModelProperty(value = "所属处理人touxiang") @TableField(exist = false) private String handleUserAvatar; @ApiModelProperty(value = "操作类型 1移交 2办结") private Integer handleType; xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpWorkOrderController.java
@@ -55,6 +55,7 @@ @ApiOperation(value = "创建工单") @PostMapping("/saveWorkOrder") public R saveWordOrder(@RequestBody XpWorkOrder workOrder) { workOrder.setCreateById(tokenService.getLoginUser().getSysUser().getId()); workOrderService.save(workOrder); return R.ok(); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/InsuranceInspectionScheduleTask.java
@@ -353,7 +353,7 @@ task.setStatus(TaskScheduleConstants.TASK_STATUS_PENDING_ARRIVE); // 设置任务接收人（配置角色下的所有运维人员都可以看到） task.setBelongUserIds(belongUserIds); task.setHandleUserId(belongUserIds); // 设置创建信息 task.setReportTime(LocalDateTime.now()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/RoutinePreparationScheduleTask.java
@@ -373,7 +373,7 @@ task.setStatus(TaskScheduleConstants.TASK_STATUS_PENDING_ARRIVE); // 设置任务接收人（配置角色下的所有运维人员都可以看到） task.setBelongUserIds(belongUserIds); task.setHandleUserId(belongUserIds); // 设置创建信息 task.setReportTime(LocalDateTime.now()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/VehicleCleanScheduleTask.java
@@ -373,7 +373,7 @@ task.setStatus(TaskScheduleConstants.TASK_STATUS_PENDING_ARRIVE); // 设置任务接收人（配置角色下的所有运维人员都可以看到） task.setBelongUserIds(belongUserIds); task.setHandleUserId(belongUserIds); // 设置创建信息 task.setReportTime(LocalDateTime.now()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/VehicleInspectionScheduleTask.java
@@ -333,7 +333,7 @@ task.setStatus(TaskScheduleConstants.TASK_STATUS_PENDING_ARRIVE); // 设置任务接收人（配置角色下的所有运维人员都可以看到） task.setBelongUserIds(belongUserIds); task.setHandleUserId(belongUserIds); // 设置创建信息 task.setReportTime(LocalDateTime.now()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/VehicleMaintenanceScheduleTask.java
@@ -359,7 +359,7 @@ task.setStatus(TaskScheduleConstants.TASK_STATUS_PENDING_ARRIVE); // 设置任务接收人（配置角色下的所有运维人员都可以看到） task.setBelongUserIds(belongUserIds); task.setHandleUserId(belongUserIds); // 设置创建信息 task.setReportTime(LocalDateTime.now()); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -949,6 +949,7 @@ task.setVehicleLat(dto.getVehicleLat()); task.setReportUserId(reportUserId); task.setReportTime(LocalDateTime.now()); saveTask.add( task); } this.saveBatch(saveTask); @@ -1246,16 +1247,19 @@ } XpTaskHandleDetail xpTaskHandleDetail = xpTaskHandleDetailMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetail>() .eq(XpTaskHandleDetail::getTaskId, id)); res.setDeathCount(xpTaskHandleDetail.getDeathCount()); res.setSevereCount(xpTaskHandleDetail.getSevereCount()); res.setMinorCount(xpTaskHandleDetail.getMinorCount()); res.setResponsibilityJudgment(xpTaskHandleDetail.getResponsibilityJudgment()); res.setResponsibleDescription(xpTaskHandleDetail.getResponsibleDescription()); res.setResponsibleImage(xpTaskHandleDetail.getResponsibleImage()); res.setDisposalDescription(xpTaskHandleDetail.getDisposalDescription()); res.setDisposalImage(xpTaskHandleDetail.getDisposalImage()); res.setSituationDescription(xpTaskHandleDetail.getSituationDescription()); res.setSituationImage(xpTaskHandleDetail.getSituationImage()); if (xpTaskHandleDetail != null){ res.setDeathCount(xpTaskHandleDetail.getDeathCount()); res.setSevereCount(xpTaskHandleDetail.getSevereCount()); res.setMinorCount(xpTaskHandleDetail.getMinorCount()); res.setResponsibilityJudgment(xpTaskHandleDetail.getResponsibilityJudgment()); res.setResponsibleDescription(xpTaskHandleDetail.getResponsibleDescription()); res.setResponsibleImage(xpTaskHandleDetail.getResponsibleImage()); res.setDisposalDescription(xpTaskHandleDetail.getDisposalDescription()); res.setDisposalImage(xpTaskHandleDetail.getDisposalImage()); res.setSituationDescription(xpTaskHandleDetail.getSituationDescription()); res.setSituationImage(xpTaskHandleDetail.getSituationImage()); } managementDetailVO.setAccidentDetailVO(res); } return R.ok(managementDetailVO); xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpWorkOrderServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -88,14 +89,25 @@ } List<Long> handleUserIds = workOrderLogs.stream().map(XpWorkOrderLog::getHandleUserId).collect(Collectors.toList()); List<SysUser> sysUsers = sysUserClient.listByIds(handleUserIds).getData(); Map<Long, String> userMap = new HashMap<>(); if (workOrder.getCreateById()!=null){ List<Long> createUserId = new ArrayList<>(); createUserId.add(workOrder.getCreateById()); List<SysUser> sysUser = sysUserClient.listByIds(createUserId).getData(); if (sysUser != null && !sysUser.isEmpty()){ workOrder.setCreateByAvatar(sysUser.get(0).getAvatar()); } } Map<Long, SysUser> userMap = new HashMap<>(); if (sysUsers != null) { userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, SysUser::getNickName)); userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getId, e->e)); } for (XpWorkOrderLog workOrderLog : workOrderLogs) { if (workOrderLog.getHandleUserId() != null) { String handleUserName = userMap.get(workOrderLog.getHandleUserId()); String handleUserName = userMap.get(workOrderLog.getHandleUserId()).getNickName(); workOrderLog.setHandleUserName(handleUserName); String avatar = userMap.get(workOrderLog.getHandleUserId()).getAvatar(); workOrderLog.setHandleUserAvatar(avatar); } } workOrder.setWorkOrderLogs(workOrderLogs); @@ -108,11 +120,13 @@ if (workOrderLog.getHandleType() == 2) { // 办结 工单状态流转为已完成 workOrder.setHandleStatus(3); workOrder.setFeedbackUserPhone(null); workOrder.setHandleUserId(workOrderLog.getHandleUserId()); this.updateById(workOrder); }else{ // 移交 workOrder.setHandleStatus(2); workOrder.setFeedbackUserPhone(null); workOrder.setHandleUserId(workOrderLog.getHandleUserId()); this.updateById(workOrder); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
@@ -117,6 +117,8 @@ SysUser sysUser = tokenService.getLoginUser().getSysUser(); XpWhitelist xpWhitelist = new XpWhitelist(); BeanUtils.copyProperties(dto, xpWhitelist); xpWhitelist.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName()); return xpWhitelistService.editWhitelist(xpWhitelist, sysUser); } @@ -190,6 +192,7 @@ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW) @PostMapping("/importExcel") public AjaxResult<String> importExcel(@RequestPart("file") MultipartFile file) { ImportParams params = new ImportParams(); // params.setTitleRows(1); // 标题行数 params.setHeadRows(1); //表头行数 @@ -235,6 +238,7 @@ xpWhitelist.setStatus(true); xpWhitelist.setIsPriorityDispatch(true); xpWhitelist.setWhitelistSource(1); xpWhitelist.setCreateBy(tokenService.getLoginUser().getSysUser().getNickName()); addList.add(xpWhitelist); } if (!result.isEmpty()) { @@ -250,6 +254,7 @@ xpWhitelistOperlog.setOperationIp(IpUtils.getIpAddr()); xpWhitelistOperlog.setOperationAccountId(sysUser.getId()); xpWhitelistOperlog.setOperationContent(operationContent.toString()); xpWhitelistOperlog.setCreateBy(tokenService.getLoginUser().getSysUser().getNickName()); xpWhitelistOperlogService.save(xpWhitelistOperlog); return AjaxResult.success(); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/exportExcle/XpWhitelistExportExcel.java
@@ -33,12 +33,12 @@ private String account; @ApiModelProperty(value = "状态 0=冻结 1=正常") @cn.afterturn.easypoi.excel.annotation.Excel(name = "状态",width = 20,replace = {"true_正常","false_冻结"}) @cn.afterturn.easypoi.excel.annotation.Excel(name = "状态",width = 20,replace = {"正常_true","冻结_false"}) private Boolean status; @ApiModelProperty(value = "优先派单 1=是 0=否") @cn.afterturn.easypoi.excel.annotation.Excel(name = "优先派单",width = 20,replace = {"true_是","false_否"}) @cn.afterturn.easypoi.excel.annotation.Excel(name = "优先派单",width = 20,replace = {"是_true","否_false"}) private Boolean isPriorityDispatch;
@@ -53,6 +53,10 @@ @Override public R addWhitelist(WhitelistAddDto dto, SysUser sysUser) { XpWhitelist old = this.lambdaQuery().eq(XpWhitelist::getAccount, dto.getAccount()).last("limit 1").one(); if (old != null) { return R.fail("该账号已存在"); } List<XpWhitelist> addList = new ArrayList<>(); List<String> accounts = Arrays.asList(dto.getAccount().split(",")); StringBuilder operationContent = new StringBuilder("新增账号:"); @@ -63,6 +67,7 @@ xpWhitelist.setStatus(true); xpWhitelist.setIsPriorityDispatch(dto.getIsPriorityDispatch()); xpWhitelist.setWhitelistSource(1); xpWhitelist.setCreateBy(sysUser.getCreateBy()); addList.add(xpWhitelist); accountBuilder.append("\"").append(account).append("\"").append(","); } xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpWhitelistMapper.xml
@@ -18,7 +18,7 @@ and status = #{query.status} </if> <if test="query.whitelistSource != null"> and whitelist_source = #{query.source} and whitelist_source = #{query.whitelistSource} </if> order by create_time desc </select>
