ak/zn-cloud-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

人工完成

Browse Source
This commit is contained in:
cbs 2025-03-27 17:05:21 +08:00
parent cb558f7977
commit 061f08164b
16 changed files with 99 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
View File

@ -45,12 +45,12 @@ public class ApiAccessLogInterceptor implements HandlerInterceptor {
if (!SpringUtils.isProd()) {
Map<String, String> queryString = ServletUtils.getParamMap(request);
String requestBody = ServletUtils.isJsonRequest(request) ? ServletUtils.getBody(request) : null;
if (CollUtil.isEmpty(queryString) && StrUtil.isEmpty(requestBody)) {
/*if (CollUtil.isEmpty(queryString) && StrUtil.isEmpty(requestBody)) {
log.info("[preHandle][开始请求 URL({}) 无参数]", request.getRequestURI());
} else {
log.info("[preHandle][开始请求 URL({}) 参数({})]", request.getRequestURI(),
StrUtil.blankToDefault(requestBody, queryString.toString()));
}
}*/
// 计时
StopWatch stopWatch = new StopWatch();
stopWatch.start();
@ -67,8 +67,8 @@ public class ApiAccessLogInterceptor implements HandlerInterceptor {
if (!SpringUtils.isProd()) {
StopWatch stopWatch = (StopWatch) request.getAttribute(ATTRIBUTE_STOP_WATCH);
stopWatch.stop();
log.info("[afterCompletion][完成请求 URL({}) 耗时({} ms)]",
request.getRequestURI(), stopWatch.getTotalTimeMillis());
/* log.info("[afterCompletion][完成请求 URL({}) 耗时({} ms)]",
request.getRequestURI(), stopWatch.getTotalTimeMillis());*/
}
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/robot/RequestProcessor.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.api.robot;
import cn.hutool.core.map.MapUtil;
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@ -24,7 +25,7 @@ public class RequestProcessor {
public RequestProcessor() {
// 每秒执行一次 - 处理并发送数据 - 避免数据丢失
scheduler.scheduleAtFixedRate(this::processAndSend, 300, 300, TimeUnit.MILLISECONDS);
scheduler.scheduleAtFixedRate(this::processAndSend, 1000, 1000, TimeUnit.MILLISECONDS);
}
public void handleRequest(String map, String mac, String data) {
@ -45,7 +46,7 @@ public class RequestProcessor {
private void sendData(String map, Map<String, String> data) {
// -- 发送给对应的websocket
// System.out.println("key:" + map + "发送数据：" + data);
log.info("key:" + map + "发送数据：" + data);
log.info("key:" + map + "发送数据：" + JSON.toJSONString(data));
webSocketSenderApi.sendObject(map, "map_push", data);
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApiImpl.java
View File

@ -62,7 +62,7 @@ public class RobotStatusApiImpl implements RobotStatusApi {
* @return
*/
@Override
@SystemRateLimiter(time = 1, count = 150, keyArg = "robotStatusUpdate",message = "机器人上报点位超过限流")
@SystemRateLimiter(time = 1, count = 1, keyArg = "robotStatusUpdate",message = "机器人上报点位超过限流")
public void robotStatusUpdate(RobotPoseStatusDTO robotStatusDataDTO) {
updateRobotPosed(robotStatusDataDTO);
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/RobotTaskDetailController.java
View File

@ -92,4 +92,12 @@ public class RobotTaskDetailController {
BeanUtils.toBean(list, RobotTaskDetailRespVO.class));
}
@PostMapping("/manuallyCompleted")
@Operation(summary = "人工完成")
@PreAuthorize("@ss.hasPermission('robot:task-detail:manuallyCompleted')")
public CommonResult manuallyCompleted(@RequestParam("id") Long id) {
taskDetailService.manuallyCompleted(id);
return success(true);
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotTaskDetailPageReqVO.java
View File

@ -56,7 +56,7 @@ public class RobotTaskDetailPageReqVO extends PageParam {
@Schema(description = "任务状态(0:未开始、1：执行中、2：已完成、3：已取消、4:异常)", example = "1")
private Integer taskStatus;
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电)")
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
private Long taskStage;
@Schema(description = "开始时间")

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotTaskDetailRespVO.java
View File

@ -62,8 +62,8 @@ public class RobotTaskDetailRespVO {
@ExcelProperty("任务状态(0:未开始、1：执行中、2：已完成、3：已取消、4:异常)")
private Integer taskStatus;
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电)")
@ExcelProperty("任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电)")
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
@ExcelProperty("任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
private Long taskStage;
@Schema(description = "开始时间")

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotTaskDetailSaveReqVO.java
View File

@ -62,7 +62,7 @@ public class RobotTaskDetailSaveReqVO {
@Schema(description = "任务状态(0:未开始、1：执行中、2：已完成、3：已取消、4:异常)", example = "1")
private Integer taskStatus;
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电)")
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
private Long taskStage;
@Schema(description = "开始时间")

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/log/RobotTaskDetailActionLogDO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.dal.dataobject.log;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -53,4 +54,9 @@ public class RobotTaskDetailActionLogDO extends BaseDO {
*/
private Long taskDetailId;
/**
* 任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)
*/
private Long taskStage;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotTaskDetailDO.java
View File

@ -96,7 +96,7 @@ public class RobotTaskDetailDO extends BaseDO {
*/
private Integer taskStatus;
/**
* 任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电)
* 任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)
*/
private Long taskStage;
/**

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/enums/robot/task/RobotTaskStageEnum.java
View File

@ -14,7 +14,9 @@ public enum RobotTaskStageEnum {
DONE(5L,"结束"),
MOVE(6L,"移动中"),
CHARGEING(7L,"待执行正在充电"),
CLOSE(8L,"任务已取消");
CLOSE(8L,"任务已取消"),
MANUALLY_COMPLETED(9L,"人工完成"),
EXCEPTION(10L,"异常");
/**
* 类型
*/

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigServiceImpl.java
View File

@ -17,13 +17,19 @@ import cn.iocoder.yudao.module.system.enums.config.CommandConfigTypeEnum;
import cn.iocoder.yudao.module.system.service.log.UserOperationLogService;
import cn.iocoder.yudao.module.system.service.tool.ToolsService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.lang.reflect.Type;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.CONFIG_NOT_EXISTS;
@ -99,17 +105,20 @@ public class CommonConfigServiceImpl implements CommonConfigService {
String onceStartTime = s.format(formatter);
String onceEndTime = e.format(formatter);
JSONObject jsonObject = new JSONObject(config.getConfigStr());
jsonObject.put("onceStartTime", onceStartTime);
jsonObject.put("onceEndTime", onceEndTime);
Gson gson = new Gson();
Type type = new TypeToken<Map<String, String>>(){}.getType();
Map<String, String> map = gson.fromJson(config.getConfigStr(), type);
map.put("onceStartTime", onceStartTime);
map.put("onceEndTime", onceEndTime);
String str = JSON.toJSONString(jsonObject);
String str = JSON.toJSONString(map);
config.setConfigStr(str);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateConfig(CommonConfigSaveReqVO updateReqVO) {
// 校验存在
validateConfigExists(updateReqVO.getId());

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java
View File

@ -141,13 +141,13 @@ public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationM
public void deleteInformation(Long id) {
// 校验存在
validateInformationExists(id);
// 删除
informationMapper.deleteById(id);
DeviceInformationDO deviceInformationDO = informationMapper.selectById(id);
UserOperationLogSaveReqVO operationLog = UserOperationLogSaveReqVO.builder()
.operateAction("删除设备 " + deviceInformationDO.getDeviceNo())
.nickName(SecurityFrameworkUtils.getLoginUserNickname()).build();
// 删除
informationMapper.deleteById(id);
userOperationLogService.createUserOperationLog(operationLog);
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationService.java
View File

@ -150,4 +150,12 @@ public interface RobotInformationService extends IService<RobotInformationDO> {
* @param robotNo
*/
void doTaskContinue(String robotNo);
/**
*
* @param id
* @param mac
* @param orderType
*/
void robotCloseTaskDetail(String id, String mac, String orderType);
}

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java
View File

@ -259,16 +259,15 @@ public class RobotInformationServiceImpl extends ServiceImpl<RobotInformationMap
@Override
public void deleteInformation(Long id) {
// 校验存在
validateInformationExists(id);
// 删除
informationMapper.deleteById(id);
RobotInformationDO robotInformationDO = informationMapper.selectById(id);
UserOperationLogSaveReqVO operationLog = UserOperationLogSaveReqVO.builder()
.operateAction("删除车辆 " + robotInformationDO.getRobotNo())
.nickName(SecurityFrameworkUtils.getLoginUserNickname()).build();
userOperationLogService.createUserOperationLog(operationLog);
// 校验存在
validateInformationExists(id);
// 删除
informationMapper.deleteById(id);
}
private void validateInformationExists(Long id) {
@ -1030,6 +1029,7 @@ public class RobotInformationServiceImpl extends ServiceImpl<RobotInformationMap
* @param mac
* @param orderType
*/
@Override
public void robotCloseTaskDetail(String id, String mac, String orderType) {
RobotAcceptTaskDTO robotTask = new RobotAcceptTaskDTO();
robotTask.setOrderId(id);

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotTaskDetailService.java
View File

@ -66,4 +66,11 @@ public interface RobotTaskDetailService {
* @param taskDetailId
*/
RobotTaskDetailDO closeTaskDetail(Long taskDetailId);
/**
*
* @param id
* @return
*/
void manuallyCompleted(Long id);
}

33
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotTaskDetailServiceImpl.java
View File

@ -6,12 +6,15 @@ import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotTaskDetailA
import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotTaskDetailPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotTaskDetailRespVO;
import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotTaskDetailSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.log.RobotTaskDetailActionLogDO;
import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotTaskDO;
import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotTaskDetailDO;
import cn.iocoder.yudao.module.system.dal.mysql.robot.RobotTaskDetailMapper;
import cn.iocoder.yudao.module.system.dal.mysql.robot.RobotTaskMapper;
import cn.iocoder.yudao.module.system.enums.robot.RobotTaskDetailStatusEnum;
import cn.iocoder.yudao.module.system.enums.robot.RobotTaskStatusEnum;
import cn.iocoder.yudao.module.system.enums.robot.task.RobotTaskStageEnum;
import cn.iocoder.yudao.module.system.service.log.RobotTaskDetailActionLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -46,6 +49,12 @@ public class RobotTaskDetailServiceImpl implements RobotTaskDetailService {
@Resource
private RobotTaskMapper robotTaskMapper;
@Resource
private RobotTaskDetailActionLogService taskDetailActionLogService;
@Resource
private RobotInformationService informationService;
@Override
public Long createTaskDetail(RobotTaskDetailSaveReqVO createReqVO) {
// 插入
@ -119,4 +128,28 @@ public class RobotTaskDetailServiceImpl implements RobotTaskDetailService {
log.info("车机上报异常， 把任务取消 :{}", taskDetailId);
return robotTaskDetailDO;
}
@Override
public void manuallyCompleted(Long taskDetailId) {
RobotTaskDetailDO robotTaskDetailDO = taskDetailMapper.selectById(taskDetailId);
Long taskStage = robotTaskDetailDO.getTaskStage();
robotTaskDetailDO.setTaskStatus(RobotTaskDetailStatusEnum.DONE.getType());
robotTaskDetailDO.setTaskStage(RobotTaskStageEnum.MANUALLY_COMPLETED.getType());
taskDetailMapper.updateById(robotTaskDetailDO);
RobotTaskDetailActionLogDO log = taskDetailActionLogService.getLastTaskByRobotNo(robotTaskDetailDO.getRobotNo());
if (ObjectUtil.isEmpty(log) || !log.getTaskDetailId().equals(taskDetailId)) {
return;
}
if (RobotTaskStageEnum.DONE.getType().equals(taskStage)
|| RobotTaskStageEnum.CLOSE.getType().equals(taskStage)
|| RobotTaskStageEnum.MANUALLY_COMPLETED.getType().equals(taskStage)
|| RobotTaskStageEnum.EXCEPTION.getType().equals(taskStage) ) {
return;
}
String mac = informationService.getMacByRobotNo(robotTaskDetailDO.getRobotNo());
informationService.robotCloseTaskDetail(String.valueOf(taskDetailId),mac,"");
}
}