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

Merge remote-tracking branch 'origin/dev' into cbs

Browse Source 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapServiceImpl.java
This commit is contained in:
cbs 2025-06-26 09:11:56 +08:00
commit 0f78691b3b
12 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -371,4 +371,4 @@
目前已经实现登录、我的、工作台、编辑资料、头像修改、密码修改、常见问题、关于我们等基础功能。
### CICD 测试5
### CICD 测试6

25
yudao-module-system/yudao-module-system-biz/pom.xml
View File

@ -16,7 +16,30 @@
system 模块下，我们放通用业务，支撑上层的核心业务。
例如说：用户、部门、权限、数据字典等等
</description>
<repositories>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>ias-snapshots</id>
<name>Infinite Automation Snapshot Repository</name>
<url>https://maven.mangoautomation.net/repository/ias-snapshot/</url>
</repository>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>ias-releases</id>
<name>Infinite Automation Release Repository</name>
<url>https://maven.mangoautomation.net/repository/ias-release/</url>
</repository>
</repositories>
<dependencies>
<!-- Spring Cloud 基础 -->
<dependency>

14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapIdNumMapVO.java Normal file
View File

@ -0,0 +1,14 @@
package cn.iocoder.yudao.module.system.controller.admin.positionmap.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class PositionMapIdNumMapVO {
@Schema(description = "主键ID")
private Long id;
@Schema(description = "序号")
private Long sortNum;
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/positionmap/PositionMapItemMapper.java
View File

@ -8,12 +8,10 @@ import cn.iocoder.yudao.module.mqtt.api.task.dto.Pose2ds;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.RobotPositionMapDTO;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapItemPageReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapItemDO;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 仓库点位地图子表 Mapper
@ -59,13 +57,13 @@ public interface PositionMapItemMapper extends BaseMapperX<PositionMapItemDO> {
/**
* 将laneId设为空
*
* @param mapId
* @param laneId
*/
void emptyLaneId(@Param("mapId") Long mapId, @Param("laneId") Long laneId);
/**
*
* @param list
* @return
*/
@ -73,12 +71,14 @@ public interface PositionMapItemMapper extends BaseMapperX<PositionMapItemDO> {
/**
* 删除这个地图的点
*
* @param mapId
*/
void deleteByMapId(@Param("mapId") Long mapId);
/**
* 更新车辆编号
*
* @param oldRobotNo
* @param newRobotNo
*/
@ -86,12 +86,12 @@ public interface PositionMapItemMapper extends BaseMapperX<PositionMapItemDO> {
/**
* 释放车辆
*
* @param robotNo
*/
void clearRobotNo(@Param("robotNo") String robotNo);
/**
*
* @param ids
* @return
*/

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/NodeProcessingContext.java
View File

@ -2,20 +2,21 @@ package cn.iocoder.yudao.module.system.handler.mapnode;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.enums.NodeTypeEnum;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.NodeBaseDTO;
import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapItemDO;
import cn.iocoder.yudao.module.system.handler.mapnode.strategy.*;
import cn.iocoder.yudao.module.system.service.positionmap.PositionMapItemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Component
@ -23,8 +24,6 @@ public class NodeProcessingContext {
private final Map<Integer, NodeProcessingStrategy> strategyMap = new HashMap<>();
@Autowired
private PositionMapItemService positionMapItemService;
@Autowired
private MapNodeStrategyImpl mapNodeStrategyImpl;
@Autowired
private ChangeNodeStrategyImpl changeNodeStrategyImpl;
@ -33,6 +32,7 @@ public class NodeProcessingContext {
@Autowired
private ParkingSpotStrategyImpl parkingSpotStrategyImpl;
@Autowired
@Lazy
private DeviceStrategyImpl deviceStrategyImpl;
/**

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/HouseLocationStrategyImpl.java
View File

@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.system.service.houselocation.HouseLocationService
import cn.iocoder.yudao.module.system.service.robot.RobotTaskDetailService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@ -34,6 +35,7 @@ public class HouseLocationStrategyImpl implements NodeProcessingStrategy {
private HouseLocationService houseLocationService;
@Resource
@Lazy
private RobotTaskDetailService taskDetailService;
//库位编号格式 - 第一个通配符为地图id 第二个通配符为随机数四位最后一个通配符为库位点层数

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

@ -21,6 +21,7 @@ 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.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@ -47,6 +48,7 @@ public class CommonConfigServiceImpl implements CommonConfigService {
private CommonConfigMapper configMapper;
@Resource
@Lazy
private ToolsService toolsService;
@Resource

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/path/PathPlanningServiceImpl.java
View File

@ -58,6 +58,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -115,6 +116,7 @@ public class PathPlanningServiceImpl implements PathPlanningService {
private CommonConfigService configService;
@Resource
@Lazy
private PositionMapService positionMapService;
@Resource
@ -127,6 +129,7 @@ public class PathPlanningServiceImpl implements PathPlanningService {
private PositionChangePointBindingService positionChangePointBindingService;
@Resource
@Lazy
private RemoteControllerInformationService controllerInformationService;
@Resource

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineServiceImpl.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapIdNumMapVO;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLinePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLineSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapItemDO;

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapServiceImpl.java
View File

@ -105,6 +105,7 @@ public class PositionMapServiceImpl extends ServiceImpl<PositionMapMapper, Posit
private RobotMapStopService robotMapStopService;
@Resource
@Lazy
private RobotTaskDetailService taskDetailService;
@Resource

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tool/ToolsServiceImpl.java
View File

@ -28,7 +28,6 @@ import cn.iocoder.yudao.module.system.enums.config.CommandConfigTypeEnum;
import cn.iocoder.yudao.module.system.enums.item.PositionMapItemEnum;
import cn.iocoder.yudao.module.system.enums.robot.RobotWarnType;
import cn.iocoder.yudao.module.system.enums.robot.task.RobotCommandTypeEnum;
import cn.iocoder.yudao.module.system.service.config.CommonConfigService;
import cn.iocoder.yudao.module.system.service.positionmap.PositionMapItemService;
import cn.iocoder.yudao.module.system.service.positionmap.PositionMapService;
import cn.iocoder.yudao.module.system.service.robot.RobotInformationService;

2
yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml
View File

@ -281,4 +281,4 @@ mqtt:
# 表示允许同时在传输中的最大消息数量
maxInflight: 1000
timeout: 10
keepalive: 20
keepalive: 20