diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java index 52fa6024..b5cb1fd7 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java @@ -237,4 +237,40 @@ public class ProdReportController extends BaseController { return R.ok(list); } + /** + * 看板接口1:返回包含value1-value5的数据列表 + */ + @GetMapping("/dashboard/data1") + public R>> dashboardData1(@RequestParam(required = false) Map hashMap) { + List> vos = prodReportService.getDashboardData1(hashMap); + return R.ok(vos); + } + + /** + * 看板接口2:返回包含x1和y1数组的数据 + */ + @GetMapping("/dashboard/data2") + public R> dashboardData2(@RequestParam(required = false) Map hashMap) { + HashMap vos = prodReportService.getDashboardData2(hashMap); + return R.ok(vos); + } + + /** + * 看板接口3:返回包含时间格式x1和y1数组的数据 + */ + @GetMapping("/dashboard/data3") + public R> dashboardData3(@RequestParam(required = false) Map hashMap) { + HashMap vos = prodReportService.getDashboardData3(hashMap); + return R.ok(vos); + } + + /** + * 看板接口4:返回包含value1-value4的数据列表 + */ + @GetMapping("/dashboard/data4") + public R>> dashboardData4(@RequestParam(required = false) Map hashMap) { + List> vos = prodReportService.getDashboardData4(hashMap); + return R.ok(vos); + } + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java index 8cd989cc..40a96081 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java @@ -172,4 +172,32 @@ public interface IProdReportService { */ List> listPlansByProcess(Map hashMap); + /** + * 看板接口1:返回包含value1-value5的数据列表 + * @param hashMap 查询条件 + * @return 数据列表 + */ + List> getDashboardData1(Map hashMap); + + /** + * 看板接口2:返回包含x1和y1数组的数据 + * @param hashMap 查询条件 + * @return 数据对象 + */ + HashMap getDashboardData2(Map hashMap); + + /** + * 看板接口3:返回包含时间格式x1和y1数组的数据 + * @param hashMap 查询条件 + * @return 数据对象 + */ + HashMap getDashboardData3(Map hashMap); + + /** + * 看板接口4:返回包含value1-value4的数据列表 + * @param hashMap 查询条件 + * @return 数据列表 + */ + List> getDashboardData4(Map hashMap); + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java index e6b49310..6bbc3815 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java @@ -704,4 +704,127 @@ public class ProdReportServiceImpl implements IProdReportService { return prodReportMapper.listPlansByProcess(hashMap, planTable); } + /** + * 看板接口1:返回包含value1-value5的数据列表 + */ + @Override + public List> getDashboardData1(Map hashMap) { + List> result = new ArrayList<>(); + // 示例数据结构 + HashMap item1 = new HashMap<>(); + item1.put("value1", "122WD"); + item1.put("value2", "71"); + item1.put("value3", "0"); + item1.put("value4", "74"); + item1.put("value5", "0%"); + result.add(item1); + HashMap item2 = new HashMap<>(); + item2.put("value1", "217CV"); + item2.put("value2", "70"); + item2.put("value3", "0"); + item2.put("value4", "74"); + item2.put("value5", "0%"); + result.add(item2); + HashMap item3 = new HashMap<>(); + item3.put("value1", "122WD"); + item3.put("value2", "75"); + item3.put("value3", "0"); + item3.put("value4", "74"); + item3.put("value5", "0%"); + result.add(item3); + + return result; + } + + /** + * 看板接口2:返回包含x1和y1数组的数据 + */ + @Override + public HashMap getDashboardData2(Map hashMap) { + HashMap result = new HashMap<>(); + // TODO: 根据实际业务逻辑查询数据 + // 示例数据结构 + List x1 = new ArrayList<>(); + x1.add("SC_228NE"); + x1.add("SC_229NE"); + x1.add("SC_221NE"); + x1.add("SC_222NE"); + x1.add("SC_223NE"); + x1.add("SC_224NE"); + x1.add("SC_225NE"); + x1.add("SC_226NE"); + + List y1 = new ArrayList<>(); + y1.add(5); + y1.add(12); + y1.add(6); + y1.add(5); + y1.add(11); + y1.add(6); + y1.add(5); + y1.add(6); + + result.put("x1", x1); + result.put("y1", y1); + return result; + } + + /** + * 看板接口3:返回包含时间格式x1和y1数组的数据 + */ + @Override + public HashMap getDashboardData3(Map hashMap) { + HashMap result = new HashMap<>(); + // TODO: 根据实际业务逻辑查询数据 + // 示例数据结构 + List x1 = new ArrayList<>(); + x1.add("13:00:00"); + x1.add("13:01:00"); + x1.add("13:02:00"); + x1.add("13:03:00"); + + List y1 = new ArrayList<>(); + y1.add(3); + y1.add(4); + y1.add(2); + y1.add(5); + y1.add(6); + + result.put("x1", x1); + result.put("y1", y1); + return result; + } + + /** + * 看板接口4:返回包含value1-value4的数据列表 + */ + @Override + public List> getDashboardData4(Map hashMap) { + List> result = new ArrayList<>(); + // TODO: 根据实际业务逻辑查询数据 + // 示例数据结构 + HashMap item1 = new HashMap<>(); + item1.put("value1", "1"); + item1.put("value2", "SC-228NE"); + item1.put("value3", 100); + item1.put("value4", "10次"); + result.add(item1); + + HashMap item2 = new HashMap<>(); + item2.put("value1", "2"); + item2.put("value2", "SC-228NE"); + item2.put("value3", 70); + item2.put("value4", "7次"); + result.add(item2); + + HashMap item3 = new HashMap<>(); + item3.put("value1", "3"); + item3.put("value2", "SC-228NE"); + item3.put("value3", 60); + item3.put("value4", "6次"); + result.add(item3); + + return result; + } + }