From a1ad065e6f25f118080f4c665febd818fa79bfc2 Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Sat, 7 Dec 2024 14:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FifthWmsBorderController.java | 7 + .../com/hw/wms/board/domain/WcsAgvStatus.java | 221 ++++++++++++++++++ .../board/service/FifthWmsBorderService.java | 3 + .../impl/FifthWmsBoardServiceImpl.java | 6 + .../com/hw/wms/mapper/WmsRawStockMapper.java | 3 + .../mapper/wms/WmsRawStockMapper.xml | 8 + 6 files changed, 248 insertions(+) create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/WcsAgvStatus.java diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java index ada0ca15..d3276449 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FifthWmsBorderController.java @@ -46,6 +46,13 @@ public class FifthWmsBorderController { public AjaxResult scheduleTask(){ return AjaxResult.success(fifthWmsBorderService.scheduleTask()); } + /** + * agv状态 + */ + @GetMapping("/agvStatus") + public AjaxResult agvStatus(){ + return AjaxResult.success(fifthWmsBorderService.agvStatus()); + } } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/WcsAgvStatus.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/WcsAgvStatus.java new file mode 100644 index 00000000..37c8975a --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/domain/WcsAgvStatus.java @@ -0,0 +1,221 @@ +package com.hw.wms.board.domain; + +import java.io.Serializable; +import java.util.Date; + +/** + * (WcsAgvStatus)实体类 + * + * @author makejava + * @since 2024-12-07 13:16:17 + */ +public class WcsAgvStatus implements Serializable { + private static final long serialVersionUID = -31312485645520582L; + /** + * 电量 + */ + private String battery; + /** + * 是否已被排除，被排除后不接受新任务（ 1-排除， 0-正常） + */ + private String excltype; + /** + * 地图编号 + */ + private String mapcode; + /** + * 是否在线 + */ + private String online; + /** + * 路线 + */ + private String path; + /** + * 背货架的编号 + */ + private String podcode; + /** + * 背货架的方向 + */ + private String poddir; + /** + * X + */ + private String posx; + /** + * Y + */ + private String posy; + /** + * 机器人编号 + */ + private String robotcode; + /** + * 机器人方向 (范围 -180~360度) + */ + private String robotdir; + /** + * 机器人Ip + */ + private String robotip; + /** + * 机器人速度 + */ + private String speed; + /** + * 机器人状态 + */ + private String status; + /** + * 是否暂停 0-否 1-是 + */ + private String stop; + /** + * 时间 + */ + private Date timestamp; + /** + * 小车名称 + */ + private String agvname; + + + public String getBattery() { + return battery; + } + + public void setBattery(String battery) { + this.battery = battery; + } + + public String getExcltype() { + return excltype; + } + + public void setExcltype(String excltype) { + this.excltype = excltype; + } + + public String getMapcode() { + return mapcode; + } + + public void setMapcode(String mapcode) { + this.mapcode = mapcode; + } + + public String getOnline() { + return online; + } + + public void setOnline(String online) { + this.online = online; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getPodcode() { + return podcode; + } + + public void setPodcode(String podcode) { + this.podcode = podcode; + } + + public String getPoddir() { + return poddir; + } + + public void setPoddir(String poddir) { + this.poddir = poddir; + } + + public String getPosx() { + return posx; + } + + public void setPosx(String posx) { + this.posx = posx; + } + + public String getPosy() { + return posy; + } + + public void setPosy(String posy) { + this.posy = posy; + } + + public String getRobotcode() { + return robotcode; + } + + public void setRobotcode(String robotcode) { + this.robotcode = robotcode; + } + + public String getRobotdir() { + return robotdir; + } + + public void setRobotdir(String robotdir) { + this.robotdir = robotdir; + } + + public String getRobotip() { + return robotip; + } + + public void setRobotip(String robotip) { + this.robotip = robotip; + } + + public String getSpeed() { + return speed; + } + + public void setSpeed(String speed) { + this.speed = speed; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStop() { + return stop; + } + + public void setStop(String stop) { + this.stop = stop; + } + + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + public String getAgvname() { + return agvname; + } + + public void setAgvname(String agvname) { + this.agvname = agvname; + } + +} + diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java index 4245faa7..d953f9ef 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FifthWmsBorderService.java @@ -1,6 +1,7 @@ package com.hw.wms.board.service; +import com.hw.wms.board.domain.WcsAgvStatus; import com.hw.wms.domain.WmsProductInstock; import com.hw.wms.domain.WmsProductOutstockDetail; import com.hw.wms.domain.WmsProductStock; @@ -19,4 +20,6 @@ public interface FifthWmsBorderService { BigDecimal locationPercentage(); List scheduleTask(); + + List agvStatus(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java index 1586762b..bd6a8dc7 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FifthWmsBoardServiceImpl.java @@ -1,5 +1,6 @@ package com.hw.wms.board.service.impl; +import com.hw.wms.board.domain.WcsAgvStatus; import com.hw.wms.board.service.FifthWmsBorderService; import com.hw.wms.board.service.SecondWmsBorderService; import com.hw.wms.domain.*; @@ -31,6 +32,11 @@ public class FifthWmsBoardServiceImpl implements FifthWmsBorderService { private WmsBaseLocationMapper wmsBaseLocationMapper; + @Override + public List agvStatus() { + return wmsRawStockMapper.agvStatus(); + } + @Override public List scheduleTask() { return wmsProductOutstockMapper.scheduleTask(); diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawStockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawStockMapper.java index 77cff8ba..b0d3f99f 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawStockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawStockMapper.java @@ -3,6 +3,7 @@ package com.hw.wms.mapper; import java.math.BigDecimal; import java.util.List; +import com.hw.wms.board.domain.WcsAgvStatus; import com.hw.wms.domain.WmsRawStock; import org.apache.ibatis.annotations.Param; @@ -128,4 +129,6 @@ public interface WmsRawStockMapper { public List selectAutoOutstockRawStockList(@Param("materialId") Long materialId, @Param("poNo") String poNo); List selectRawLocationPercentage(); + + List agvStatus(); } diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml index be82d696..3220c719 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml @@ -383,6 +383,14 @@ group by b.material_name +