From 8e8a4259d1c8eba6b80d851e6f0a68ea8e80b57a Mon Sep 17 00:00:00 2001 From: aikai Date: Thu, 6 Mar 2025 11:11:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=9C=B0=E5=9B=BE=E5=85=B3=E8=81=94=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3-=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=9C=B0=E5=9B=BE=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E3=80=81=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E3=80=81=E6=9C=8D=E5=8A=A1=E5=92=8C=20mapper=20-=20?= =?UTF-8?q?=E5=9C=A8=E6=9C=BA=E5=99=A8=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E9=9B=86=E6=88=90=E8=AE=BE=E5=A4=87=E5=9C=B0=E5=9B=BE=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=95=B0=E6=8D=AE=20-=20=E4=BC=98=E5=8C=96=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=89=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=20ID=20=E6=9F=A5=E8=AF=A2-=20=E4=BF=AE=E5=A4=8D=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=9D=BF=E4=B8=AD=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20-=20=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9B=B8=E5=85=B3=20API=EF=BC=8C=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mqtt/service/RobotStatusServiceImpl.java | 8 +- .../system/api/robot/RobotStatusApi.java | 3 - .../InformationMapAssociationController.java | 93 +++++++++++++++++++ .../InformationMapAssociationPageReqVO.java | 28 ++++++ .../vo/InformationMapAssociationRespVO.java | 31 +++++++ .../InformationMapAssociationSaveReqVO.java | 21 +++++ .../PositionMapItemController.java | 8 ++ .../robot/RobotInformationController.java | 8 ++ .../admin/robot/vo/DeviceStatusInfoVO.java | 3 + .../InformationMapAssociationDO.java | 39 ++++++++ .../InformationMapAssociationMapper.java | 28 ++++++ .../mysql/robot/RobotInformationMapper.java | 25 +++-- .../BulletinBoardServiceImpl.java | 9 ++ .../InformationMapAssociationService.java | 62 +++++++++++++ .../InformationMapAssociationServiceImpl.java | 81 ++++++++++++++++ .../positionmap/PositionMapItemService.java | 9 ++ .../PositionMapItemServiceImpl.java | 16 +++- .../robot/RobotInformationService.java | 7 ++ .../robot/RobotInformationServiceImpl.java | 43 +++++++-- .../InformationMapAssociationMapper.xml | 12 +++ .../mapper/robot/RobotInformationMapper.xml | 16 +++- 21 files changed, 526 insertions(+), 24 deletions(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/InformationMapAssociationController.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationPageReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationRespVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationSaveReqVO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/informationmapassociation/InformationMapAssociationDO.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/informationmapassociation/InformationMapAssociationMapper.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationService.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationServiceImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/informationmapassociation/InformationMapAssociationMapper.xml diff --git a/yudao-module-mqtt/yudao-module-mqtt-biz/src/main/java/cn/iododer/yudao/module/mqtt/service/RobotStatusServiceImpl.java b/yudao-module-mqtt/yudao-module-mqtt-biz/src/main/java/cn/iododer/yudao/module/mqtt/service/RobotStatusServiceImpl.java index 207537929..c23752240 100644 --- a/yudao-module-mqtt/yudao-module-mqtt-biz/src/main/java/cn/iododer/yudao/module/mqtt/service/RobotStatusServiceImpl.java +++ b/yudao-module-mqtt/yudao-module-mqtt-biz/src/main/java/cn/iododer/yudao/module/mqtt/service/RobotStatusServiceImpl.java @@ -2,7 +2,6 @@ package cn.iododer.yudao.module.mqtt.service; import cn.iocoder.yudao.module.system.api.robot.RobotStatusApi; import cn.iocoder.yudao.module.system.api.robot.dto.RobotStatusDTO; -import cn.iocoder.yudao.module.system.api.robot.dto.RobotStatusDataDTO; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,18 +10,19 @@ import javax.annotation.Resource; @Slf4j @Service -public class RobotStatusServiceImpl implements MqttService{ +public class RobotStatusServiceImpl implements MqttService { @Resource private RobotStatusApi robotStatusApi; /** * 机器人点位 + * * @param message */ @Override public void analysisMessage(String message) { - log.info("处理RobotStatusServiceImpl的消息 :{}",message); - RobotStatusDTO robotStatusData = JSON.parseObject(message , RobotStatusDTO.class); + log.info("处理RobotStatusServiceImpl的消息 :{}", message); + RobotStatusDTO robotStatusData = JSON.parseObject(message, RobotStatusDTO.class); robotStatusApi.robotStatusUpdate(robotStatusData); } } diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApi.java index 626912b4a..b8d18b16b 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/robot/RobotStatusApi.java @@ -1,9 +1,6 @@ package cn.iocoder.yudao.module.system.api.robot; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.system.api.robot.dto.RobotCompleteTaskDTO; import cn.iocoder.yudao.module.system.api.robot.dto.RobotStatusDTO; -import cn.iocoder.yudao.module.system.api.robot.dto.RobotStatusDataDTO; import cn.iocoder.yudao.module.system.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/InformationMapAssociationController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/InformationMapAssociationController.java new file mode 100644 index 000000000..9f2744e8b --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/InformationMapAssociationController.java @@ -0,0 +1,93 @@ +package cn.iocoder.yudao.module.system.controller.admin.informationmapassociation; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationRespVO; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationSaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation.InformationMapAssociationDO; +import cn.iocoder.yudao.module.system.service.informationmapassociation.InformationMapAssociationService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 设备地图关联") +@RestController +@RequestMapping("/system/information-map-association") +@Validated +public class InformationMapAssociationController { + + @Resource + private InformationMapAssociationService informationMapAssociationService; + + @PostMapping("/create") + @Operation(summary = "创建设备地图关联") + @PreAuthorize("@ss.hasPermission('system:information-map-association:create')") + public CommonResult createInformationMapAssociation(@Valid @RequestBody InformationMapAssociationSaveReqVO createReqVO) { + return success(informationMapAssociationService.createInformationMapAssociation(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新设备地图关联") + @PreAuthorize("@ss.hasPermission('system:information-map-association:update')") + public CommonResult updateInformationMapAssociation(@Valid @RequestBody InformationMapAssociationSaveReqVO updateReqVO) { + informationMapAssociationService.updateInformationMapAssociation(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除设备地图关联") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('system:information-map-association:delete')") + public CommonResult deleteInformationMapAssociation(@RequestParam("id") Long id) { + informationMapAssociationService.deleteInformationMapAssociation(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得设备地图关联") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:information-map-association:query')") + public CommonResult getInformationMapAssociation(@RequestParam("id") Long id) { + InformationMapAssociationDO informationMapAssociation = informationMapAssociationService.getInformationMapAssociation(id); + return success(BeanUtils.toBean(informationMapAssociation, InformationMapAssociationRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得设备地图关联分页") + @PreAuthorize("@ss.hasPermission('system:information-map-association:query')") + public CommonResult> getInformationMapAssociationPage(@Valid InformationMapAssociationPageReqVO pageReqVO) { + PageResult pageResult = informationMapAssociationService.getInformationMapAssociationPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, InformationMapAssociationRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出设备地图关联 Excel") + @PreAuthorize("@ss.hasPermission('system:information-map-association:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportInformationMapAssociationExcel(@Valid InformationMapAssociationPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = informationMapAssociationService.getInformationMapAssociationPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "设备地图关联.xls", "数据", InformationMapAssociationRespVO.class, + BeanUtils.toBean(list, InformationMapAssociationRespVO.class)); + } + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationPageReqVO.java new file mode 100644 index 000000000..75bd643a3 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationPageReqVO.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 设备地图关联分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class InformationMapAssociationPageReqVO extends PageParam { + + @Schema(description = "地图id", example = "30278") + private Long positionMapId; + + @Schema(description = "AGV设备id", example = "11651") + private Long robotInformationId; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationRespVO.java new file mode 100644 index 000000000..ff63d46a6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationRespVO.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 设备地图关联 Response VO") +@Data +@ExcelIgnoreUnannotated +public class InformationMapAssociationRespVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15277") + @ExcelProperty("主键ID") + private Long id; + + @Schema(description = "地图id", example = "30278") + @ExcelProperty("地图id") + private Long positionMapId; + + @Schema(description = "AGV设备id", example = "11651") + @ExcelProperty("AGV设备id") + private Long robotInformationId; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationSaveReqVO.java new file mode 100644 index 000000000..162799cf3 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/informationmapassociation/vo/InformationMapAssociationSaveReqVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 设备地图关联新增/修改 Request VO") +@Data +public class InformationMapAssociationSaveReqVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15277") + private Long id; + + @Schema(description = "地图id", example = "30278") + private Long positionMapId; + + @Schema(description = "AGV设备id", example = "11651") + private Long robotInformationId; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapItemController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapItemController.java index 202ef4b0e..db751b288 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapItemController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapItemController.java @@ -71,6 +71,14 @@ public class PositionMapItemController { return success(BeanUtils.toBean(positionMapItem, PositionMapItemRespVO.class)); } + @GetMapping("/getAGVPointInformation") + @Operation(summary = "获取AGV点位信息") + @Parameter(name = "macAddress", description = "mac地址", required = true, example = "1024") + public CommonResult getAGVPointInformation(@RequestParam("macAddress") String macAddress) { + Object object = positionMapItemService.getAGVPointInformation(macAddress); + return success(object); + } + @GetMapping("/list") @Operation(summary = "获取仓库点位地图节点列表") @PreAuthorize("@ss.hasPermission('system:position-map-item:query')") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/RobotInformationController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/RobotInformationController.java index 9d82a11dd..64e4cbd99 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/RobotInformationController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/RobotInformationController.java @@ -78,6 +78,14 @@ public class RobotInformationController { return success(BeanUtils.toBean(pageResult, RobotInformationPageRespVO.class)); } + + @GetMapping("/getListByMapId") + @Operation(summary = "根据地图id获取车辆列表") + public CommonResult> getListByMapId(@RequestParam Long mapId) { + List list = informationService.getListByMapId(mapId); + return success(BeanUtils.toBean(list, RobotInformationRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出车辆信息 Excel") @PreAuthorize("@ss.hasPermission('robot:information:export')") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/DeviceStatusInfoVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/DeviceStatusInfoVO.java index 225c9c245..52e511501 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/DeviceStatusInfoVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/DeviceStatusInfoVO.java @@ -23,4 +23,7 @@ public class DeviceStatusInfoVO { @Schema(description = "异常数量") private Integer abnormalNum = 0; + @Schema(description = "默认图片") + private String defaultImage; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/informationmapassociation/InformationMapAssociationDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/informationmapassociation/InformationMapAssociationDO.java new file mode 100644 index 000000000..87de488b7 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/informationmapassociation/InformationMapAssociationDO.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 设备地图关联 DO + * + * @author 芋道源码 + */ +@TableName("robot_information_map_association") +@KeySequence("robot_information_map_association_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InformationMapAssociationDO extends BaseDO { + + /** + * 主键ID + */ + @TableId + private Long id; + /** + * 地图id + */ + private Long positionMapId; + /** + * AGV设备id + */ + private Long robotInformationId; + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/informationmapassociation/InformationMapAssociationMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/informationmapassociation/InformationMapAssociationMapper.java new file mode 100644 index 000000000..c659ffa1a --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/informationmapassociation/InformationMapAssociationMapper.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.system.dal.mysql.informationmapassociation; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation.InformationMapAssociationDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.*; + +/** + * 设备地图关联 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface InformationMapAssociationMapper extends BaseMapperX { + + default PageResult selectPage(InformationMapAssociationPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(InformationMapAssociationDO::getPositionMapId, reqVO.getPositionMapId()) + .eqIfPresent(InformationMapAssociationDO::getRobotInformationId, reqVO.getRobotInformationId()) + .betweenIfPresent(InformationMapAssociationDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(InformationMapAssociationDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/robot/RobotInformationMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/robot/RobotInformationMapper.java index f83cffa47..33b3f6a8f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/robot/RobotInformationMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/robot/RobotInformationMapper.java @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.system.dal.mysql.robot; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotInformationPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotInformationStatisticsVO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotInformationDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Set; + /** * 车辆信息 Mapper * @@ -35,6 +35,7 @@ public interface RobotInformationMapper extends BaseMapperX /** * 更新机器人状态 + * * @param robotNo * @param robotStatus */ @@ -42,6 +43,7 @@ public interface RobotInformationMapper extends BaseMapperX /** * 查询 + * * @param query * @return */ @@ -49,13 +51,15 @@ public interface RobotInformationMapper extends BaseMapperX /** * 根据机器人编号查询 + * * @param robotNos * @return */ - List selectByRobotNos(@Param("robotNos") Set robotNos); + List selectByRobotNos(@Param("robotNos") Set robotNos); /** * 更新任务模式（0：拒收任务、1：正常） + * * @param robotNos * @param robotTaskModel */ @@ -64,8 +68,17 @@ public interface RobotInformationMapper extends BaseMapperX /** * 批量更新机器人状态 + * * @param robotNos * @param robotStatus */ void updateRobotListStatus(@Param("robotNos") Set robotNos, @Param("robotStatus") Integer robotStatus); -} \ No newline at end of file + + /** + * 根据地图id获取地图下的机器人信息 + * + * @param mapId + * @return + */ + List getListByMapId(@Param("mapId") Long mapId); +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/bulletinboard/BulletinBoardServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/bulletinboard/BulletinBoardServiceImpl.java index 8d51fb0cd..016452478 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/bulletinboard/BulletinBoardServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/bulletinboard/BulletinBoardServiceImpl.java @@ -13,11 +13,13 @@ import cn.iocoder.yudao.module.system.controller.admin.bulletinboard.vo.TaskStat import cn.iocoder.yudao.module.system.controller.admin.robot.vo.DeviceStatusInfoVO; import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotInfoStatusVO; import cn.iocoder.yudao.module.system.controller.admin.robot.vo.RobotInformationStatisticsVO; +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; import cn.iocoder.yudao.module.system.dal.dataobject.information.DeviceInformationDO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotInformationDO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotTaskDO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotWarnMsgDO; import cn.iocoder.yudao.module.system.enums.robot.RobotTaskDetailStatusEnum; +import cn.iocoder.yudao.module.system.service.dict.DictDataService; import cn.iocoder.yudao.module.system.service.information.DeviceInformationService; import cn.iocoder.yudao.module.system.service.robot.RobotInformationService; import cn.iocoder.yudao.module.system.service.robot.RobotTaskService; @@ -52,6 +54,8 @@ public class BulletinBoardServiceImpl implements BulletinBoardService { private RedisUtil redisUtil; @Resource private DeviceInformationService deviceInformationService; + @Resource + private DictDataService dictDataService; @Override public BulletinBoardVO getBulletinBoard() { @@ -123,6 +127,10 @@ public class BulletinBoardServiceImpl implements BulletinBoardService { } } vo.setRobotElectricityLevelVOS(robotElectricityLevelVOS); + // - 获取设备类型字典 + List deviceTypeList = dictDataService.getDictDataListByDictType("device_type"); + Map dictMap = deviceTypeList.stream().collect(Collectors.toMap(DictDataDO::getValue, Function.identity())); + // - 获取所有设备 List deviceInformationDOS = deviceInformationService.list(); //根据设备类型分组 @@ -132,6 +140,7 @@ public class BulletinBoardServiceImpl implements BulletinBoardService { Integer deviceType = entry.getKey(); DeviceStatusInfoVO deviceStatusInfoVO = new DeviceStatusInfoVO(); deviceStatusInfoVO.setDeviceType(deviceType); + deviceStatusInfoVO.setDefaultImage(dictMap.get(String.valueOf(deviceType)) == null ? null : dictMap.get(String.valueOf(deviceType)).getRemark()); List deviceInformationDOList = entry.getValue(); if (CollectionUtil.isEmpty(deviceInformationDOList)) { deviceStatusInfoVOS.add(deviceStatusInfoVO); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationService.java new file mode 100644 index 000000000..b195eee66 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationService.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.system.service.informationmapassociation; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationSaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation.InformationMapAssociationDO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 设备地图关联 Service 接口 + * + * @author 芋道源码 + */ +public interface InformationMapAssociationService extends IService { + + /** + * 创建设备地图关联 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createInformationMapAssociation(@Valid InformationMapAssociationSaveReqVO createReqVO); + + /** + * 更新设备地图关联 + * + * @param updateReqVO 更新信息 + */ + void updateInformationMapAssociation(@Valid InformationMapAssociationSaveReqVO updateReqVO); + + /** + * 删除设备地图关联 + * + * @param id 编号 + */ + void deleteInformationMapAssociation(Long id); + + /** + * 获得设备地图关联 + * + * @param id 编号 + * @return 设备地图关联 + */ + InformationMapAssociationDO getInformationMapAssociation(Long id); + + /** + * 获得设备地图关联分页 + * + * @param pageReqVO 分页查询 + * @return 设备地图关联分页 + */ + PageResult getInformationMapAssociationPage(InformationMapAssociationPageReqVO pageReqVO); + + /** + * @param id + * @param mapIds + */ + void saveOrUpdateOrDel(Long id, List> mapIds); +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationServiceImpl.java new file mode 100644 index 000000000..0df22c85e --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/informationmapassociation/InformationMapAssociationServiceImpl.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.system.service.informationmapassociation; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.informationmapassociation.vo.InformationMapAssociationSaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation.InformationMapAssociationDO; +import cn.iocoder.yudao.module.system.dal.mysql.informationmapassociation.InformationMapAssociationMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +import static cn.hutool.core.collection.CollUtil.isNotEmpty; + +/** + * 设备地图关联 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class InformationMapAssociationServiceImpl extends ServiceImpl implements InformationMapAssociationService { + + @Resource + private InformationMapAssociationMapper informationMapAssociationMapper; + + @Override + public Long createInformationMapAssociation(InformationMapAssociationSaveReqVO createReqVO) { + // 插入 + InformationMapAssociationDO informationMapAssociation = BeanUtils.toBean(createReqVO, InformationMapAssociationDO.class); + informationMapAssociationMapper.insert(informationMapAssociation); + // 返回 + return informationMapAssociation.getId(); + } + + @Override + public void updateInformationMapAssociation(InformationMapAssociationSaveReqVO updateReqVO) { + // 更新 + InformationMapAssociationDO updateObj = BeanUtils.toBean(updateReqVO, InformationMapAssociationDO.class); + informationMapAssociationMapper.updateById(updateObj); + } + + @Override + public void deleteInformationMapAssociation(Long id) { + // 删除 + informationMapAssociationMapper.deleteById(id); + } + + @Override + public InformationMapAssociationDO getInformationMapAssociation(Long id) { + return informationMapAssociationMapper.selectById(id); + } + + @Override + public PageResult getInformationMapAssociationPage(InformationMapAssociationPageReqVO pageReqVO) { + return informationMapAssociationMapper.selectPage(pageReqVO); + } + + @Override + public void saveOrUpdateOrDel(Long id, List> mapIds) { + //批量添加、修改、删除 + if (isNotEmpty(mapIds.get(0))) { + List saveList = new ArrayList<>(); + for (Long mapId : mapIds.get(0)) { + saveList.add(new InformationMapAssociationDO().setPositionMapId(mapId).setRobotInformationId(id)); + } + informationMapAssociationMapper.insertBatch(saveList); + } + if (isNotEmpty(mapIds.get(2))) { + informationMapAssociationMapper.delete(new LambdaQueryWrapper() + .eq(InformationMapAssociationDO::getRobotInformationId, id) + .in(InformationMapAssociationDO::getPositionMapId, mapIds.get(2))); + } + } + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemService.java index 6568f1d22..046792a6b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemService.java @@ -88,8 +88,17 @@ public interface PositionMapItemService extends IService { /** * 清空laneId + * * @param mapId * @param laneId */ void emptyLaneId(Long mapId, Long laneId); + + /** + * 通过mac地址获取AGV点位信息 + * + * @param macAddress + * @return + */ + Object getAGVPointInformation(String macAddress); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemServiceImpl.java index 07fbd1bec..f8b8ddcaa 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapItemServiceImpl.java @@ -3,11 +3,13 @@ package cn.iocoder.yudao.module.system.service.positionmap; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.system.constant.robot.RobotTaskChcheConstant; import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.PositionMapConditionDTO; import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapItemPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapItemSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapItemDO; import cn.iocoder.yudao.module.system.dal.mysql.positionmap.PositionMapItemMapper; +import cn.iocoder.yudao.module.system.util.redis.RedisUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +32,8 @@ public class PositionMapItemServiceImpl extends ServiceImpl { * @return */ RobotInformationVO getRobotByRedis(String macAddress); + + /** + * 根据地图id查询车辆信息 + * @param mapId + * @return + */ + List getListByMapId(Long mapId); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java index 851f30d8c..e3a488577 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/RobotInformationServiceImpl.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.system.service.robot; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; 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.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.system.api.robot.RequestProcessor; @@ -12,17 +14,18 @@ import cn.iocoder.yudao.module.system.api.robot.dto.RobotStatusDataPoseDTO; import cn.iocoder.yudao.module.system.api.robot.vo.RobotInformationVO; import cn.iocoder.yudao.module.system.constant.robot.RobotTaskChcheConstant; import cn.iocoder.yudao.module.system.controller.admin.robot.vo.*; +import cn.iocoder.yudao.module.system.dal.dataobject.informationmapassociation.InformationMapAssociationDO; import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapDO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotInformationDO; import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotModelDO; import cn.iocoder.yudao.module.system.dal.mysql.positionmap.PositionMapMapper; import cn.iocoder.yudao.module.system.dal.mysql.robot.RobotInformationMapper; import cn.iocoder.yudao.module.system.dal.mysql.robot.RobotModelMapper; -import cn.iocoder.yudao.module.system.dal.mysql.robot.RobotTaskDetailMapper; import cn.iocoder.yudao.module.system.enums.robot.CommandTypeEnum; import cn.iocoder.yudao.module.system.enums.robot.RobotStatusEnum; import cn.iocoder.yudao.module.system.enums.robot.RobotTaskModelEnum; import cn.iocoder.yudao.module.system.enums.robot.information.RobotStatisticsTypeEnum; +import cn.iocoder.yudao.module.system.service.informationmapassociation.InformationMapAssociationService; import cn.iocoder.yudao.module.system.util.redis.RedisUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,10 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -54,10 +54,6 @@ public class RobotInformationServiceImpl extends ServiceImpl list = new ArrayList<>(); + for (Long mapId : createReqVO.getFloorAreaJson()) { + InformationMapAssociationDO item = new InformationMapAssociationDO(); + item.setRobotInformationId(information.getId()); + item.setPositionMapId(mapId); + list.add(item); + } + informationMapAssociationService.saveBatch(list); + } // 返回 return information.getId(); } @@ -99,6 +108,11 @@ public class RobotInformationServiceImpl extends ServiceImpl> list = CollectionUtils.compareLists( + (CollUtil.isEmpty(robotInformationDO.getFloorAreaJson()) ? Collections.emptyList() : new ArrayList<>(robotInformationDO.getFloorAreaJson())), + (CollUtil.isEmpty(updateReqVO.getFloorAreaJson()) ? Collections.emptyList() : new ArrayList<>(updateReqVO.getFloorAreaJson())), + ObjectUtil::equal); + informationMapAssociationService.saveOrUpdateOrDel(updateReqVO.getId(), list); } @Override @@ -491,4 +511,9 @@ public class RobotInformationServiceImpl extends ServiceImpl getListByMapId(Long mapId) { + return informationMapper.getListByMapId(mapId); + } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/informationmapassociation/InformationMapAssociationMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/informationmapassociation/InformationMapAssociationMapper.xml new file mode 100644 index 000000000..ab93d367d --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/informationmapassociation/InformationMapAssociationMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotInformationMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotInformationMapper.xml index 631d3a20e..19a992bb9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotInformationMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotInformationMapper.xml @@ -298,4 +298,18 @@ #{robotNo} - \ No newline at end of file + +