From cbc4889fdbb90d95bce28ec9efc5f605dd1638c1 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 12 Jun 2025 08:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=AF=B9=E5=A4=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/JobStatisticsController.java | 10 ++++-- .../api/controller/ToWcsApiController.java | 32 +++++++++++++++++++ .../api/service/IJobStatisticsService.java | 8 +++-- .../impl/JobStatisticsServiceImpl.java | 24 +++++++++++--- .../src/main/resources/application.yml | 5 +++ 5 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java index 16fd827..9bef28e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/api") public class JobStatisticsController { - + @Autowired private IJobStatisticsService jobStatisticsService; @Autowired @@ -59,4 +59,10 @@ public class JobStatisticsController { return AjaxResult.success(result); } -} \ No newline at end of file + + @GetMapping("/device/info") + public AjaxResult getDeviceInfo() { + // 获取设备信息 + return jobStatisticsService.getDeviceInfo(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java new file mode 100644 index 0000000..58637d9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWcsApiController.java @@ -0,0 +1,32 @@ +package com.ruoyi.api.controller; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.job.mydojob.domain.MydoJob; +import com.ruoyi.job.mydojob.service.IMydoJobService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 作业统计 Controller + */ +@RestController +@RequestMapping("/api2wcs") +public class ToWcsApiController { + + @Autowired + private IMydoJobService mydoJobService; + + /** + * 获取任务 + */ + @GetMapping("/getJob") + public AjaxResult getJob(MydoJob mydoJob) + { + return AjaxResult.success(mydoJobService.selectMydoJobList(mydoJob)); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java index 5a4cdf8..bab02a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java @@ -7,14 +7,16 @@ import java.util.Map; * 作业统计 Service 接口 */ public interface IJobStatisticsService { - + /** * 获取统计数据，包含： * 1. 当日入库和出库数量统计 * 2. 货位状态统计 * 3. 当前任务列表 - * + * * @return 统计结果 */ public Map getDailyStatistics(); -} \ No newline at end of file + + AjaxResult getDeviceInfo(); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java index ff01129..b6eec8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java @@ -4,7 +4,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; +import com.ruoyi.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.api.service.IJobStatisticsService; @@ -27,6 +32,8 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService { @Autowired private MydoJobMapper mydoJobMapper; + @Value("${api.wcs.device.url}") + private String deviceUrl; /** * 获取当日入库和出库数量统计 @@ -35,13 +42,13 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService { public Map getDailyStatistics() { // 获取当前日期 String today = DateUtils.getDate(); - + // 查询当日入库数量 int inCount = jobStatisticsMapper.selectDailyInCount(today); - + // 查询当日出库数量 int outCount = jobStatisticsMapper.selectDailyOutCount(today); - + // 获取货位状态统计 List> statusCounts = basCargoSpaceMapper.selectStatusCount(); List> cargoSpaceStatus = new ArrayList<>(); @@ -73,7 +80,7 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService { // 获取当前年月 int year = Integer.parseInt(DateUtils.dateTimeNow("yyyy")); int month = Integer.parseInt(DateUtils.dateTimeNow("MM")); - + // 获取当月每日统计数据 List> dailyStats = jobStatisticsMapper.selectMonthlyStatistics(year, month); @@ -87,5 +94,12 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService { return result; } + @Override + public AjaxResult getDeviceInfo() { -} \ No newline at end of file + String s = HttpUtil.get(deviceUrl); + return JSONUtil.toBean(s, AjaxResult.class); + } + + +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 51bfd75..d33e581 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -127,3 +127,8 @@ xss: excludes: /system/notice # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* +#搭配对外接口 +api: + wcs: + device: + url: http://192.168.1.1:8080/api/device